mesa: Require gen'd names in glBeginQuery on ES 3.0.
authorKenneth Graunke <kenneth@whitecape.org>
Sun, 18 Nov 2012 02:45:00 +0000 (18:45 -0800)
committerKenneth Graunke <kenneth@whitecape.org>
Mon, 19 Nov 2012 19:49:00 +0000 (11:49 -0800)
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>
src/mesa/main/queryobj.c

index dbf40d0510a4e4b96c6d86d91b20ec710da19369..fecbd3f12a51bacb9df593728d238acbc24573b5 100644 (file)
@@ -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;