r300g: debug option for fake occlusion queries

diff --git a/src/gallium/drivers/r300/r300_debug.c b/src/gallium/drivers/r300/r300_debug.c
index abf3296699dcb05fcfe40f2cea0882cfb0bb29d3..a6cd86e39208662116a72116f14f8e7ade170301 100644 (file)
--- a/src/gallium/drivers/r300/r300_debug.c
+++ b/src/gallium/drivers/r300/r300_debug.c
@@ -38,6 +38,7 @@ static const struct debug_named_value debug_options[] = {
     { "anisohq", DBG_ANISOHQ, "High quality anisotropic filtering (for benchmarking)" },
     { "notiling", DBG_NO_TILING, "Disable tiling (for benchmarking)" },
     { "noimmd", DBG_NO_IMMD, "Disable immediate mode (for benchmarking)" },
+    { "fakeocc", DBG_FAKE_OCC, "Use fake occlusion queries (for lulz)" },
     { "stats", DBG_STATS, "Gather statistics (for lulz)" },
 
     /* must be last */

diff --git a/src/gallium/drivers/r300/r300_query.c b/src/gallium/drivers/r300/r300_query.c
index 42cb6ade7634d31513339e48236aec9127ec81e4..10cb468dfcce429a5fed9a26d4fcf593a4813b43 100644 (file)
--- a/src/gallium/drivers/r300/r300_query.c
+++ b/src/gallium/drivers/r300/r300_query.c
@@ -171,11 +171,61 @@ static void r300_render_condition(struct pipe_context *pipe,
     }
 }
 
+/***************************************************************************
+ * Fake occlusion queries (for debugging)
+ ***************************************************************************/
+
+static unsigned r300_fake_query;
+
+static struct pipe_query *r300_fake_create_query(struct pipe_context *pipe,
+                                                 unsigned query_type)
+{
+    return (struct pipe_query*)&r300_fake_query;
+}
+
+static void r300_fake_destroy_query(struct pipe_context* pipe,
+                                    struct pipe_query* query)
+{
+}
+
+static void r300_fake_begin_query(struct pipe_context* pipe,
+                                  struct pipe_query* query)
+{
+}
+
+static void r300_fake_end_query(struct pipe_context* pipe,
+                                struct pipe_query* query)
+{
+}
+
+static boolean r300_fake_get_query_result(struct pipe_context* pipe,
+                                          struct pipe_query* query,
+                                          boolean wait, void* vresult)
+{
+    uint64_t *result = (uint64_t*)vresult;
+    *result = 1000000;
+    return TRUE;
+}
+
+static void r300_fake_render_condition(struct pipe_context *pipe,
+                                       struct pipe_query *query, uint mode)
+{
+}
+
 void r300_init_query_functions(struct r300_context* r300) {
-    r300->context.create_query = r300_create_query;
-    r300->context.destroy_query = r300_destroy_query;
-    r300->context.begin_query = r300_begin_query;
-    r300->context.end_query = r300_end_query;
-    r300->context.get_query_result = r300_get_query_result;
-    r300->context.render_condition = r300_render_condition;
+    if (DBG_ON(r300, DBG_FAKE_OCC)) {
+        r300->context.create_query = r300_fake_create_query;
+        r300->context.destroy_query = r300_fake_destroy_query;
+        r300->context.begin_query = r300_fake_begin_query;
+        r300->context.end_query = r300_fake_end_query;
+        r300->context.get_query_result = r300_fake_get_query_result;
+        r300->context.render_condition = r300_fake_render_condition;
+    } else {
+        r300->context.create_query = r300_create_query;
+        r300->context.destroy_query = r300_destroy_query;
+        r300->context.begin_query = r300_begin_query;
+        r300->context.end_query = r300_end_query;
+        r300->context.get_query_result = r300_get_query_result;
+        r300->context.render_condition = r300_render_condition;
+    }
 }

diff --git a/src/gallium/drivers/r300/r300_screen.h b/src/gallium/drivers/r300/r300_screen.h
index 16888eadc7009d1f75a1f5a5f29e488a1cfa760e..29cd5dbe26792ce555707b67a45292507515eec0 100644 (file)
--- a/src/gallium/drivers/r300/r300_screen.h
+++ b/src/gallium/drivers/r300/r300_screen.h
@@ -76,6 +76,7 @@ static INLINE struct r300_screen* r300_screen(struct pipe_screen* screen) {
 #define DBG_ANISOHQ     (1 << 16)
 #define DBG_NO_TILING   (1 << 17)
 #define DBG_NO_IMMD     (1 << 18)
+#define DBG_FAKE_OCC    (1 << 19)
 /* Statistics. */
 #define DBG_STATS       (1 << 24)
 /*@}*/