From: Kenneth Graunke <kenneth@whitecape.org>
Date: Sun, 18 Nov 2012 02:45:00 +0000 (-0800)
Subject: mesa: Require gen'd names in glBeginQuery on ES 3.0.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bbda7d65a9a71c41eb8dfe7aa3f4fce8c15ebbca;p=mesa.git

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 <mattst88@gmail.com>
---

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;