OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8f1131f
)
mesa: Return 0 for GL_CURRENT_QUERY with a mismatched query target.
author
Eric Anholt
<eric@anholt.net>
Wed, 17 Oct 2012 00:36:42 +0000
(17:36 -0700)
committer
Eric Anholt
<eric@anholt.net>
Tue, 23 Oct 2012 00:36:53 +0000
(17:36 -0700)
With the previous two commits, this fixes piglit
GL_ARB_occlusion_query2/api.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
src/mesa/main/queryobj.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/queryobj.c
b/src/mesa/main/queryobj.c
index
735e4d1
..
65e8571
100644
(file)
--- a/
src/mesa/main/queryobj.c
+++ b/
src/mesa/main/queryobj.c
@@
-532,7
+532,7
@@
_mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname,
}
break;
case GL_CURRENT_QUERY_ARB:
- *params =
q
? q->Id : 0;
+ *params =
(q && q->Target == target)
? q->Id : 0;
break;
default:
_mesa_error(ctx, GL_INVALID_ENUM, "glGetQuery{Indexed}iv(pname)");