Changeset 438 for branches/thune/thread_safe/gl/shader.c

Timestamp:

07/25/07 22:34:48 (16 months ago)

Author:

krobillard

Message:

GL - texture! make can now make GL_TEXTURE_1D from binary!.

Files:

• branches/thune/thread_safe/gl/shader.c (modified) (2 diffs)

branches/thune/thread_safe/gl/shader.c

@@ -334 +334 @@
 
                     case GL_SAMPLER_1D:
+                        glActiveTexture( GL_TEXTURE0 + texUnit );
+                        glEnable( GL_TEXTURE_1D );
+                        glBindTexture( GL_TEXTURE_1D, ur_texId(cval) );
+                        glUniform1i( pi->location, texUnit );
+                        ++texUnit;
+                        break;
+
                     case GL_SAMPLER_2D:
-                    case GL_SAMPLER_3D:
                         glActiveTexture( GL_TEXTURE0 + texUnit );
                         glEnable( GL_TEXTURE_2D );
@@ -342 +348 @@
                         ++texUnit;
                         break;
+
+                    //case GL_SAMPLER_3D:
                 }
                 ++pi;