Skip to content

Commit

Permalink
Remove the legacy backends
Browse files Browse the repository at this point in the history
  • Loading branch information
yshui committed Feb 17, 2024
1 parent c23dbe6 commit 9b88d49
Show file tree
Hide file tree
Showing 15 changed files with 87 additions and 3,896 deletions.
11 changes: 0 additions & 11 deletions src/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
#include "config.h"
#include "list.h"
#include "region.h"
#include "render.h"
#include "statistics.h"
#include "types.h"
#include "utils.h"
Expand Down Expand Up @@ -183,8 +182,6 @@ typedef struct session {
xcb_window_t debug_window;
/// Whether the root tile is filled by us.
bool root_tile_fill;
/// Picture of the root window background.
paint_t root_tile_paint;
/// The backend data the root pixmap bound to
image_handle root_image;
/// A region of the size of the screen.
Expand All @@ -194,8 +191,6 @@ typedef struct session {
xcb_render_picture_t root_picture;
/// A Picture acting as the painting target.
xcb_render_picture_t tgt_picture;
/// Temporary buffer to paint to before sending to display.
paint_t tgt_buffer;
/// Window ID of the window we register as a symbol.
xcb_window_t reg_win;
#ifdef CONFIG_OPENGL
Expand Down Expand Up @@ -316,12 +311,6 @@ typedef struct session {
/// Nanosecond offset of the first painting.
long paint_tm_offset;

#ifdef CONFIG_VSYNC_DRM
// === DRM VSync related ===
/// File descriptor of DRI device file. Used for DRM VSync.
int drm_fd;
#endif

// === X extension related ===
/// Event base number for X Fixes extension.
int xfixes_event;
Expand Down
1 change: 0 additions & 1 deletion src/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,6 @@ char *parse_config(options_t *opt, const char *config_file, bool *shadow_enable,
// clang-format off
*opt = (struct options){
.backend = BKEND_XRENDER,
.legacy_backends = false,
.glx_no_stencil = false,
.mark_wmwin_focused = false,
.mark_ovredir_focused = false,
Expand Down
2 changes: 0 additions & 2 deletions src/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,6 @@ typedef struct options {
/// Render to a separate window instead of taking over the screen
bool debug_mode;
// === General ===
/// Use the legacy backends?
bool legacy_backends;
/// Path to write PID to.
char *write_pid_path;
/// The backend in use.
Expand Down
10 changes: 2 additions & 8 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ base_deps = [
libev
]

srcs = [ files('picom.c', 'win.c', 'c2.c', 'x.c', 'config.c', 'vsync.c', 'utils.c',
'diagnostic.c', 'string_utils.c', 'render.c', 'kernel.c', 'log.c',
srcs = [ files('picom.c', 'win.c', 'c2.c', 'x.c', 'config.c', 'utils.c',
'diagnostic.c', 'string_utils.c', 'kernel.c', 'log.c',
'options.c', 'event.c', 'cache.c', 'atom.c', 'file_watch.c', 'statistics.c',
'vblank.c') ]
picom_inc = include_directories('.')
Expand Down Expand Up @@ -52,15 +52,9 @@ if get_option('regex')
deps += [pcre]
endif

if get_option('vsync_drm')
cflags += ['-DCONFIG_VSYNC_DRM']
deps += [dependency('libdrm', required: true)]
endif

if get_option('opengl')
cflags += ['-DCONFIG_OPENGL']
deps += [dependency('epoxy', required: true)]
srcs += [ 'opengl.c' ]
endif

if get_option('dbus')
Expand Down
Loading

0 comments on commit 9b88d49

Please sign in to comment.