Mesa (master): svga: use SVGA3D_QUERYTYPE_MAX for svga query type check
Brian Paul
brianp at kemper.freedesktop.org
Sat Sep 17 16:26:31 UTC 2016
Module: Mesa
Branch: master
Commit: 50359ddb5d051b2b48d8da2403d4d99d135cbf25
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=50359ddb5d051b2b48d8da2403d4d99d135cbf25
Author: Charmaine Lee <charmainel at vmware.com>
Date: Thu Sep 1 11:07:59 2016 -0700
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 at vmware.com>
---
src/gallium/drivers/svga/svga_pipe_query.c | 6 +++---
1 file 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) {
More information about the mesa-commit
mailing list