Changeset 390 for branches/thune/thread_safe/gl/gx.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.c (modified) (11 diffs)

branches/thune/thread_safe/gl/gx.c

@@ -26 +26 @@
 #include <string.h>
 #include <glv_keys.h>
-#include "os.h"
+#include "env.h"
 #include "glh.h"
 #include "gx.h"
@@ -571 +571 @@
     UCell* res = ur_s_prev( tos );
 
-    if( ur_stringSlice( tos, &cpA, &cpB ) )
+    if( ur_stringSlice( ut, tos, &cpA, &cpB ) )
     {
         if( ur_is( res, UT_FONT ) )
@@ -589 +589 @@
 
 
-// ( -- blk)
+// (blk -- blk)
 UR_CALL( uc_display_events )
 {
-    UIndex blkN;
-
-    UR_CALL_UNUSED_TOS
-
-    blkN = ur_holdIndex( ur_thread->env, gxEnv.eventBlkHold );
-    gxEnv.eventBlk = ur_blockPtr( blkN );
+    if( ! ur_is(tos, UT_BLOCK) )
+    {
+        ur_throwErr( UR_ERR_DATATYPE, "display.events expected block!" );
+        return;
+    }
+
+    gxEnv.eventBlk = ur_block( tos );
     gxEnv.eventBlk->used = 0;
 
     glv_handleEvents( gView );
-
-    UR_S_GROW;
-
-    ur_initType(UR_TOS, UT_BLOCK);
-    ur_setSeries(UR_TOS, blkN, 0);
 }
 
@@ -670 +666 @@
     glGetIntegerv( GL_VIEWPORT, vp );
 
-    ur_makeRaster( ur_s_next(tos), UR_RAST_RGB, vp[2], vp[3], &bin );
+    ur_makeRaster( ut, ur_s_next(tos), UR_RAST_RGB, vp[2], vp[3], &bin );
     UR_S_GROW;
 
@@ -1429 +1425 @@
 #if MAKE_ATOM_HEADER
 #define FIXED_ATOM(str,len,def) \
-    printf( "#define %s\t\t%d\n", #def, ur_intern(env,str,len) );
+    printf( "#define %s\t\t%d\n", #def, ur_intern(str,len) );
 #else
 #ifdef DEBUG
-#define FIXED_ATOM(str,len,def)     assert( ur_intern(env,str,len) == def );
+#define FIXED_ATOM(str,len,def)     assert( ur_intern(str,len) == def );
 #else
-#define FIXED_ATOM(str,len,def)     ur_intern(env,str,len);
+#define FIXED_ATOM(str,len,def)     ur_intern(str,len);
 #endif
 #endif
 
 // Intern commonly used atoms.
-static void _createFixedAtoms( UrlanEnv* env )
+static void _createFixedAtoms( UThread* ut )
 {
 #if MAKE_ATOM_HEADER
@@ -1501 +1497 @@
 {
     const GLubyte* gstr;
+    UThread* ut = env->threads;
 
 #if 0
@@ -1511 +1508 @@
     gxEnv.prevMouseY = MOUSE_UNSET;
 
-    _createFixedAtoms( env );
+    _createFixedAtoms( ut );
 
     gxEnv.eventBlk = 0;
-    gxEnv.eventBlkHold = ur_hold( env, UT_BLOCK, ur_makeBlock( 32 ) );
-
-
-    ur_makeCalls( env, _gxCalls, sizeof(_gxCalls) / sizeof(UCallDef) );
-
-    {
-        int ok = ur_evalCStr( env->threads, _gxBoot, sizeof(_gxBoot) );
+
+
+    ur_makeCalls( ut, _gxCalls, sizeof(_gxCalls) / sizeof(UCallDef) );
+
+    {
+        int ok = ur_evalCStr( ut, _gxBoot, sizeof(_gxBoot) );
         if( ok != UR_EVAL_OK )
             return ok;
@@ -1537 +1533 @@
     if( ! gView )
     {
-        ur_throwErr( env->threads, UR_EX_INTERNAL, "glv_create() failed" );
+        ur_throwErr( ut, UR_EX_INTERNAL, "glv_create() failed" );
         return UR_EVAL_ERROR;
     }
@@ -1546 +1542 @@
         glv_destroy( gView );
         gView = 0;
-        ur_throwErr( env->threads, UR_EX_INTERNAL, "OpenGL 2.0 required" );
+        ur_throwErr( ut, UR_EX_INTERNAL, "OpenGL 2.0 required" );
         return UR_EVAL_ERROR;
     }
@@ -1565 +1561 @@
 void gx_shutdown( UrlanEnv* env )
 {
+    (void) env;
 #if 0
     resd_free( &gEnv.resd );
@@ -1574 +1571 @@
 
     glv_destroy( gView );
-
-    ur_release( env, gxEnv.eventBlkHold );
 }