summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2012-11-17 18:45:00 -0800
committerKenneth Graunke <[email protected]>2012-11-19 11:49:00 -0800
commitbbda7d65a9a71c41eb8dfe7aa3f4fce8c15ebbca (patch)
tree873de097bf815a9b9a15e07eba62705fcb6b6729
parentc6ed42a89ede459e72b18cd8890cc3aba39905f5 (diff)
mesa: Require gen'd names in glBeginQuery on ES 3.0.
Only legacy OpenGL allows the use of non-gen'd names. Core profiles and ES 3 both require the use of glGenQueries(). Note that BeginQuery doesn't exist in ES 1 or ES 2. Fixes es3conform's occlusion_query_invalid_beginquery test. Reviewed-and-tested-by: Matt Turner <[email protected]>
-rw-r--r--src/mesa/main/queryobj.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index dbf40d0510a..fecbd3f12a5 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -321,7 +321,7 @@ _mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id)
q = _mesa_lookup_query_object(ctx, id);
if (!q) {
- if (ctx->API == API_OPENGL_CORE) {
+ if (ctx->API != API_OPENGL) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glBeginQuery{Indexed}(non-gen name)");
return;