Changeset 301 for trunk/thune/gl

Timestamp:

10/23/06 04:19:31 (2 years ago)

Author:

krobillard

Message:

Thune - Added UBuffer & shader! datatype.

Location:

trunk/thune/gl

Files:

• draw_list.c (modified) (3 diffs)
• draw_ops.h (modified) (1 diff)
• gx.c (modified) (1 diff)
• gx.h (modified) (1 diff)
• gx.t (modified) (1 diff)
• gx_dt.c (modified) (3 diffs)
• project.r (modified) (1 diff)
• shader.c (added)
• shader.h (added)
• test.t (modified) (3 diffs)

trunk/thune/gl/draw_list.c

@@ -25 +25 @@
 #include "gllist.h"
 #include "math3d.h"
+#include "shader.h"
 
 #include <ft2build.h>
@@ -389 +390 @@
     pos[3] = w;
 
-    printf( "KR %d %d %g\n", light, pname, w );
+    //printf( "KR light %d %d %g\n", light, pname, w );
     glLightfv( light, pname, pos ); 
 }
@@ -715 +716 @@
                 break;
 
+            case DOP_SHADER:
+                ++pc;
+                VAL_WORD_OR_PC
+                loadShader( val );
+                break;
+
             default:
                 assert( 0 && "Invalid Draw List Opcode" );

trunk/thune/gl/draw_ops.h

@@ -29 +29 @@
 #define DOP_FONT            26
 #define DOP_TEXT            27
+#define DOP_SHADER          28

trunk/thune/gl/gx.c

@@ -1848 +1848 @@
     FIXED_ATOM( "specular", 8, UR_ATOM_SPECULAR );
     FIXED_ATOM( "pos",      3, UR_ATOM_POS );
+    FIXED_ATOM( "vertex",   6, UR_ATOM_VERTEX );
+    FIXED_ATOM( "fragment", 8, UR_ATOM_FRAGMENT );
 
 #if MAKE_ATOM_HEADER

trunk/thune/gl/gx.h

@@ -32 +32 @@
 #define UT_RASTER   UT_BI_COUNT
 #define UT_FONT     UT_BI_COUNT+1
+#define UT_SHADER   UT_BI_COUNT+2
 
 

trunk/thune/gl/gx.t

@@ -124 +124 @@
     font
     text
+
+    shader
 ]
 make-opcodes :draw-list-opcodes

trunk/thune/gl/gx_dt.c

@@ -25 +25 @@
 #include "gllist.h"
 #include "rfont.h"
+#include "shader.h"
 
 
@@ -296 +297 @@
 
 
+/*
+  (shader! spec -- shader)
+
+  Spec. block: [
+    param1: 0
+    param2: 1.0
+    vertex {...}
+    fragment {...}
+  ]
+*/
+UR_CALL( make_shader )
+{
+    UBlock* blk;
+    UCell* it;
+    UCell* end;
+    UCell* res = ur_s_prev(tos);
+    UAtom cmd = 0;
+    const char* vprog = 0;
+    const char* fprog = 0;
+
+    if( ur_is(res, UT_DATATYPE) )
+    {
+        if( ur_is(tos, UT_BLOCK) )
+        {
+            blk = ur_block(tos);
+            UR_ITER_BLOCK( it, end, blk, tos );
+            while( it != end )
+            {
+                switch( ur_type(it) )
+                {
+                    case UT_WORD:
+                        cmd = ur_atom(it);
+                        break;
+
+                    case UT_STRING:
+                    case UT_SLICE:
+                        if( cmd == UR_ATOM_VERTEX )
+                            vprog = ur_cstring( it );
+                        else if( cmd == UR_ATOM_FRAGMENT )
+                            fprog = ur_cstring( it );
+                        break;
+                }
+                ++it;
+            }
+
+            if( vprog && fprog )
+            {
+                if( ! makeShader( ur_thread, res, vprog, fprog ) )
+                    return;
+            }
+            else
+            {
+                ur_throwErr( UR_ERR_SCRIPT,
+                    "shader! make expected vertex & fragment programs" );
+                return;
+            }
+
+            UR_S_DROP;
+            return;
+        }
+    }
+    ur_throwErr( UR_ERR_DATATYPE, "shader! make expected block!" );
+}
+
+
+UR_CALL( to_shader )
+{
+    UR_CALL_UNUSED_TOS
+    ur_throwErr( UR_ERR_DATATYPE, "'to cannot be used on shader!" );
+}
+
+
+void toStr_shader( const UCell* cell, UString* out, int depth )
+{
+    (void) cell;
+    (void) depth;
+    ur_strCat( out, "<shader>", 8 );
+}
+
+
+int select_shader( UThread* ur_thread, UCell* val, const UCell* sel,
+                   UCell* res )
+{
+    (void) val;
+    (void) sel;
+    (void) res;
+    ur_throwErr( UR_ERR_SCRIPT, "Invalid select!" );
+    return 0;
+}
+
+
+static void mark_shader( UCollector* gc, UCell* cell )
+{
+    ur_gcMarkBuffer( gc, cell->series.n );
+}
+
+
+static void rmbuf_shader( UBuffer* buf )
+{
+    //printf( "KR rmbuf_shader()\n" );
+    Shader* sh = (Shader*) buf->ptr;
+    if( sh )
+    {
+        destroyShader( sh );
+        memFree( sh );
+        buf->ptr = 0;
+    }
+}
+
+
+/*--------------------------------------------------------------------------*/
+
+
 static void recycle_none( UrlanEnv* env, int phase )
 {
@@ -304 +418 @@
 
 
-UDatatype ug_datatypes[ 2 ] =
+static void rmbuf_none( UBuffer* buf )
+{
+    (void) buf;
+}
+
+
+UDatatype ug_datatypes[ 3 ] =
 {
     {"raster!", 0, 0,
         make_raster, to_raster, toStr_raster, toStr_raster,
-        select_raster, recycle_none, mark_raster },
+        select_raster, recycle_none, mark_raster, rmbuf_none },
 
     {"font!", 0, 0,
         make_rfont, to_rfont, toStr_rfont, toStr_rfont,
-        select_rfont, recycle_rfont, mark_rfont },
+        select_rfont, recycle_rfont, mark_rfont, rmbuf_none },
+
+    {"shader!", 0, 0,
+        make_shader, to_shader, toStr_shader, toStr_shader,
+        select_shader, recycle_none, mark_shader, rmbuf_shader },
 };
 

trunk/thune/gl/project.r

@@ -83 +83 @@
         %TexFont.c
         %rfont.c
+        %shader.c
         ;%res.c
         ;%../util/cbparse.c

trunk/thune/gl/test.t

@@ -44 +44 @@
 
 "data/d7.gx" load draw-list.compile :d7-list
+"data/test-shader.gx" load do
 
 
@@ -171 +172 @@
         light/1 [on -1.0,-0.8,0.0 diffuse 0.8,0.5,0.5]
         model
+        shader test-shader
         call d7-list
+        shader none
 
         camera ortho-cam
@@ -292 +295 @@
 font! ["data/FederationBold_KR.ttf" 12 256,128] make :fontF
 
-
 0,0,155 display.swap