Changeset 704Tweet

Timestamp:

Feb 28, 2011, 3:26:27 AM (10 years ago)

Author:

sam

Message:

Use glClientActiveTexture() wherever it appears to make sense.

Location:

trunk/src

Files:

• debugquad.cpp (modified) (4 diffs)
• tileset.cpp (modified) (2 diffs)

trunk/src/debugquad.cpp

@@ -52 +52 @@
 {
     data->initialised = 0;
-    data->time = 0.0f;
+    data->time = RandF(10000.0f);
 
     drawgroup = DRAWGROUP_HUD;
@@ -115 +115 @@
         glGenTextures(1, data->texlist);
 
-        glActiveTexture(GL_TEXTURE0);
+        glEnable(GL_TEXTURE_2D);
         glBindTexture(GL_TEXTURE_2D, data->texlist[0]);
         for (int j = 0; j < 32; j++)
@@ -179 +179 @@
 
     /* Bind texture */
-    glActiveTexture(GL_TEXTURE0);
+    glClientActiveTexture(GL_TEXTURE0);
     glBindTexture(GL_TEXTURE_2D, data->texlist[0]);
 
@@ -218 +218 @@
 
     /* Bind texture */
-    glActiveTexture(GL_TEXTURE0);
+    glClientActiveTexture(GL_TEXTURE0);
     glBindTexture(GL_TEXTURE_2D, data->texlist[0]);
 

trunk/src/tileset.cpp

@@ -137 +137 @@
 
         glGenTextures(1, &data->texture);
+        glEnable(GL_TEXTURE_2D);
         glBindTexture(GL_TEXTURE_2D, data->texture);
 
-        glTexImage2D(GL_TEXTURE_2D, 0, planes, w, h, 0,
+        glTexImage2D(GL_TEXTURE_2D, 0, format, w, h, 0,
                      format, GL_UNSIGNED_BYTE, pixels);
 
@@ -170 +171 @@
 {
     if (!data->img && data->texture)
+    {
+        glClientActiveTexture(GL_TEXTURE0);
         glBindTexture(GL_TEXTURE_2D, data->texture);
+    }
 }