From a1ce1e4f1d4a56fae544e49ea8c1b13d09c6f6ff Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 4 Aug 2020 03:58:51 +0200 Subject: [PATCH] gl_glsl_set_proc_address unneeded - remove it --- gfx/drivers/gl.c | 5 +---- gfx/drivers_shader/shader_glsl.c | 9 +-------- gfx/drivers_shader/shader_glsl.h | 2 -- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 3435e01471..4fd6df514a 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -2049,11 +2049,8 @@ static bool gl2_shader_init(gl_t *gl, const gfx_ctx_driver_t *ctx_driver, #ifdef HAVE_GLSL if (type == RARCH_SHADER_GLSL) - { - gl_glsl_set_get_proc_address(ctx_driver->get_proc_address); gl_glsl_set_context_type(gl->core_context_in_use, - hwr->version_major, hwr->version_minor); - } + hwr->version_major, hwr->version_minor); #endif init_data.gl.core_context_enabled = gl->core_context_in_use; diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c index 510eb25deb..83491fe2cb 100644 --- a/gfx/drivers_shader/shader_glsl.c +++ b/gfx/drivers_shader/shader_glsl.c @@ -68,8 +68,6 @@ struct glsl_attrib GLsizei offset; }; -static gfx_ctx_proc_t (*glsl_get_proc_address)(const char*); - struct shader_uniforms_frame { int texture; @@ -1606,15 +1604,10 @@ static void gl_glsl_get_flags(uint32_t *flags) BIT32_SET(*flags, GFX_CTX_FLAGS_SHADERS_GLSL); } -void gl_glsl_set_get_proc_address(gfx_ctx_proc_t (*proc)(const char*)) -{ - glsl_get_proc_address = proc; -} - void gl_glsl_set_context_type(bool core_profile, unsigned major, unsigned minor) { - glsl_core = core_profile; + glsl_core = core_profile; glsl_major = major; glsl_minor = minor; } diff --git a/gfx/drivers_shader/shader_glsl.h b/gfx/drivers_shader/shader_glsl.h index cc0e4769ae..45cf36d907 100644 --- a/gfx/drivers_shader/shader_glsl.h +++ b/gfx/drivers_shader/shader_glsl.h @@ -21,8 +21,6 @@ #include "../video_defines.h" -void gl_glsl_set_get_proc_address(gfx_ctx_proc_t (*proc)(const char*)); - void gl_glsl_set_context_type(bool core_profile, unsigned major, unsigned minor); #endif