Changeset 405 for branches/thune

Timestamp:

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

Author:

krobillard

Message:

Thune GL - Added samples-query.

Location:

branches/thune/thread_safe

Files:

• gl/boot.c (modified) (2 diffs)
• gl/draw_list.c (modified) (6 diffs)
• gl/draw_ops.h (modified) (1 diff)
• gl/gx.h (modified) (1 diff)
• gl/gx.t (modified) (1 diff)
• gl/scripts/view.t (modified) (8 diffs)
• urlan.h (modified) (1 diff)

branches/thune/thread_safe/gl/boot.c

@@ -100 +100 @@
   "    shadow-begin\n"
   "    shadow-end\n"
+  "    samples-query\n"
+  "    samples-begin\n"
   "]\n"
   "make-opcodes :draw-list-opcodes\n"
@@ -149 +151 @@
   "] func :load.tex.clamp\n"
   "#[\n"
-  "    1.0 0.0 0.0 0.0\n"
-  "    0.0 1.0 0.0 0.0\n"
-  "    0.0 0.0 1.0 0.0\n"
-  "    0.0 0.0 0.0 1.0\n"
+  "    1.0 0.0 0.0 0.0 \n"
+  "    0.0 1.0 0.0 0.0 \n"
+  "    0.0 0.0 1.0 0.0 \n"
+  "    0.0 0.0 0.0 1.0 \n"
   "] :unit-matrix\n"
   "[\n"

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" );

branches/thune/thread_safe/gl/draw_ops.h

@@ -37 +37 @@
 #define DOP_SHADOW_BEGIN    34
 #define DOP_SHADOW_END      35
+#define DOP_SAMPLES_QUERY   36
+#define DOP_SAMPLES_BEGIN   37

branches/thune/thread_safe/gl/gx.h

@@ -144 +144 @@
 
     GrVertexAttribute attr[2];
+    GLuint samplesQueryId;
 };
 

branches/thune/thread_safe/gl/gx.t

@@ -165 +165 @@
     shadow-begin
     shadow-end
+
+    samples-query
+    samples-begin
 ]
 make-opcodes :draw-list-opcodes

branches/thune/thread_safe/gl/scripts/view.t

@@ -6 +6 @@
 10,0,10 :bg-color
 ;off key-repeat
+0.0,0 :win-size
+
+"shader/matte.gx" load.shader :matte
 
 "scripts/stars.t" load do  400 make-stars :star-dl
@@ -19 +22 @@
 "image/star.png" load.tex :bstar-sh/cmap
 
+"shader/ship-lights.gx" load.shader :rlight-shader
+"image/lightFlareA.png" load.tex    :rlight-shader/cmap
 
 /*
@@ -70 +75 @@
     model-list   :d7-dl
     model-shader :d7-shader
+
+    "model/d7_lights.gx" load do
 ] :d7
 
@@ -83 +90 @@
 
 1024,1024 dup :smap-size shadowmap :light-fb
-"shader/matte.gx" load.shader :smap-shader
 camera [
     ;'ortho
@@ -109 +115 @@
 
 d7  do  light-fb/texture :d7-shader/smap
-ent do  light-fb/texture :ent-shader/smap
+;ent do  light-fb/texture :ent-shader/smap
 
 
@@ -177 +183 @@
         dup :view-cam/viewport
 
+        /*
+        area/3 :win-size/x
+        area/4 :win-size/y
+        win-size :rlight-shader/windowsize
+        */
         ;vec3! [area/3 area/4] reduce make :star-sh/windowsize
     ]
@@ -196 +207 @@
         camera light-cam
         shadow-begin light-fb
-        shader smap-shader
+        shader matte
         call model-list
         camera view-cam
@@ -226 +237 @@
         shader model-shader
         call model-list
-        shader none
-
+        ;shader none
+
+/*
+*/
+        shader matte
+        call d7-lights-query
+        particle/sprite
+            shader rlight-shader call d7-lights
+        particle/off
 
         ;ortho-cam

branches/thune/thread_safe/urlan.h

@@ -600 +600 @@
 
 UIndex ur_hold( UThread*, int type, UIndex which );
-UIndex ur_holdIndex( UThread*, UIndex );
 void   ur_release( UThread*, UIndex );