Changeset 504 for trunk/thune/gl/shader.c

Timestamp:

02/02/08 23:13:47 (10 months ago)

Author:

krobillard

Message:

Shader parameter type of GL_SAMPLER_2D_SHADOW is now handled.

Files:

• trunk/thune/gl/shader.c (modified) (4 diffs)

trunk/thune/gl/shader.c

@@ -183 +183 @@
             {
                 ur_internWord( cell, pi->name );
-
+#if 0
+                printf( "KR Shader Param %d is type %d\n",
+                        (int) (pi - param), pi->type );
+#endif
                 ++cval;
                 switch( pi->type )
@@ -220 +223 @@
                     case GL_SAMPLER_2D:
                     case GL_SAMPLER_3D:
+                    case GL_SAMPLER_CUBE:
+                    case GL_SAMPLER_1D_SHADOW:
+                    case GL_SAMPLER_2D_SHADOW:
                         ur_initType( cval, UT_NONE );
                         ur_texId(cval) = 0;     // Expecting texture!.
@@ -235 +241 @@
                     GL_FLOAT_MAT3:
                     GL_FLOAT_MAT4:
-                    GL_SAMPLER_CUBE:
                     GL_SAMPLER_2D_RECT:
-                    GL_SAMPLER_1D_SHADOW:
-                    GL_SAMPLER_2D_SHADOW:
                     GL_SAMPLER_2D_RECT_SHADOW:
                     */
@@ -342 +345 @@
 
                     case GL_SAMPLER_2D:
+                    case GL_SAMPLER_2D_SHADOW:
                         glActiveTexture( GL_TEXTURE0 + texUnit );
                         glEnable( GL_TEXTURE_2D );