From 177e6e148629f581c9729c75657831f4ccee6376 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Tue, 4 Oct 2016 00:10:29 +0900 Subject: [PATCH] ecore_x - remove ecore_x_vsync tool as it isnt enabled or used runtime so ecore_x_vsync as a tool uses glx for nvidia drivers plut "wait for vblank" extensions to try vsync "sync". the problem is this is flakey because the drivers may or may not continue vsyncing after screen off or syspend/resume or vt changes and all the workarounds dont seem to be reliable, so since this causes this to be disabled, no point keeping all the code and build stuff around, so remove this "unused junk" we have in the tree. --- src/Makefile_Ecore_X.am | 14 - src/lib/ecore_x/ecore_x_vsync_tool.c | 275 ------------------- src/lib/ecore_x/ecore_x_vsync_tool_glx.c | 330 ----------------------- src/lib/ecore_x/xlib/ecore_x_vsync.c | 170 ------------ 4 files changed, 789 deletions(-) delete mode 100644 src/lib/ecore_x/ecore_x_vsync_tool.c delete mode 100644 src/lib/ecore_x/ecore_x_vsync_tool_glx.c diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am index 556ab808bd..673cb704b4 100644 --- a/src/Makefile_Ecore_X.am +++ b/src/Makefile_Ecore_X.am @@ -1,19 +1,5 @@ if HAVE_ECORE_X -ecore_x_vsync_bin_PROGRAMS = lib/ecore_x/ecore_x_vsync -ecore_x_vsync_bindir = $(libdir)/ecore_x/bin/$(MODULE_ARCH) -lib_ecore_x_ecore_x_vsync_SOURCES = \ -lib/ecore_x/ecore_x_vsync_tool.c \ -lib/ecore_x/ecore_x_vsync_tool_glx.c -lib_ecore_x_ecore_x_vsync_CPPFLAGS = \ --I$(top_builddir)/src/lib/efl \ -@ECORE_CFLAGS@ @ECORE_CON_CFLAGS@ @EINA_CFLAGS@ \ --DPACKAGE_BIN_DIR=\"$(bindir)\" \ --DPACKAGE_LIB_DIR=\"$(libdir)\" \ --DPACKAGE_DATA_DIR=\"$(datadir)/ecore_x\" -lib_ecore_x_ecore_x_vsync_LDADD = @USE_EINA_LIBS@ @USE_ECORE_LIBS@ @USE_ECORE_CON_LIBS@ -lib_ecore_x_ecore_x_vsync_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_ECORE_INTERNAL_LIBS@ @USE_ECORE_CON_INTERNAL_LIBS@ - ### Library lib_LTLIBRARIES += lib/ecore_x/libecore_x.la diff --git a/src/lib/ecore_x/ecore_x_vsync_tool.c b/src/lib/ecore_x/ecore_x_vsync_tool.c deleted file mode 100644 index b1a29cbca3..0000000000 --- a/src/lib/ecore_x/ecore_x_vsync_tool.c +++ /dev/null @@ -1,275 +0,0 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include - -#include - -enum -{ - MODE_NONE, - MODE_GLX -}; - -int _vsync_init_glx(void); -double _vsync_wait_glx(void); - -static void _svr_broadcast_time(double t); - -static int _vsync_mode = MODE_NONE; - -static int -_vsync_init(void) -{ - if (_vsync_init_glx()) _vsync_mode = MODE_GLX; - else return 0; - return 1; -} - -static double -_vsync_wait(void) -{ - if (_vsync_mode == MODE_GLX) return _vsync_wait_glx(); - return 0.0; -} - -typedef struct -{ - Eina_Thread_Queue_Msg head; - char val; -} Msg; - -static Eina_Thread_Queue *thq = NULL; -static volatile int ticking = 0; - -static void -_tick_core(void *data EINA_UNUSED, Ecore_Thread *thread) -{ - Msg *msg; - void *ref; - int tick = 0; - - for (;;) - { - if (!tick) - { - msg = eina_thread_queue_wait(thq, &ref); - if (msg) - { - tick = msg->val; - eina_thread_queue_wait_done(thq, ref); - } - } - else - { - do - { - msg = eina_thread_queue_poll(thq, &ref); - if (msg) - { - tick = msg->val; - eina_thread_queue_wait_done(thq, ref); - } - } - while (msg); - } - if (tick == -1) exit(0); - if (tick) - { - double *t; - - t = malloc(sizeof(*t)); - if (t) - { - *t = _vsync_wait(); - do - { - msg = eina_thread_queue_poll(thq, &ref); - if (msg) - { - tick = msg->val; - eina_thread_queue_wait_done(thq, ref); - } - } - while (msg); - if (tick) ecore_thread_feedback(thread, t); - } - } - } -} - -static void -_tick_notify(void *data EINA_UNUSED, Ecore_Thread *thread EINA_UNUSED, void *msg) -{ - double *t = msg; - - if (t) - { - _svr_broadcast_time(*t); - free(t); - } -} - -static void -_tick_init(void) -{ - thq = eina_thread_queue_new(); - ecore_thread_feedback_run(_tick_core, _tick_notify, - NULL, NULL, NULL, EINA_TRUE); -} - -static void -_tick_send(char val) -{ - Msg *msg; - void *ref; - msg = eina_thread_queue_send(thq, sizeof(Msg), &ref); - msg->val = val; - eina_thread_queue_send_done(thq, ref); -} - -static void -_tick_start(void) -{ - ticking++; - if (ticking == 1) _tick_send(1); -} - -static void -_tick_end(void) -{ - if (ticking <= 0) return; - ticking--; - if (ticking == 0) _tick_send(0); -} - -/*--------------------------------------------------------------------*/ - -typedef struct -{ - Ecore_Con_Client *client; - int enabled; -} Clientdata; - -static Ecore_Con_Server *svr = NULL; -static Eina_List *clients = NULL; - -static void -_svr_broadcast_time(double t) -{ - Eina_List *l; - Clientdata *cdat; - - EINA_LIST_FOREACH(clients, l, cdat) - { - if (cdat->enabled > 0) - ecore_con_client_send(cdat->client, &t, sizeof(t)); - } -} - -static Eina_Bool -_svr_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) -{ - Ecore_Con_Event_Client_Add *ev = event; - if (svr != ecore_con_client_server_get(ev->client)) return EINA_TRUE; - Clientdata *cdat = calloc(1, sizeof(Clientdata)); - if (cdat) - { - cdat->client = ev->client; - clients = eina_list_append(clients, cdat); - ecore_con_client_data_set(ev->client, cdat); - } - return EINA_FALSE; -} - -static Eina_Bool -_svr_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) -{ - Ecore_Con_Event_Client_Del *ev = event; - if (svr != ecore_con_client_server_get(ev->client)) return EINA_TRUE; - Clientdata *cdat = ecore_con_client_data_get(ev->client); - if (cdat) - { - while (cdat->enabled > 0) - { - cdat->enabled--; - if (cdat->enabled == 0) _tick_end(); - } - clients = eina_list_remove(clients, cdat); - free(cdat); - } - return EINA_FALSE; -} - -static Eina_Bool -_svr_data(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) -{ - Ecore_Con_Event_Client_Data *ev = event; - if (svr != ecore_con_client_server_get(ev->client)) return EINA_TRUE; - Clientdata *cdat = ecore_con_client_data_get(ev->client); - if (cdat) - { - char *dat = ev->data; - int i; - int penabled = cdat->enabled; - - for (i = 0; i < ev->size; i++) - { - if (dat[i]) cdat->enabled++; - else if (cdat->enabled > 0) cdat->enabled--; - } - if (ev->size > 0) - { - if (penabled != cdat->enabled) - { - if (cdat->enabled == 1) _tick_start(); - else if (cdat->enabled == 0) _tick_end(); - } - } - } - return EINA_FALSE; -} - -static void -_svr_init(void) -{ - char buf[4096], *disp, *s; - - disp = getenv("DISPLAY"); - if (!disp) disp = ":0"; - snprintf(buf, sizeof(buf), "ecore-x-vsync-%s", disp); - for (s = buf; *s; s++) - { - if (!(((*s >= 'a') && (*s <= 'z')) || - ((*s >= 'A') && (*s <= 'Z')) || - ((*s >= '0') && (*s <= '9')))) *s = '-'; - } - svr = ecore_con_server_add(ECORE_CON_LOCAL_USER, buf, 1, NULL); - if (!svr) exit(0); - ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_ADD, _svr_add, NULL); - ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DEL, _svr_del, NULL); - ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DATA, _svr_data, NULL); -} - -/*--------------------------------------------------------------------*/ - -int -main(int argc EINA_UNUSED, char **argv EINA_UNUSED) -{ - eina_init(); - ecore_app_no_system_modules(); - ecore_init(); - ecore_con_init(); - - if (!_vsync_init()) return 7; - _svr_init(); - _tick_init(); - - ecore_main_loop_begin(); - _tick_send(-1); - pause(); - return 0; -} diff --git a/src/lib/ecore_x/ecore_x_vsync_tool_glx.c b/src/lib/ecore_x/ecore_x_vsync_tool_glx.c deleted file mode 100644 index a6f6a0cc41..0000000000 --- a/src/lib/ecore_x/ecore_x_vsync_tool_glx.c +++ /dev/null @@ -1,330 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/*-------------------------------------------------------------------------*/ - -#define SYM(lib, xx) \ - do { \ - sym_ ## xx = dlsym(lib, #xx); \ - if (!(sym_ ## xx)) { \ - fail = 1; \ - } \ - } while (0) - -#define GLX_DRAWABLE_TYPE 0x8010 -#define GLX_WINDOW_BIT 0x00000001 -#define GLX_RENDER_TYPE 0x8011 -#define GLX_RGBA_BIT 0x00000001 -#define GLX_DOUBLEBUFFER 5 -#define GLX_RED_SIZE 8 -#define GLX_GREEN_SIZE 9 -#define GLX_BLUE_SIZE 10 -#define GLX_RGBA_TYPE 0x8014 -typedef struct __GLXFBConfigRec *GLXFBConfig; - -typedef struct -{ - void *visual; - long visualid; - int screen; - int depth; - int c_class; - unsigned long red_mask; - unsigned long green_mask; - unsigned long blue_mask; - int colormap_size; - int bits_per_rgb; -} XVisualInfo; - -typedef struct -{ - long background_pixmap; - unsigned long background_pixel; - long border_pixmap; - unsigned long border_pixel; - int bit_gravity; - int win_gravity; - int backing_store; - unsigned long backing_planes; - unsigned long backing_pixel; - int save_under; - long event_mask; - long do_not_propagate_mask; - int override_redirect; - long colormap; - long cursor; -} XSetWindowAttributes; - -typedef struct { - void *ext_data; - void *display; - long root; - int width, height; - int mwidth, mheight; - int ndepths; - void *depths; - int root_depth; - void *root_visual; - long default_gc; - long cmap; - unsigned long white_pixel; - unsigned long black_pixel; - int max_maps, min_maps; - int backing_store; - int save_unders; - long root_input_mask; -} Screen; - -typedef struct -{ - void *ext_data; - void *private1; - int fd; - int private2; - int proto_major_version; - int proto_minor_version; - char *vendor; - long private3; - long private4; - long private5; - int private6; - long (*resource_alloc)(void *); - int byte_order; - int bitmap_unit; - int bitmap_pad; - int bitmap_bit_order; - int nformats; - void *pixmap_format; - int private8; - int release; - void *private9, *private10; - int qlen; - unsigned long last_request_read; - unsigned long request; - char *private11; - char *private12; - char *private13; - char *private14; - unsigned max_request_size; - void *db; - int (*private15)(void *); - char *display_name; - int default_screen; - int nscreens; - Screen *screens; - unsigned long motion_buffer; - unsigned long private16; - int min_keycode; - int max_keycode; - char *private17; - char *private18; - int private19; - char *xdefaults; -} *_XPrivDisplay; - -#define InputOutput 1 -#define RootWindow(dpy, scr) (ScreenOfDisplay(dpy,scr)->root) -#define ScreenOfDisplay(dpy, scr) (&((_XPrivDisplay)dpy)->screens[scr]) -#define CWBorderPixel (1L<<3) -#define CWColormap (1L<<13) -#define CWOverrideRedirect (1L<<9) -#define AllocNone 0 - -/*-------------------------------------------------------------------------*/ - -static const char *lib_x11_files[] = -{ - "libX11.so.6", - "libX11.so.5", - "libX11.so.4", - "libX11.so", - NULL -}; -static void *lib_x11 = NULL; -static void * (*sym_XOpenDisplay) (char *name) = NULL; -static long (*sym_XCreateColormap) (void *d, long w, void *vis, int alloc) = NULL; -static long (*sym_XCreateWindow) (void *d, long par, int x, int y, unsigned int w, unsigned int h, unsigned int bd, int depth, unsigned int clas, void *vis, unsigned long valmask, void *attr) = NULL; -static int (*sym_XCloseDisplay) (void *d) = NULL; -//static void * (*sym_) () = NULL; - -static const char *lib_gl_files[] = -{ - "libGL.so.9", - "libGL.so.8", - "libGL.so.7", - "libGL.so.6", - "libGL.so.5", - "libGL.so.4", - "libGL.so.3", - "libGL.so.2", - "libGL.so.1", - "libGL.so", - NULL -}; -static void *lib_gl = NULL; -static GLXFBConfig * (*sym_glXChooseFBConfig) (void *d, int sc, const int *att, int *n) = NULL; -static void * (*sym_glXGetVisualFromFBConfig) (void *d, GLXFBConfig fbconfig) = NULL; -static void *(*sym_glXCreateNewContext) (void *d, GLXFBConfig config, int rtype, void *shr, int direct) = NULL; -static long (*sym_glXCreateWindow) (void *d, GLXFBConfig config, long win, const int *attr) = NULL; -static int (*sym_glXMakeContextCurrent) (void *d, long draw, long draw2, void *context) = NULL; -static void (*sym_glXSwapBuffers) (void *d, long draw) = NULL; -static const char * (*sym_glXQueryExtensionsString) (void *d, int ival) = NULL; -static void * (*sym_glXGetProcAddressARB) (const char *sym) = NULL; -static int (*sym_glXGetVideoSyncSGI) (unsigned int *cnt) = NULL; -static int (*sym_glXWaitVideoSyncSGI) (int divisor, int remainder, unsigned int *cnt) = NULL; -//static void * (*sym_) () = NULL; - -/*-------------------------------------------------------------------------*/ - -static void *disp = NULL; -static long gwin = 0; -static void *context = NULL; - -static int _vsync_init_glx2(void); - -static void -_vsync_shutdown_glx(void) -{ - if (disp) sym_XCloseDisplay(disp); - disp = NULL; -} - -static void * -lib_load(const char *files[]) -{ - int i; - void *lib = NULL; - - for (i = 0; files[i]; i++) - { - lib = dlopen(files[i], RTLD_LOCAL | RTLD_LAZY); - if (lib) return lib; - } - return NULL; -} - -int -_vsync_init_glx(void) -{ - int fail = 0; - - /*---------------------------*/ - lib_x11 = lib_load(lib_x11_files); - if (!lib_x11) goto err; - - SYM(lib_x11, XOpenDisplay); - SYM(lib_x11, XCreateColormap); - SYM(lib_x11, XCreateWindow); - SYM(lib_x11, XCloseDisplay); - if (fail) goto err; - - /*---------------------------*/ - lib_gl = lib_load(lib_gl_files); - if (!lib_gl) - { - dlclose(lib_x11); - return 0; - } - - SYM(lib_gl, glXChooseFBConfig); - SYM(lib_gl, glXGetVisualFromFBConfig); - SYM(lib_gl, glXCreateNewContext); - SYM(lib_gl, glXCreateWindow); - SYM(lib_gl, glXMakeContextCurrent); - SYM(lib_gl, glXSwapBuffers); - SYM(lib_gl, glXQueryExtensionsString); - SYM(lib_gl, glXGetProcAddressARB); - if (fail) goto err; - - /*---------------------------*/ - if (!_vsync_init_glx2()) goto err; - return 1; - -err: - if (disp) sym_XCloseDisplay(disp); - if (lib_gl) dlclose(lib_gl); - if (lib_x11) dlclose(lib_x11); - return 0; -} - -static int -_vsync_init_glx2(void) -{ - GLXFBConfig *fbconfigs; - int num = 0; - int attr[] = - { - GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT, - GLX_RENDER_TYPE, GLX_RGBA_BIT, - GLX_DOUBLEBUFFER, 1, - GLX_RED_SIZE, 1, - GLX_GREEN_SIZE, 1, - GLX_BLUE_SIZE, 1, - 0 - }; - XVisualInfo *vi; - XSetWindowAttributes wa; - long win; - const char *extns; - - disp = sym_XOpenDisplay(NULL); - if (!disp) return 0; - fbconfigs = sym_glXChooseFBConfig(disp, 0, attr, &num); - if (!fbconfigs) return 0; - vi = sym_glXGetVisualFromFBConfig(disp, fbconfigs[0]); - if (!vi) return 0; - wa.override_redirect = 1; - wa.border_pixel = 0; - wa.colormap = sym_XCreateColormap(disp, RootWindow(disp, vi->screen), - vi->visual, AllocNone); - if (!wa.colormap) return 0; - win = sym_XCreateWindow(disp, RootWindow(disp, vi->screen), - -77, -777, 1, 1, 0, vi->depth, InputOutput, - vi->visual, - CWBorderPixel | CWColormap | CWOverrideRedirect, &wa); - if (!win) return 0; - context = sym_glXCreateNewContext(disp, fbconfigs[0], GLX_RGBA_TYPE, - NULL, 1); - if (!context) return 0; - gwin = sym_glXCreateWindow(disp, fbconfigs[0], win, NULL); - if (!gwin) return 0; - extns = sym_glXQueryExtensionsString(disp, 0); - if (!extns) return 0; - if (!strstr(extns, "GLX_SGI_swap_control")) return 0; - sym_glXGetVideoSyncSGI = sym_glXGetProcAddressARB("glXGetVideoSyncSGI"); - sym_glXWaitVideoSyncSGI = sym_glXGetProcAddressARB("glXWaitVideoSyncSGI"); - if ((!sym_glXGetVideoSyncSGI) || (!sym_glXWaitVideoSyncSGI)) return 0; - - return 1; -} - -double -_vsync_wait_glx(void) -{ - double t; - unsigned int rc = 0; - static unsigned int prc = 0; - -again: - sym_glXMakeContextCurrent(disp, gwin, gwin, context); - sym_glXGetVideoSyncSGI(&rc); - sym_glXWaitVideoSyncSGI(1, 0, &rc); - if (prc == rc) - { - _vsync_shutdown_glx(); - usleep(200000); - if (!_vsync_init_glx2()) exit(1); - goto again; - } - prc = rc; - t = ecore_time_get(); - return t; -} diff --git a/src/lib/ecore_x/xlib/ecore_x_vsync.c b/src/lib/ecore_x/xlib/ecore_x_vsync.c index bdf832c97b..34eb605f96 100644 --- a/src/lib/ecore_x/xlib/ecore_x_vsync.c +++ b/src/lib/ecore_x/xlib/ecore_x_vsync.c @@ -705,145 +705,6 @@ _drm_animator_tick_source_set(void) -// disable gl vsync for now - nvidia doesnt work well. -//#define ECORE_X_VSYNC_GL 1 - -#ifdef ECORE_X_VSYNC_GL -static Ecore_Con_Server *vsync_server = NULL; -static Eina_Bool handlers = EINA_FALSE; -static Eina_Prefix *_prefix = NULL; - -static Eina_Bool -vsync_server_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) -{ - Ecore_Con_Event_Server_Add *ev = event; - if (ev->server != vsync_server) return EINA_TRUE; - return EINA_FALSE; -} - -static Eina_Bool -vsync_server_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) -{ - Ecore_Con_Event_Server_Del *ev = event; - if (ev->server != vsync_server) return EINA_TRUE; - if (vsync_server) - { - ecore_con_server_del(vsync_server); - vsync_server = NULL; - ecore_animator_custom_source_tick_begin_callback_set(NULL, NULL); - ecore_animator_custom_source_tick_end_callback_set(NULL, NULL); - ecore_animator_source_set(ECORE_ANIMATOR_SOURCE_TIMER); - } - return EINA_FALSE; -} - -static int ticking = 0; - -static Eina_Bool -vsync_server_data(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) -{ - Ecore_Con_Event_Server_Data *ev = event; - int i; - double t; - char *d; - if (ev->server != vsync_server) return EINA_TRUE; - d = ev->data; - if (ticking) - { - for (i = 0; i < ev->size - (int)(sizeof(double) - 1); i++) - { - memcpy(&t, &(d[i]), sizeof(double)); - ecore_loop_time_set(t); - ecore_animator_custom_tick(); - } - } - return EINA_FALSE; -} - -static void -vsync_tick_begin(void *data EINA_UNUSED) -{ - char val = 1; - ticking = val; - ecore_con_server_send(vsync_server, &val, 1); -} - -static void -vsync_tick_end(void *data EINA_UNUSED) -{ - char val = 0; - ticking = val; - ecore_con_server_send(vsync_server, &val, 1); -} - -static Eina_Bool -_glvsync_animator_tick_source_set(void) -{ - if (!vsync_server) - { - char buf[4096], run[4096], *disp, *s; - int tries = 0; - - if (!handlers) - { - _prefix = eina_prefix_new(NULL, ecore_x_vsync_animator_tick_source_set, - "ECORE_X", "ecore_x", "checkme", - PACKAGE_BIN_DIR, PACKAGE_LIB_DIR, - PACKAGE_DATA_DIR, PACKAGE_DATA_DIR); - ecore_con_init(); - } - disp = getenv("DISPLAY"); - if (!disp) disp = ":0"; - snprintf(buf, sizeof(buf), "ecore-x-vsync-%s", disp); - for (s = buf; *s; s++) - { - if (!(((*s >= 'a') && (*s <= 'z')) || - ((*s >= 'A') && (*s <= 'Z')) || - ((*s >= '0') && (*s <= '9')))) *s = '-'; - } - vsync_server = ecore_con_server_connect(ECORE_CON_LOCAL_USER, buf, 1, NULL); - if (!vsync_server) - { - snprintf(run, sizeof(run), "%s/ecore_x/bin/%s/ecore_x_vsync", - eina_prefix_lib_get(_prefix), MODULE_ARCH); - ecore_exe_run(run, NULL); - } - while (!vsync_server) - { - tries++; - if (tries > 50) return EINA_FALSE; - usleep(10000); - vsync_server = ecore_con_server_connect(ECORE_CON_LOCAL_USER, buf, 1, NULL); - } - if (!handlers) - { - ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD, vsync_server_add, NULL); - ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL, vsync_server_del, NULL); - ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA, vsync_server_data, NULL); - handlers = EINA_FALSE; - } - } - if (vsync_root) - { - ecore_animator_custom_source_tick_begin_callback_set(vsync_tick_begin, NULL); - ecore_animator_custom_source_tick_end_callback_set(vsync_tick_end, NULL); - ecore_animator_source_set(ECORE_ANIMATOR_SOURCE_CUSTOM); - } - else - { - if (vsync_server) - { - ecore_con_server_del(vsync_server); - vsync_server = NULL; - } - ecore_animator_custom_source_tick_begin_callback_set(NULL, NULL); - ecore_animator_custom_source_tick_end_callback_set(NULL, NULL); - ecore_animator_source_set(ECORE_ANIMATOR_SOURCE_TIMER); - } - return EINA_TRUE; -} -#endif - // XXX: missing mode 3 == separate x connection with compiled in dri2 proto // handling ala mesa (taken from mesa likely) @@ -871,30 +732,6 @@ _vsync_init(void) } } #endif - // nvidia gl vsync slave mode - if (mode == 0) - { - // we appear to have an nvidia driver running - if (!stat("/dev/nvidiactl", &stb)) - { - if (getenv("ECORE_VSYNC_DRM_VERSION_DEBUG")) - fprintf(stderr, "We appear to have an nvidia driver: drm flags %i\n", flags); - if ( - // we have dri device AND it's an nvidia one - ((!stat("/dev/dri/card0", &stb)) && - (flags & DRM_HAVE_NVIDIA)) - || - // or we have no dri device, and no nvidia flags - ((stat("/dev/dri/card0", &stb)) && - (flags == 0)) - ) - { - if (getenv("ECORE_VSYNC_DRM_VERSION_DEBUG")) - fprintf(stderr, "Using nvidia vsync slave proc\n"); - mode = 2; - } - } - } } done = 1; } @@ -928,13 +765,6 @@ ecore_x_vsync_animator_tick_source_set(Ecore_X_Window win) vsync_root = root; #ifdef ECORE_X_VSYNC_DRM if (mode == 1) return _drm_animator_tick_source_set(); -# ifdef ECORE_X_VSYNC_GL - else -# endif -#endif -#ifdef ECORE_X_VSYNC_GL - if (mode == 2) return _glvsync_animator_tick_source_set(); - else return EINA_FALSE; #endif } return EINA_TRUE;