Added basic occlusion counting

diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 0e59ba615a783bd597f1ffe49d78efa616d5b9c4..fc04dde3f49a2ccf1544f697365be3ea303634f0 100644 (file)
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -30,6 +30,11 @@
 #include "queryobj.h"
 #include "mtypes.h"
 
+#if 1 /*PIPE*/
+#include "pipe/p_context.h"
+#include "state_tracker/st_context.h"
+#endif
+
 
 /**
  * Allocate a new query object.  This is a fallback routine called via
@@ -220,6 +225,10 @@ _mesa_BeginQueryARB(GLenum target, GLuint id)
    q->Result = 0;
    q->Ready = GL_FALSE;
 
+#if 1 /*PIPE*/
+   ctx->st->pipe->reset_occlusion_counter(ctx->st->pipe);
+#endif
+
    if (target == GL_SAMPLES_PASSED_ARB) {
       ctx->Query.CurrentOcclusionObject = q;
    }
@@ -282,6 +291,12 @@ _mesa_EndQueryARB(GLenum target)
       /* if we're using software rendering/querying */
       q->Ready = GL_TRUE;
    }
+
+#if 1 /*PIPE*/
+   if (target == GL_SAMPLES_PASSED_ARB) {
+      q->Result = ctx->st->pipe->get_occlusion_counter(ctx->st->pipe);
+   }
+#endif
 }
 
 

diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index e4115226e7e55b779ae1f558b60a47c1dddbbd18..05a175c8dc02c98f4385207ba27cf5e8ddc05b68 100644 (file)
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -28,7 +28,9 @@
 #ifndef PIPE_CONTEXT_H
 #define PIPE_CONTEXT_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
+#include "p_state.h"
+
 
 /* Kludge:
  */
@@ -57,6 +59,12 @@ struct pipe_context {
    void (*clear)(struct pipe_context *pipe, GLboolean color, GLboolean depth,
                  GLboolean stencil, GLboolean accum);
 
+   /** occlusion counting (XXX this may be temporary - we should probably
+    * have generic query objects with begin/end methods)
+    */
+   void (*reset_occlusion_counter)(struct pipe_context *pipe);
+   GLuint (*get_occlusion_counter)(struct pipe_context *pipe);
+
    /*
     * State functions
     */

diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index 2b0d65999370b2109af83c0a75693f5f6501ba8e..fd5e7ad3af9069d8c1e1270b1d1b6d0ea6236790 100644 (file)
--- a/src/mesa/pipe/p_state.h
+++ b/src/mesa/pipe/p_state.h
@@ -136,6 +136,7 @@ struct pipe_depth_state
    GLuint enabled:1;   /**< depth test enabled? */
    GLuint writemask:1; /**< allow depth buffer writes? */
    GLuint func:3;      /**< depth test func (PIPE_FUNC_x) */
+   GLuint occlusion_count:1; /**< XXX move this elsewhere? */
    GLfloat clear;      /**< Clear value in [0,1] (XXX correct place?) */
 };
 

diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index cc4b8d5914101a635de595c27174cf7a6abdb6d5..685e55be842f9330158dbb4863d9946578a028a9 100644 (file)
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -60,6 +60,20 @@ static void softpipe_draw_vb( struct pipe_context *pipe,
 }
 
 
+static void softpipe_reset_occlusion_counter(struct pipe_context *pipe)
+{
+   struct softpipe_context *softpipe = softpipe_context( pipe );
+   softpipe->occlusion_counter = 0;
+}
+
+/* XXX pipe param should be const */
+static GLuint softpipe_get_occlusion_counter(struct pipe_context *pipe)
+{
+   struct softpipe_context *softpipe = softpipe_context( pipe );
+   return softpipe->occlusion_counter;
+}
+
+
 struct pipe_context *softpipe_create( void )
 {
    struct softpipe_context *softpipe = CALLOC_STRUCT(softpipe_context);
@@ -82,12 +96,15 @@ struct pipe_context *softpipe_create( void )
    softpipe->pipe.set_viewport_state = softpipe_set_viewport_state;
    softpipe->pipe.draw_vb = softpipe_draw_vb;
    softpipe->pipe.clear = softpipe_clear;
+   softpipe->pipe.reset_occlusion_counter = softpipe_reset_occlusion_counter;
+   softpipe->pipe.get_occlusion_counter = softpipe_get_occlusion_counter;
 
    softpipe->quad.polygon_stipple = sp_quad_polygon_stipple_stage(softpipe);
    softpipe->quad.shade = sp_quad_shade_stage(softpipe);
    softpipe->quad.alpha_test = sp_quad_alpha_test_stage(softpipe);
    softpipe->quad.depth_test = sp_quad_depth_test_stage(softpipe);
    softpipe->quad.stencil_test = sp_quad_stencil_test_stage(softpipe);
+   softpipe->quad.occlusion = sp_quad_occlusion_stage(softpipe);
    softpipe->quad.bufloop = sp_quad_bufloop_stage(softpipe);
    softpipe->quad.blend = sp_quad_blend_stage(softpipe);
    softpipe->quad.colormask = sp_quad_colormask_stage(softpipe);

diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/mesa/pipe/softpipe/sp_context.h
index 81d2b58cf93bbcd0c4938cac0d23e85ea4c44b85..38f2977bd85c80d996c3ff84fed7a51279e2c68b 100644 (file)
--- a/src/mesa/pipe/softpipe/sp_context.h
+++ b/src/mesa/pipe/softpipe/sp_context.h
@@ -115,6 +115,8 @@ struct softpipe_context {
     */
    GLubyte stipple_masks[16][16];
 
+   GLuint occlusion_counter;
+
    /** Software quad rendering pipeline */
    struct {
       struct quad_stage *polygon_stipple;
@@ -122,6 +124,7 @@ struct softpipe_context {
       struct quad_stage *alpha_test;
       struct quad_stage *stencil_test;
       struct quad_stage *depth_test;
+      struct quad_stage *occlusion;
       struct quad_stage *bufloop;
       struct quad_stage *blend;
       struct quad_stage *colormask;

diff --git a/src/mesa/pipe/softpipe/sp_quad.c b/src/mesa/pipe/softpipe/sp_quad.c
index 5f34f5f1b34f8d0c3a4c54d3fe18f5cd65c40c07..c27f14f32ecf3ad07f6da7fae8509938b3295816 100644 (file)
--- a/src/mesa/pipe/softpipe/sp_quad.c
+++ b/src/mesa/pipe/softpipe/sp_quad.c
@@ -31,6 +31,11 @@ sp_build_quad_pipeline(struct softpipe_context *sp)
       sp->quad.first = sp->quad.bufloop;
    }
 
+   if (sp->depth_test.occlusion_count) {
+      sp->quad.occlusion->next = sp->quad.first;
+      sp->quad.first = sp->quad.occlusion;
+   }
+
    if (   sp->stencil.front_enabled
        || sp->stencil.front_enabled) {
       sp->quad.stencil_test->next = sp->quad.first;

diff --git a/src/mesa/pipe/softpipe/sp_quad.h b/src/mesa/pipe/softpipe/sp_quad.h
index 719d4774ccae89328f3930c74e989e5d95bb1559..072b51f9bf059ecd3a30a5f9cf803d69f8e8c72a 100644 (file)
--- a/src/mesa/pipe/softpipe/sp_quad.h
+++ b/src/mesa/pipe/softpipe/sp_quad.h
@@ -51,6 +51,7 @@ struct quad_stage *sp_quad_shade_stage( struct softpipe_context *softpipe );
 struct quad_stage *sp_quad_alpha_test_stage( struct softpipe_context *softpipe );
 struct quad_stage *sp_quad_stencil_test_stage( struct softpipe_context *softpipe );
 struct quad_stage *sp_quad_depth_test_stage( struct softpipe_context *softpipe );
+struct quad_stage *sp_quad_occlusion_stage( struct softpipe_context *softpipe );
 struct quad_stage *sp_quad_bufloop_stage( struct softpipe_context *softpipe );
 struct quad_stage *sp_quad_blend_stage( struct softpipe_context *softpipe );
 struct quad_stage *sp_quad_colormask_stage( struct softpipe_context *softpipe );

diff --git a/src/mesa/pipe/softpipe/sp_quad_occlusion.c b/src/mesa/pipe/softpipe/sp_quad_occlusion.c
new file mode 100644 (file)
index 0000000..843c462
--- /dev/null
+++ b/src/mesa/pipe/softpipe/sp_quad_occlusion.c
@@ -0,0 +1,67 @@
+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+
+/**
+ * \brief  Quad occlusion counter stage
+ * \author  Brian Paul
+ */
+
+
+#include "main/glheader.h"
+#include "main/imports.h"
+#include "pipe/p_defines.h"
+#include "sp_context.h"
+#include "sp_headers.h"
+#include "sp_surface.h"
+#include "sp_quad.h"
+
+
+static void
+occlusion_count_quad(struct quad_stage *qs, struct quad_header *quad)
+{
+   struct softpipe_context *softpipe = qs->softpipe;
+
+   softpipe->occlusion_counter += (quad->mask     ) & 1;
+   softpipe->occlusion_counter += (quad->mask >> 1) & 1;
+   softpipe->occlusion_counter += (quad->mask >> 2) & 1;
+   softpipe->occlusion_counter += (quad->mask >> 3) & 1;
+
+   if (quad->mask)
+      qs->next->run(qs->next, quad);
+}
+
+
+struct quad_stage *sp_quad_occlusion_stage( struct softpipe_context *softpipe )
+{
+   struct quad_stage *stage = CALLOC_STRUCT(quad_stage);
+
+   stage->softpipe = softpipe;
+   stage->run = occlusion_count_quad;
+
+   return stage;
+}

diff --git a/src/mesa/sources b/src/mesa/sources
index 4856f7b023ce13318ce091b3720d514a13ffd9ea..9bb05e35f7f43b66c796b355e1291eb5c6d2b2d8 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -164,6 +164,7 @@ SOFTPIPE_SOURCES = \
        pipe/softpipe/sp_quad_colormask.c \
        pipe/softpipe/sp_quad_depth_test.c \
        pipe/softpipe/sp_quad_fs.c \
+       pipe/softpipe/sp_quad_occlusion.c \
        pipe/softpipe/sp_quad_output.c \
        pipe/softpipe/sp_quad_stipple.c \
        pipe/softpipe/sp_quad_stencil.c \

diff --git a/src/mesa/state_tracker/st_atom_depth.c b/src/mesa/state_tracker/st_atom_depth.c
index a1523e06c21844913bf655e0caf6f779a805d6d3..7fc51953dc69e1027ab8c46c9412dc072cab588c 100644 (file)
--- a/src/mesa/state_tracker/st_atom_depth.c
+++ b/src/mesa/state_tracker/st_atom_depth.c
@@ -71,6 +71,10 @@ update_depth( struct st_context *st )
    depth.func = gl_depth_func_to_sp(st->ctx->Depth.Func);
    depth.clear = st->ctx->Depth.Clear;
 
+   if (st->ctx->Query.CurrentOcclusionObject &&
+       st->ctx->Query.CurrentOcclusionObject->Active)
+      depth.occlusion_count = 1;
+
    if (memcmp(&depth, &st->state.depth, sizeof(depth)) != 0) {
       /* state has changed */
       st->state.depth = depth;  /* struct copy */