From 0be3fb5ea24f060a6f266bcf31c77d33c0710511 Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Sat, 2 Feb 2019 22:19:15 +0000 Subject: [PATCH] Remove some unused macros/ifdefs Signed-off-by: Yuxuan Shui --- src/common.h | 14 +------------- src/opengl.c | 7 ------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/src/common.h b/src/common.h index b6d29d1..56ee25b 100644 --- a/src/common.h +++ b/src/common.h @@ -21,10 +21,7 @@ // #define DEBUG_RESTACK 1 // #define DEBUG_WINMATCH 1 // #define DEBUG_C2 1 -// #define DEBUG_GLX 1 -// #define DEBUG_GLX_GLSL 1 -// #define DEBUG_GLX_ERR 1 -// #define DEBUG_GLX_PAINTREG 1 +// #define DEBUG_GLX_DEBUG_CONTEXT 1 #define MAX_ALPHA (255) @@ -992,15 +989,6 @@ vsync_init(session_t *ps); void vsync_deinit(session_t *ps); -#ifdef CONFIG_OPENGL -/** @name GLX - */ -///@{ - -#endif - -///@} - /** @name DBus handling */ ///@{ diff --git a/src/opengl.c b/src/opengl.c index f54fddf..6dc4e84 100644 --- a/src/opengl.c +++ b/src/opengl.c @@ -365,13 +365,6 @@ glx_init(session_t *ps, bool need_render) { // Acquire function addresses if (need_render) { -#ifdef DEBUG_GLX_MARK - psglx->glStringMarkerGREMEDY = (f_StringMarkerGREMEDY) - glXGetProcAddress((const GLubyte *) "glStringMarkerGREMEDY"); - psglx->glFrameTerminatorGREMEDY = (f_FrameTerminatorGREMEDY) - glXGetProcAddress((const GLubyte *) "glFrameTerminatorGREMEDY"); -#endif - psglx->glXBindTexImageProc = (f_BindTexImageEXT) glXGetProcAddress((const GLubyte *) "glXBindTexImageEXT"); psglx->glXReleaseTexImageProc = (f_ReleaseTexImageEXT)