Changeset 409 for branches/thune/thread_safe/gl/draw_list.c

Timestamp:

06/11/07 04:15:55 (18 months ago)

Author:

krobillard

Message:

Thune GL - Added enable/disable with state tracking.
Geometry ops now handle words.

Files:

• branches/thune/thread_safe/gl/draw_list.c (modified) (22 diffs)

branches/thune/thread_safe/gl/draw_list.c

@@ -30 +30 @@
 
 
+enum EnableMask
+{
+    EN_ALPHA_TEST   = 0x0001, 
+    EN_BLEND        = 0x0002,
+    EN_CULL_FACE    = 0x0004,
+    EN_DEPTH_TEST   = 0x0008,
+    EN_LIGHTING     = 0x0010,
+    EN_LINE_SMOOTH  = 0x0020,
+    EN_POINT_SMOOTH = 0x0040,
+    EN_POINT_SPRITE = 0x0080,
+    EN_SCISSOR_TEST = 0x0100,
+    EN_STENCIL_TEST = 0x0200,
+    EN_TEXTURE_2D   = 0x0400,
+    EN_VERTEX_PROGRAM_POINT_SIZE = 0x0800
+};
+
+#define EN_DEFAULT  0
+
+
 enum CameraContext
 {
@@ -44 +63 @@
 
 
+#if 0
 void gr_disableTexture()
 {
@@ -61 +81 @@
 #endif
 }
+#endif
 
 
 void gr_clearState()
 {
-    _state.stateId   = GRS_UNSET;
-    _state.fontN     = 0;
-    _state.penX      = 0;
-    _state.penY      = 0;
-    _state.vertVals  = 0;
-    _state.normVals  = 0;
-    _state.uvVals    = 0;
-    _state.colorVals = 0;
+    _state.stateId      = GRS_UNSET;
+    _state.enableMask   = EN_DEFAULT;
+    _state.fontN        = 0;
+    _state.penX         = 0;
+    _state.penY         = 0;
+    _state.vertVals     = 0;
+    _state.normVals     = 0;
+    _state.uvVals       = 0;
+    _state.colorVals    = 0;
     _state.attr[0].vals = 0;
     _state.attr[1].vals = 0;
@@ -79 +101 @@
 
 
+static void gr_enable( const char* );
+static void gr_disable( const char* );
+
+
 void gr_setState( int sid )
 {
@@ -88 +114 @@
         case GRS_SOLID:
             glDepthMask( GL_FALSE );
+            gr_disable( "lbct" );
+            /*
             glDisable( GL_LIGHTING );
             glDisable( GL_BLEND );
             glDisable( GL_CULL_FACE );
-
             gr_disableTexture();
+            */
             break;
 
         case GRS_MODEL:
             glDepthMask( GL_TRUE );
-            glShadeModel( GL_SMOOTH );
-
-            //glColorMaterial( GL_FRONT, GL_DIFFUSE );
-            //glEnable( GL_COLOR_MATERIAL );
-
+            //glShadeModel( GL_SMOOTH );
+
+            gr_enable( "dlc" );
+            gr_disable( "b" );
+            /*
             glEnable( GL_DEPTH_TEST );
             glEnable( GL_LIGHTING );
@@ -107 +135 @@
 
             glDisable( GL_BLEND );
+            */
 
             //gr_disableTexture();
-            gr_enableTexture0();
+            //gr_enableTexture0();
             break;
 
@@ -115 +144 @@
             glDepthMask( GL_FALSE );
 
+            gr_enable( "bt" );
+            gr_disable( "adl" );
+            /*
             glDisable( GL_ALPHA_TEST );
             glDisable( GL_DEPTH_TEST );
-            glDisable( GL_FOG );
             glDisable( GL_LIGHTING );
-            glDisable( GL_COLOR_MATERIAL );
 
             glEnable( GL_BLEND );
+            gr_enableTexture0();
+            */
             glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
 
-            gr_enableTexture0();
 
             //glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
@@ -130 +161 @@
 
         case GRS_PARTICLE:
-            if( _state.stateId != GRS_TEXT )
-            {
-                glDepthMask( GL_FALSE );
-
-            //glEnable( GL_DEPTH_TEST );
-
-                glDisable( GL_ALPHA_TEST );
-                glDisable( GL_DEPTH_TEST );
-                glDisable( GL_FOG );
-                glDisable( GL_LIGHTING );
-                glDisable( GL_COLOR_MATERIAL );
-
-                glEnable( GL_BLEND );
-            }
-            glEnable( GL_VERTEX_PROGRAM_POINT_SIZE );
+            glDepthMask( GL_FALSE );
+
+            gr_enable( "bv" );
+            gr_disable( "adl" );
+            /*
+            glDisable( GL_ALPHA_TEST );
+            glDisable( GL_DEPTH_TEST );
+            glDisable( GL_LIGHTING );
+
+            glEnable( GL_BLEND );
+            */
+
+            //glEnable( GL_VERTEX_PROGRAM_POINT_SIZE );
             //gr_disableTexture();
 
@@ -171 +200 @@
 
     glDisable( GL_POLYGON_STIPPLE );
-
-    glColorMaterial( GL_FRONT, GL_DIFFUSE );
-    glEnable( GL_COLOR_MATERIAL );
 
     glEnable( GL_DEPTH_TEST );
@@ -588 +614 @@
 
     glDepthMask( GL_TRUE );
+    gr_enable( "d" );
+    gr_disable( "blt" );
+    /*
     glEnable( GL_DEPTH_TEST );
     glDisable( GL_LIGHTING );
     glDisable( GL_BLEND );
     gr_disableTexture();
+    */
 
 
@@ -598 +628 @@
 
 #ifdef SHADOW_BACK_FACES
-    glEnable( GL_CULL_FACE );
+    gr_enable( "c" ); //glEnable( GL_CULL_FACE );
     glCullFace( GL_FRONT );
 #else
@@ -820 +850 @@
 
 
+#ifdef DEBUG
+#define PRINT_STATE(txt,f,e) \
+    s = glIsEnabled( e ); \
+    sf = s ? f : 0; \
+    mf = _state.enableMask & f; \
+    if( sf ^ mf ) \
+        printf( "%d/%d %s\n", s, mf ? 1 : 0, txt );
+
+void gr_printEnabled()
+{
+    GLboolean s;
+    int mf;
+    int sf;
+
+    PRINT_STATE( "GL_ALPHA_TEST/a",   EN_ALPHA_TEST,   GL_ALPHA_TEST )
+    PRINT_STATE( "GL_BLEND/b",        EN_BLEND,        GL_BLEND )
+    PRINT_STATE( "GL_CULL_FACE/c",    EN_CULL_FACE,    GL_CULL_FACE )
+    PRINT_STATE( "GL_DEPTH_TEST/d",   EN_DEPTH_TEST,   GL_DEPTH_TEST )
+    PRINT_STATE( "GL_LIGHTING/l",     EN_LIGHTING,     GL_LIGHTING )
+    PRINT_STATE( "GL_LINE_SMOOTH/n",  EN_LINE_SMOOTH,  GL_LINE_SMOOTH )
+    PRINT_STATE( "GL_POINT_SMOOTH/o", EN_POINT_SMOOTH, GL_POINT_SMOOTH )
+    PRINT_STATE( "GL_POINT_SPRITE/p", EN_POINT_SPRITE, GL_POINT_SPRITE )
+    PRINT_STATE( "GL_STENCIL_TEST/s", EN_STENCIL_TEST, GL_STENCIL_TEST )
+    PRINT_STATE( "GL_TEXTURE_2D/t",   EN_TEXTURE_2D,   GL_TEXTURE_2D )
+    PRINT_STATE( "GL_VERTEX_PROGRAM_POINT_SIZE/v",
+                 EN_VERTEX_PROGRAM_POINT_SIZE, GL_VERTEX_PROGRAM_POINT_SIZE )
+    PRINT_STATE( "GL_SCISSOR_TEST/x", EN_SCISSOR_TEST, GL_SCISSOR_TEST )
+}
+#endif
+
+
+#define ENABLE(f,e) \
+    if( ! (_state.enableMask & f) ) { \
+        _state.enableMask |= f; \
+        glEnable( e ); }
+
+#define DISABLE(f,e) \
+    if( _state.enableMask & f ) { \
+        _state.enableMask &= ~f; \
+        glDisable( e ); }
+
+static void gr_enable( const char* cp )
+{
+    //printf( "KR %s\n", cp );
+    while( *cp != '\0' )
+    {
+        switch( *cp )
+        {
+            case 'a':
+                ENABLE( EN_ALPHA_TEST, GL_ALPHA_TEST )
+                break;
+            case 'b':
+                ENABLE( EN_BLEND, GL_BLEND )
+                break;
+            case 'c':
+                ENABLE( EN_CULL_FACE, GL_CULL_FACE )
+                break;
+            case 'd':
+                ENABLE( EN_DEPTH_TEST, GL_DEPTH_TEST )
+                break;
+            case 'l':
+                ENABLE( EN_LIGHTING, GL_LIGHTING )
+                break;
+            case 'n':
+                ENABLE( EN_LINE_SMOOTH, GL_LINE_SMOOTH )
+                break;
+            case 'o':
+                ENABLE( EN_POINT_SMOOTH, GL_POINT_SMOOTH )
+                break;
+            case 'p':
+                ENABLE( EN_POINT_SPRITE, GL_POINT_SPRITE )
+                break;
+            case 's':
+                ENABLE( EN_STENCIL_TEST, GL_STENCIL_TEST )
+                break;
+            case 't':
+                ENABLE( EN_TEXTURE_2D, GL_TEXTURE_2D )
+                break;
+            case 'v':
+                ENABLE( EN_VERTEX_PROGRAM_POINT_SIZE,
+                        GL_VERTEX_PROGRAM_POINT_SIZE )
+                break;
+            case 'x':
+                ENABLE( EN_SCISSOR_TEST, GL_SCISSOR_TEST )
+                break;
+#ifdef DEBUG
+            case '?':
+                gr_printEnabled();
+                break;
+#endif
+        }
+        ++cp;
+    }
+}
+
+
+static void gr_disable( const char* cp )
+{
+    while( *cp != '\0' )
+    {
+        switch( *cp )
+        {
+            case 'a':
+                DISABLE( EN_ALPHA_TEST, GL_ALPHA_TEST )
+                break;
+            case 'b':
+                DISABLE( EN_BLEND, GL_BLEND )
+                break;
+            case 'c':
+                DISABLE( EN_CULL_FACE, GL_CULL_FACE )
+                break;
+            case 'd':
+                DISABLE( EN_DEPTH_TEST, GL_DEPTH_TEST )
+                break;
+            case 'l':
+                DISABLE( EN_LIGHTING, GL_LIGHTING )
+                break;
+            case 'n':
+                DISABLE( EN_LINE_SMOOTH, GL_LINE_SMOOTH )
+                break;
+            case 'o':
+                DISABLE( EN_POINT_SMOOTH, GL_POINT_SMOOTH )
+                break;
+            case 'p':
+                DISABLE( EN_POINT_SPRITE, GL_POINT_SPRITE )
+                break;
+            case 's':
+                DISABLE( EN_STENCIL_TEST, GL_STENCIL_TEST )
+                break;
+            case 't':
+                DISABLE( EN_TEXTURE_2D, GL_TEXTURE_2D )
+                break;
+            case 'v':
+                DISABLE( EN_VERTEX_PROGRAM_POINT_SIZE,
+                         GL_VERTEX_PROGRAM_POINT_SIZE )
+                break;
+            case 'x':
+                DISABLE( EN_SCISSOR_TEST, GL_SCISSOR_TEST )
+                break;
+#ifdef DEBUG
+            case '?':
+                gr_printEnabled();
+                break;
+#endif
+        }
+        ++cp;
+    }
+}
+
+
 #define VAL_WORD_OR_PC \
     if( ur_is(pc, UT_WORD) ) { \
@@ -849 +1029 @@
             case DOP_CLEAR:
                 glDepthMask( GL_TRUE );
+                glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
                 glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+                break;
+
+            case DOP_ENABLE:
+                if( ur_selIsAtom(pc) )
+                {
+                    gr_enable( ur_atomCStr( ur_sel(pc), 0 ) );
+                }
+                break;
+
+            case DOP_DISABLE:
+                if( ur_selIsAtom(pc) )
+                {
+                    gr_disable( ur_atomCStr( ur_sel(pc), 0 ) );
+                }
                 break;
 
@@ -887 +1082 @@
                 {
                     case UR_ATOM_OFF:
+                        gr_disable( "pv" );
+                        /*
                         glDisable( GL_VERTEX_PROGRAM_POINT_SIZE );
                         glDisable( GL_POINT_SPRITE );
+                        */
                         break;
 
@@ -911 +1109 @@
                         //glBlendFunc( GL_ONE, GL_ONE_MINUS_SRC_ALPHA );
                         glBlendFunc( GL_SRC_ALPHA, GL_ONE );
-                        glEnable( GL_POINT_SPRITE );
+                        gr_enable( "p" );
+                        //glEnable( GL_POINT_SPRITE );
                         break;
 
@@ -941 +1140 @@
             }
                 break;
-
+#if 0
             case DOP_LIGHTING:  // logic!   on/off
                 ++pc;
@@ -952 +1151 @@
                 }
                 break;
-
+#endif
             case DOP_COLOR:
                 ++pc;
@@ -984 +1183 @@
             case DOP_COLORS:
                 ++pc;
-                if( ur_is(pc, UT_BLOCK) )
-                    _state.colorVals = ur_block(pc)->ptr.cells;
+                VAL_WORD_OR_PC
+                if( ur_is(val, UT_BLOCK) )
+                    _state.colorVals = ur_block(val)->ptr.cells;
                 break;
 
             case DOP_VERTS:
                 ++pc;
-                if( ur_is(pc, UT_VECTOR) )
-                    _state.vertVals = ur_bin(pc)->ptr.f;
+                VAL_WORD_OR_PC
+                if( ur_is(val, UT_VECTOR) )
+                    _state.vertVals = ur_bin(val)->ptr.f;
                 break;
 
             case DOP_NORMALS:
                 ++pc;
-                if( ur_is(pc, UT_VECTOR) )
-                    _state.normVals = ur_bin(pc)->ptr.f;
+                VAL_WORD_OR_PC
+                if( ur_is(val, UT_VECTOR) )
+                    _state.normVals = ur_bin(val)->ptr.f;
                 break;
 
             case DOP_UVS:
                 ++pc;
-                if( ur_is(pc, UT_VECTOR) )
-                    _state.uvVals = ur_bin(pc)->ptr.f;
+                VAL_WORD_OR_PC
+                if( ur_is(val, UT_VECTOR) )
+                    _state.uvVals = ur_bin(val)->ptr.f;
                 break;
 
@@ -1138 +1341 @@
 
             case DOP_SAMPLES_QUERY:     // dlist-block process-block
+            {
+                int hidden = ur_sel(pc);    // UR_ATOM_HIDDEN
+
                 ++pc;
                 if( ! ur_is(pc, UT_BLOCK) )
@@ -1144 +1350 @@
                 _state.samplesQueryId = 0;
 
-                glEnable( GL_CULL_FACE );
-                glColorMask( GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE );
-                glDepthMask( GL_FALSE );
+                if( hidden )
+                {
+                    gr_enable( "c" );  //glEnable( GL_CULL_FACE );
+
+                    glColorMask( GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE );
+                    glDepthMask( GL_FALSE );
+                }
 
                 // Run draw-list containing samples-begin ops.
@@ -1155 +1365 @@
                     glEndQuery( GL_SAMPLES_PASSED );
 
-                glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
-                glDepthMask( GL_TRUE );
+                if( hidden )
+                {
+                    glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
+                    glDepthMask( GL_TRUE );
+                }
 
                 ++pc;
@@ -1186 +1399 @@
 
                 _state.samplesQueryId = 0;
+            }
                 break;