diff options
| author | Eric Anholt <eric@anholt.net> | 2012-10-31 15:36:27 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-11-04 12:28:36 -0800 |
| commit | 4fce0230fc3528be32562410bcddfc887c4d25a0 (patch) | |
| tree | 3297f605461820f26f2bbb7702b38edfbb5139bb /src/mesa/main/queryobj.c | |
| parent | 947d8ff4a7c4b7ffb4013056b48dbabe6b3931b0 (diff) | |
| download | external_mesa3d-4fce0230fc3528be32562410bcddfc887c4d25a0.zip external_mesa3d-4fce0230fc3528be32562410bcddfc887c4d25a0.tar.gz external_mesa3d-4fce0230fc3528be32562410bcddfc887c4d25a0.tar.bz2 | |
mesa: Fix core GL genned-name handling for glBeginQuery().
Fixes piglit gl-3.1/genned-names.
NOTE: This is a candidate for the 9.0 branch.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa/main/queryobj.c')
| -rw-r--r-- | src/mesa/main/queryobj.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c index d216913..1e39adc 100644 --- a/src/mesa/main/queryobj.c +++ b/src/mesa/main/queryobj.c @@ -321,13 +321,19 @@ _mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id) q = _mesa_lookup_query_object(ctx, id); if (!q) { - /* create new object */ - q = ctx->Driver.NewQueryObject(ctx, id); - if (!q) { - _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBeginQuery{Indexed}"); + if (ctx->API == API_OPENGL_CORE) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "glBeginQuery{Indexed}(non-gen name)"); return; + } else { + /* create new object */ + q = ctx->Driver.NewQueryObject(ctx, id); + if (!q) { + _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBeginQuery{Indexed}"); + return; + } + _mesa_HashInsert(ctx->Query.QueryObjects, id, q); } - _mesa_HashInsert(ctx->Query.QueryObjects, id, q); } else { /* pre-existing object */ |