Changeset 390 for branches/thune/thread_safe/gl/gx_dt.c

Timestamp:

05/17/07 18:27:45 (18 months ago)

Author:

krobillard

Message:

Thune - OpenGL version works in thread_safe branch.

Files:

• branches/thune/thread_safe/gl/gx_dt.c (modified) (19 diffs)

branches/thune/thread_safe/gl/gx_dt.c

@@ -38 +38 @@
 
 
-static void toStr_dlist( const UCell* cell, UString* out, int depth )
-{
+static void toStr_dlist( UThread* ut, const UCell* cell, UString* out,
+                         int depth )
+{
+    (void) ut;
     (void) cell;
     (void) depth;
@@ -73 +75 @@
   \return Binary index and initialied res.  If binp is non-zero, it is set.
 */
-UIndex ur_makeRaster( UCell* res, int format, int w, int h, UBinary** binp )
+UIndex ur_makeRaster( UThread* ut, UCell* res,
+                      int format, int w, int h, UBinary** binp )
 {
     UIndex binN;
@@ -122 +125 @@
             }
 
-            ur_makeRaster( res, format,
+            ur_makeRaster( ut, res, format,
                            tos->coord.elem[0], tos->coord.elem[1], 0 );
 
@@ -148 +151 @@
 
 
-static void toStr_raster( const UCell* cell, UString* out, int depth )
+static void toStr_raster( UThread* ut, const UCell* cell, UString* out,
+                          int depth )
 {
     int uformat;
@@ -178 +182 @@
 
 
-static int select_raster( UThread* ur_thread, UCell* val, const UCell* sel,
+static int select_raster( UThread* ut, UCell* val, const UCell* sel,
                           UCell* res )
 {
@@ -350 +354 @@
                 {
                     case UT_WORD:
-                        val = ur_wordCell( ur_thread, it );
+                        val = ur_wordCell( ut, it );
                         if( ! val )
                             return;
@@ -461 +465 @@
 
 
-static void toStr_texture( const UCell* cell, UString* out, int depth )
-{
+static void toStr_texture( UThread* ut, const UCell* cell, UString* out,
+                           int depth )
+{
+    (void) ut;
     (void) cell;
     (void) depth;
@@ -469 +475 @@
 
 
-static int select_texture( UThread* ur_thread, UCell* val, const UCell* sel,
+static int select_texture( UThread* ut, UCell* val, const UCell* sel,
                            UCell* res )
 {
@@ -488 +494 @@
     }
     if( ri )
-        return select_raster( ur_thread, val, sel, res );
+        return select_raster( ut, val, sel, res );
     return 0;
 }
@@ -549 +555 @@
                     case UT_SLICE:
                         if( cfg.fontFile )
-                            cfg.glyphs = ur_cstring( it );
+                            cfg.glyphs = ur_cstring( ut, it );
                         else
-                            cfg.fontFile = ur_cstring( it );
+                            cfg.fontFile = ur_cstring( ut, it );
                         break;
 
@@ -572 +578 @@
             }
 
-            if( ! ur_makeRFont( ur_thread, res, &cfg ) )
+            if( ! ur_makeRFont( ut, res, &cfg ) )
                 return;
 
@@ -583 +589 @@
 
 
-static void toStr_rfont( const UCell* cell, UString* out, int depth )
-{
+static void toStr_rfont( UThread* ut, const UCell* cell, UString* out,
+                         int depth )
+{
+    (void) ut;
     (void) cell;
     (void) depth;
@@ -591 +599 @@
 
 
-static int select_rfont( UThread* ur_thread, UCell* val, const UCell* sel,
+static int select_rfont( UThread* ut, UCell* val, const UCell* sel,
                          UCell* res )
 {
@@ -667 +675 @@
                     case UT_SLICE:
                         if( cmd == UR_ATOM_VERTEX )
-                            vprog = ur_cstring( it );
+                            vprog = ur_cstring( ut, it );
                         else if( cmd == UR_ATOM_FRAGMENT )
-                            fprog = ur_cstring( it );
+                            fprog = ur_cstring( ut, it );
                         break;
 
@@ -682 +690 @@
             if( vprog && fprog )
             {
-                if( ! makeShader( ur_thread, res, vprog, fprog ) )
+                if( ! makeShader( ut, res, vprog, fprog ) )
                     return;
 
@@ -711 +719 @@
 
 
-static void toStr_shader( const UCell* cell, UString* out, int depth )
-{
+static void toStr_shader( UThread* ut, const UCell* cell, UString* out,
+                          int depth )
+{
+    (void) ut;
     (void) cell;
     (void) depth;
@@ -856 +866 @@
 
 
-static void toStr_fbo( const UCell* cell, UString* out, int depth )
-{
+static void toStr_fbo( UThread* ut, const UCell* cell, UString* out, int depth )
+{
+    (void) ut;
     (void) cell;
     (void) depth;
@@ -864 +875 @@
 
 
-static int select_fbo( UThread* ur_thread, UCell* val, const UCell* sel,
+static int select_fbo( UThread* ut, UCell* val, const UCell* sel,
                        UCell* res )
 {
@@ -910 +921 @@
 
 
-static int select_nop( UThread* ur_thread, UCell* val, const UCell* sel,
+static int select_nop( UThread* ut, UCell* val, const UCell* sel,
                        UCell* res )
 {