Changeset 420 for branches/thune/thread_safe/gl/gx.c

Timestamp:

06/30/07 08:14:01 (17 months ago)

Author:

krobillard

Message:

Thune GL - Added 'image & mouse button words. Fixes to specular model shaders.

Files:

• branches/thune/thread_safe/gl/gx.c (modified) (3 diffs)

branches/thune/thread_safe/gl/gx.c

@@ -1217 +1217 @@
     }
     ur_throwErr( UR_ERR_DATATYPE,
-            "lerp expected decimal!/vec3! decimal!/vec3! decimal!" );
+                 "lerp expected decimal!/vec3! decimal!/vec3! decimal!" );
 }
 
@@ -1528 +1528 @@
 #endif
 
+    gxEnv.maxTextureUnits = 0;
     gxEnv.view = 0;
     gxEnv.prevMouseX = MOUSE_UNSET;
     gxEnv.prevMouseY = MOUSE_UNSET;
+    gxEnv.eventBlk = 0;
 
     _createFixedAtoms( ut );
-
-    gxEnv.eventBlk = 0;
-
 
     ur_makeCalls( ut, _gxCalls, sizeof(_gxCalls) / sizeof(UCallDef) );
@@ -1579 +1578 @@
     glfbo_startup();
 
+    glGetIntegerv( GL_MAX_TEXTURE_UNITS, &gxEnv.maxTextureUnits );
+
     return UR_EVAL_OK;
 }