summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2011-05-29 03:46:15 +0200
committerMarek Olšák <maraeo@gmail.com>2011-05-29 05:15:27 +0200
commit70b86fb273ee9c3b6fea750bc14eae43328ba677 (patch)
tree4462509781c73328a076194d23ae09c055e84da4 /src/gallium
parent2397f20b6b0c7092927b33d0461c89200204906d (diff)
r300g: remove fake occlusion queries (debug option)
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/r300/r300_debug.c1
-rw-r--r--src/gallium/drivers/r300/r300_query.c62
-rw-r--r--src/gallium/drivers/r300/r300_screen.h2
3 files changed, 7 insertions, 58 deletions
diff --git a/src/gallium/drivers/r300/r300_debug.c b/src/gallium/drivers/r300/r300_debug.c
index 6e8b6ab2978..3ab28689fb8 100644
--- a/src/gallium/drivers/r300/r300_debug.c
+++ b/src/gallium/drivers/r300/r300_debug.c
@@ -43,7 +43,6 @@ static const struct debug_named_value debug_options[] = {
{ "hyperz", DBG_HYPERZ, "Log HyperZ info" },
{ "upload", DBG_UPLOAD, "Log user buffer upload info" },
{ "scissor", DBG_SCISSOR, "Log scissor info" },
- { "fakeocc", DBG_FAKE_OCC, "Use fake occlusion queries" },
{ "anisohq", DBG_ANISOHQ, "Use high quality anisotropic filtering" },
{ "notiling", DBG_NO_TILING, "Disable tiling" },
{ "noimmd", DBG_NO_IMMD, "Disable immediate mode" },
diff --git a/src/gallium/drivers/r300/r300_query.c b/src/gallium/drivers/r300/r300_query.c
index 9752a519491..55a2e2fde7f 100644
--- a/src/gallium/drivers/r300/r300_query.c
+++ b/src/gallium/drivers/r300/r300_query.c
@@ -170,61 +170,11 @@ 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) {
- 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;
- }
+ 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 5df58be822f..3bafd0f8142 100644
--- a/src/gallium/drivers/r300/r300_screen.h
+++ b/src/gallium/drivers/r300/r300_screen.h
@@ -100,7 +100,7 @@ radeon_winsys(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)
+/* gap - fill it */
#define DBG_NO_OPT (1 << 20)
#define DBG_NO_CBZB (1 << 21)
#define DBG_NO_ZMASK (1 << 22)