From c71777f5ec74967d3920ccb18add732e47f7eb23 Mon Sep 17 00:00:00 2001 From: Themaister Date: Sat, 6 Jul 2013 15:25:34 +0200 Subject: [PATCH] Clear out uniform struct and use stock shader. --- gfx/shader_glsl.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gfx/shader_glsl.c b/gfx/shader_glsl.c index df090608cf..dc7b1a1a6d 100644 --- a/gfx/shader_glsl.c +++ b/gfx/shader_glsl.c @@ -23,6 +23,8 @@ #include "../dynamic.h" #include "../file.h" +#define GLSL_DEBUG + #ifdef HAVE_CONFIG_H #include "../config.h" #endif @@ -677,6 +679,7 @@ static void gl_glsl_deinit(void) glDeleteTextures(glsl_shader->luts, gl_teximage); memset(gl_program, 0, sizeof(gl_program)); + memset(gl_uniforms, 0, sizeof(gl_uniforms)); glsl_enable = false; active_index = 0; @@ -770,6 +773,14 @@ static bool gl_glsl_init(const char *path) const char *stock_fragment = glsl_shader->modern ? stock_fragment_modern : stock_fragment_legacy; +#ifndef HAVE_OPENGLES2 + if (glsl_core) + { + stock_vertex = stock_vertex_core; + stock_fragment = stock_fragment_core; + } +#endif + #ifdef HAVE_OPENGLES2 if (!glsl_shader->modern) {