diff --git a/gfx/common/gl_common.h b/gfx/common/gl_common.h index 8a8141397b..0090b207a4 100644 --- a/gfx/common/gl_common.h +++ b/gfx/common/gl_common.h @@ -76,9 +76,7 @@ typedef struct gl bool menu_texture_enable; bool menu_texture_full_screen; #endif -#ifdef HAVE_GL_SYNC bool have_sync; -#endif #ifdef HAVE_GL_ASYNC_READBACK bool pbo_readback_valid[4]; bool pbo_readback_enable; @@ -124,9 +122,7 @@ typedef struct gl #ifdef HAVE_GL_ASYNC_READBACK unsigned pbo_readback_index; #endif -#ifdef HAVE_GL_SYNC unsigned fence_count; -#endif unsigned last_width[GFX_MAX_TEXTURES]; unsigned last_height[GFX_MAX_TEXTURES]; @@ -158,9 +154,7 @@ typedef struct gl struct video_fbo_rect fbo_rect[GFX_MAX_SHADERS]; struct gfx_fbo_scale fbo_scale[GFX_MAX_SHADERS]; -#ifdef HAVE_GL_SYNC GLsync fences[MAX_FENCES]; -#endif const gl_renderchain_driver_t *renderchain_driver; void *renderchain_data; } gl_t; diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 5bbbfe3205..6cb06b1dc0 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -1418,7 +1418,6 @@ static bool gl_frame(void *data, const void *frame, video_info->cb_swap_buffers(video_info->context_data, video_info); -#ifdef HAVE_GL_SYNC if (video_info->hard_sync && gl->have_sync) { glClear(GL_COLOR_BUFFER_BIT); @@ -1436,7 +1435,6 @@ static bool gl_frame(void *data, const void *frame, gl->fence_count * sizeof(GLsync)); } } -#endif #ifndef HAVE_OPENGLES if (gl_query_core_context_in_use()) @@ -1484,7 +1482,6 @@ static void gl_free(void *data) context_bind_hw_render(false); -#ifdef HAVE_GL_SYNC if (gl->have_sync) { unsigned i; @@ -1497,7 +1494,6 @@ static void gl_free(void *data) } gl->fence_count = 0; } -#endif font_driver_free_osd(); video_shader_driver_deinit(); @@ -1610,11 +1606,9 @@ static bool resolve_extensions(gl_t *gl, const char *context_ident) gl->have_full_npot_support = gl_check_capability(GL_CAPS_FULL_NPOT_SUPPORT); #endif -#ifdef HAVE_GL_SYNC gl->have_sync = gl_check_capability(GL_CAPS_SYNC); if (gl->have_sync && settings->bools.video_hard_sync) RARCH_LOG("[GL]: Using ARB_sync to reduce latency.\n"); -#endif video_driver_unset_rgba(); #if defined(HAVE_OPENGLES) && !defined(HAVE_PSGL)