summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharmaine Lee <charmainel@vmware.com>2016-09-01 18:07:59 (GMT)
committerBrian Paul <brianp@vmware.com>2016-09-17 16:09:00 (GMT)
commit50359ddb5d051b2b48d8da2403d4d99d135cbf25 (patch)
tree1cb6d0754e913ffb9c07fc9484ae8612a5f6b613
parentee39814d90b9ecfb35dc4b5977b1f1ced0c0fd83 (diff)
downloadmesa-50359ddb5d051b2b48d8da2403d4d99d135cbf25.tar.gz
mesa-50359ddb5d051b2b48d8da2403d4d99d135cbf25.tar.xz
svga: use SVGA3D_QUERYTYPE_MAX for svga query type check
Use SVGA3D_QUERYTYPE_MAX instead of SVGA_QUERY_MAX for svga query type check. Tested with various OpenGL apps with GALLIUM_HUD set. Reviewed-by: Brian Paul <brianp@vmware.com>
-rw-r--r--src/gallium/drivers/svga/svga_pipe_query.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/svga/svga_pipe_query.c b/src/gallium/drivers/svga/svga_pipe_query.c
index b5b244c..a0aa213 100644
--- a/src/gallium/drivers/svga/svga_pipe_query.c
+++ b/src/gallium/drivers/svga/svga_pipe_query.c
@@ -265,7 +265,7 @@ allocate_query_block(struct svga_context *svga)
* any empty memory block around that can be freed up.
*/
index = -1;
- for (i = 0; i < SVGA_QUERY_MAX && index == -1; i++) {
+ for (i = 0; i < SVGA3D_QUERYTYPE_MAX && index == -1; i++) {
struct svga_qmem_alloc_entry *alloc_entry;
struct svga_qmem_alloc_entry *prev_alloc_entry = NULL;
@@ -380,7 +380,7 @@ allocate_query(struct svga_context *svga,
int slot_index = -1;
unsigned offset;
- assert(type < SVGA_QUERY_MAX);
+ assert(type < SVGA3D_QUERYTYPE_MAX);
alloc_entry = svga->gb_query_map[type];
@@ -453,7 +453,7 @@ destroy_gb_query_obj(struct svga_context *svga)
struct svga_winsys_screen *sws = svga_screen(svga->pipe.screen)->sws;
unsigned i;
- for (i = 0; i < SVGA_QUERY_MAX; i++) {
+ for (i = 0; i < SVGA3D_QUERYTYPE_MAX; i++) {
struct svga_qmem_alloc_entry *alloc_entry, *next;
alloc_entry = svga->gb_query_map[i];
while (alloc_entry) {