diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2012-11-17 18:45:00 -0800 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2012-11-19 11:49:00 -0800 |
| commit | bbda7d65a9a71c41eb8dfe7aa3f4fce8c15ebbca (patch) | |
| tree | 873de097bf815a9b9a15e07eba62705fcb6b6729 /src/mesa/main/queryobj.c | |
| parent | c6ed42a89ede459e72b18cd8890cc3aba39905f5 (diff) | |
| download | external_mesa3d-bbda7d65a9a71c41eb8dfe7aa3f4fce8c15ebbca.zip external_mesa3d-bbda7d65a9a71c41eb8dfe7aa3f4fce8c15ebbca.tar.gz external_mesa3d-bbda7d65a9a71c41eb8dfe7aa3f4fce8c15ebbca.tar.bz2 | |
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>
Diffstat (limited to 'src/mesa/main/queryobj.c')
| -rw-r--r-- | src/mesa/main/queryobj.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c index dbf40d0..fecbd3f 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; |