From e6897a7d13ba36589664e19a9f8f3ba600965b7d Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Tue, 8 Feb 2011 16:50:51 -0800
Subject: [PATCH] Fixed setting the texture unit, still doesn't work.

---
 src/render/opengl/SDL_render_gl.c  | 2 +-
 src/render/opengl/SDL_shaders_gl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/render/opengl/SDL_render_gl.c b/src/render/opengl/SDL_render_gl.c
index cd9831301..7765d24dd 100644
--- a/src/render/opengl/SDL_render_gl.c
+++ b/src/render/opengl/SDL_render_gl.c
@@ -282,7 +282,7 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags)
     }
 
     /* Check for shader support */
-    //data->shaders = GL_CreateShaderContext();
+    data->shaders = GL_CreateShaderContext();
 
 #if 0
     /* We support YV12 textures using 3 textures and a shader */
diff --git a/src/render/opengl/SDL_shaders_gl.c b/src/render/opengl/SDL_shaders_gl.c
index f62d6d783..bc4cb655a 100644
--- a/src/render/opengl/SDL_shaders_gl.c
+++ b/src/render/opengl/SDL_shaders_gl.c
@@ -183,7 +183,7 @@ CompileShaderProgram(GL_ShaderContext *ctx, int index, GL_ShaderData *data)
         SDL_snprintf(tex_name, SDL_arraysize(tex_name), "tex%d", i);
         location = ctx->glGetUniformLocationARB(data->program, tex_name);
         if (location >= 0) {
-            ctx->glUniform1iARB(location, 1);
+            ctx->glUniform1iARB(location, i);
         }
     }
     ctx->glUseProgramObjectARB(0);