From 8f72b1739a6d3b8141481a52ecdc7657df3fab0d Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Sun, 6 Mar 2011 15:05:06 +0000
Subject: [PATCH] gl: use glActiveTexture() instead of glClientActiveTexture()
 to match the GLES2 codepath.

---
 src/debugquad.cpp | 2 +-
 src/tileset.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/debugquad.cpp b/src/debugquad.cpp
index a572e5f9..84cd4839 100644
--- a/src/debugquad.cpp
+++ b/src/debugquad.cpp
@@ -178,7 +178,7 @@ void DebugQuad::TickDraw(float deltams)
     glEnableVertexAttribArray(attr_tex);
 
     /* Bind texture */
-    glClientActiveTexture(GL_TEXTURE0);
+    glActiveTexture(GL_TEXTURE0);
     glBindTexture(GL_TEXTURE_2D, data->texlist[0]);
 
     glBindBuffer(GL_ARRAY_BUFFER, data->buflist[0]);
diff --git a/src/tileset.cpp b/src/tileset.cpp
index 769f5fe4..5d30a5a3 100644
--- a/src/tileset.cpp
+++ b/src/tileset.cpp
@@ -171,7 +171,7 @@ void TileSet::Bind()
 {
     if (!data->img && data->texture)
     {
-        glClientActiveTexture(GL_TEXTURE0);
+        glActiveTexture(GL_TEXTURE0);
         glBindTexture(GL_TEXTURE_2D, data->texture);
     }
 }