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

Timestamp:

06/02/07 06:45:33 (18 months ago)

Author:

krobillard

Message:

Thune GL - Added samples-query.

Files:

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

branches/thune/thread_safe/gl/draw_list.c

@@ -75 +75 @@
     _state.attr[0].vals = 0;
     _state.attr[1].vals = 0;
+    _state.samplesQueryId = 0;
 }
 
@@ -132 +133 @@
             {
                 glDepthMask( GL_FALSE );
+
+            //glEnable( GL_DEPTH_TEST );
 
                 glDisable( GL_ALPHA_TEST );
@@ -345 +348 @@
     }
 }
+
+
+//----------------------------------------------------------------------------
+
+
+#if 0
+GLuint gr_querySamples()
+{
+    GLuint sampleCount;
+    //const GLuint id = 1;
+    int id;
+    int endId = 1 + 1;
+
+#if 0
+    // 32 bits on GeForce 6600 GT
+    GLint bits;
+    glGetQueryiv( GL_SAMPLES_PASSED, GL_QUERY_COUNTER_BITS, &bits );
+    printf( "KR GL_QUERY_COUNTER_BITS = %d\n", bits );
+#endif
+
+    glColorMask( GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE );
+    glDepthMask( GL_FALSE );
+
+    for( id = 1; id < endId; ++id )
+    {
+        glBeginQuery( GL_SAMPLES_PASSED, id );
+
+        // Draw...
+
+        glEndQuery( GL_SAMPLES_PASSED );
+    }
+
+    //glFlush();
+
+    glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
+    glDepthMask( GL_TRUE );
+
+    for( id = 1; id < endId; ++id )
+    {
+        glGetQueryObjectuiv( id, GL_QUERY_RESULT, &sampleCount );
+        //printf( "KR GL_QUERY_RESULT = %d\n", sampleCount );
+    }
+
+    return sampleCount;
+}
+#endif
 
 
@@ -792 +841 @@
         {
             case DOP_NOP:
+                //printf( "KR DL NOP\n" );
                 break;
 
@@ -858 +908 @@
                     case UR_ATOM_SPRITE:
                         gr_setState( GRS_PARTICLE );
-                        glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
+                        //glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
+                        //glBlendFunc( GL_ONE, GL_ONE_MINUS_SRC_ALPHA );
+                        glBlendFunc( GL_SRC_ALPHA, GL_ONE );
                         glEnable( GL_POINT_SPRITE );
                         break;
@@ -1085 +1137 @@
                 break;
 
+            case DOP_SAMPLES_QUERY:     // dlist-block process-block
+                ++pc;
+                if( ! ur_is(pc, UT_BLOCK) )
+                    return 0;
+
+                _state.samplesQueryId = 0;
+
+                glEnable( GL_CULL_FACE );
+                glColorMask( GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE );
+                glDepthMask( GL_FALSE );
+
+                // Run draw-list containing samples-begin ops.
+                if( ! _runDrawList( ut, pc ) )
+                    return 0;
+
+                if( _state.samplesQueryId )
+                    glEndQuery( GL_SAMPLES_PASSED );
+
+                glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
+                glDepthMask( GL_TRUE );
+
+                ++pc;
+                if( ur_is(pc, UT_BLOCK) )
+                {
+                    GLuint samples;
+                    GLuint id;
+                    //UBinary* bin;
+                    //UIndex binN;
+
+                    // Push query results on stack and call process-block.
+
+                    //bin = ur_binaryPtr( binN );
+
+                    for( id = 1; id <= _state.samplesQueryId; ++id )
+                    {
+                        glGetQueryObjectuiv( id, GL_QUERY_RESULT, &samples );
+                        //printf( "KR samples %d %d\n", id, samples );
+
+                        UR_S_GROW;
+                        ur_initType( UR_TOS, UT_INT );
+                        ur_int(UR_TOS) = samples;
+                    }
+
+                    if( ur_eval( ut, pc->series.n, pc->series.it )
+                        != UR_EVAL_OK )
+                        return 0;
+                }
+
+                _state.samplesQueryId = 0;
+                break;
+
+            case DOP_SAMPLES_BEGIN:
+                if( _state.samplesQueryId )
+                    glEndQuery( GL_SAMPLES_PASSED );
+
+                ++_state.samplesQueryId;
+                glBeginQuery( GL_SAMPLES_PASSED, _state.samplesQueryId );
+                break;
+
             default:
                 assert( 0 && "Invalid Draw List Opcode" );