Changeset 304 for trunk/thune/gl

Timestamp:

10/30/06 03:10:11 (2 years ago)

Author:

krobillard

Message:

Thune GL - Shader 'default block implemented.

Location:

trunk/thune/gl

Files:

• gx.c (modified) (1 diff)
• gx_atoms.h (modified) (1 diff)
• gx_dt.c (modified) (4 diffs)
• test.t (modified) (1 diff)

trunk/thune/gl/gx.c

@@ -1851 +1851 @@
     FIXED_ATOM( "vertex",   6, UR_ATOM_VERTEX );
     FIXED_ATOM( "fragment", 8, UR_ATOM_FRAGMENT );
+    FIXED_ATOM( "default",  7, UR_ATOM_DEFAULT );
 
 #if MAKE_ATOM_HEADER

trunk/thune/gl/gx_atoms.h

@@ -21 +21 @@
 #define UR_ATOM_VERTEX          319
 #define UR_ATOM_FRAGMENT                320
+#define UR_ATOM_DEFAULT         321

trunk/thune/gl/gx_dt.c

@@ -21 +21 @@
 #include "os.h"
 #include "gx.h"
+#include "internal.h"
 #include "urlan_atoms.h"
 #include "gx_atoms.h"
@@ -314 +315 @@
     UCell* res = ur_s_prev(tos);
     UAtom cmd = 0;
+    UIndex defN = 0;
     const char* vprog = 0;
     const char* fprog = 0;
@@ -338 +340 @@
                             fprog = ur_cstring( it );
                         break;
+
+                    case UT_BLOCK:
+                        if( cmd == UR_ATOM_DEFAULT )
+                            defN = it->series.n;
+                        break;
                 }
                 ++it;
@@ -346 +353 @@
                 if( ! makeShader( ur_thread, res, vprog, fprog ) )
                     return;
+
+                if( ur_is(res, UT_CONTEXT) && defN )
+                {
+                    ur_bind( defN, res );
+
+                    ur_initType( tos, UT_BLOCK );
+                    ur_setSeries( tos, defN, 0 );
+
+                    UR_CALL_OP = OP_DO;
+                    return;
+                }
             }
             else

trunk/thune/gl/test.t

@@ -50 +50 @@
 ;"data/shader/testA.gx"
     load.shader :test-shader
-
-test-shader context! is-type? ift (
-    1.0, 0.3, 0.2 :test-shader/brickcolor
-    0.9, 0.85     :test-shader/brickpct
-    1.0, 0.5      :test-shader/bricksize
-    0.8, 0.8, 0.8 :test-shader/mortarcolor
-)
-;test-shader .
 
 0,0,0 :strobe