From a6cc91487446f8e1e72e4f67823a359c0b3a41d6 Mon Sep 17 00:00:00 2001
From: Corbin Simpson <MostAwesomeDude@gmail.com>
Date: Tue, 22 Jun 2010 23:11:01 -0700
Subject: glhd: Add query protection.

Not quite copied from r300g. This is slightly more API-compliant.
---
 src/gallium/drivers/r300/r300_query.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/gallium/drivers/r300/r300_query.c')

diff --git a/src/gallium/drivers/r300/r300_query.c b/src/gallium/drivers/r300/r300_query.c
index 10cb468dfc..10086ee925 100644
--- a/src/gallium/drivers/r300/r300_query.c
+++ b/src/gallium/drivers/r300/r300_query.c
@@ -37,7 +37,9 @@ static struct pipe_query *r300_create_query(struct pipe_context *pipe,
     struct r300_screen *r300screen = r300->screen;
     struct r300_query *q;
 
-    assert(query_type == PIPE_QUERY_OCCLUSION_COUNTER);
+    if (query_type != PIPE_QUERY_OCCLUSION_COUNTER) {
+        return NULL;
+    }
 
     q = CALLOC_STRUCT(r300_query);
     if (!q)
-- 
cgit v1.2.3