From 500e4f6f9a83b16c31330026f8b1f8aac46d4e0e Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Fri, 4 Oct 2013 11:25:14 -0400 Subject: [PATCH] Removed "u_colorTable" uniform from the GLES2 renderer. It's not used anywhere. --- src/render/opengles2/SDL_render_gles2.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/render/opengles2/SDL_render_gles2.c b/src/render/opengles2/SDL_render_gles2.c index 4b7e645b1..6f798022e 100644 --- a/src/render/opengles2/SDL_render_gles2.c +++ b/src/render/opengles2/SDL_render_gles2.c @@ -122,8 +122,7 @@ typedef enum GLES2_UNIFORM_PROJECTION, GLES2_UNIFORM_TEXTURE, GLES2_UNIFORM_MODULATION, - GLES2_UNIFORM_COLOR, - GLES2_UNIFORM_COLORTABLE + GLES2_UNIFORM_COLOR } GLES2_Uniform; typedef enum @@ -721,9 +720,7 @@ GLES2_CacheProgram(SDL_Renderer *renderer, GLES2_ShaderCacheEntry *vertex, entry->uniform_locations[GLES2_UNIFORM_MODULATION] = data->glGetUniformLocation(entry->id, "u_modulation"); entry->uniform_locations[GLES2_UNIFORM_COLOR] = - data->glGetUniformLocation(entry->id, "u_color"); - entry->uniform_locations[GLES2_UNIFORM_COLORTABLE] = - data->glGetUniformLocation(entry->id, "u_colorTable"); + rdata->glGetUniformLocation(entry->id, "u_color"); /* Cache the linked program */ if (data->program_cache.head)