fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: enum checks for GL_EXT_occlusion_query_boolean

Browse source 
Some of the checks are valid for generic ES 3.2 as well.

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Tapani Pälli 2017-10-04 14:56:27 +03:00
parent 9711979df0
commit f5bec8583a
1 changed files with 44 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/mesa/main/queryobj.c
View file

@ -165,6 +165,20 @@ get_pipe_stats_binding_point(struct gl_context *ctx,
static struct gl_query_object **
get_query_binding_point(struct gl_context *ctx, GLenum target, GLuint index)
{
/* From GL_EXT_occlusion_query_boolean spec:
*
* "Accepted by the <target> parameter of BeginQueryEXT, EndQueryEXT,
* and GetQueryivEXT:
*
* ANY_SAMPLES_PASSED_EXT 0x8C2F
* ANY_SAMPLES_PASSED_CONSERVATIVE_EXT 0x8D6A"
*/
if ((_mesa_is_gles(ctx) && ctx->Version == 20) &&
(target != GL_ANY_SAMPLES_PASSED &&
target != GL_ANY_SAMPLES_PASSED_CONSERVATIVE))
return NULL;
switch (target) {
case GL_SAMPLES_PASSED_ARB:
if (ctx->Extensions.ARB_occlusion_query)
@ -649,6 +663,19 @@ _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname,
if (!query_error_check_index(ctx, target, index))
return;
/* From the GL_EXT_occlusion_query_boolean spec:
*
* "The error INVALID_ENUM is generated if GetQueryivEXT is called where
* <pname> is not CURRENT_QUERY_EXT."
*
* Same rule is present also in ES 3.2 spec.
*/
if (_mesa_is_gles(ctx) && pname != GL_CURRENT_QUERY) {
_mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryivEXT(%s)",
_mesa_enum_to_string(pname));
return;
}
if (target == GL_TIMESTAMP) {
if (!ctx->Extensions.ARB_timer_query) {
_mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryARB(target)");
@ -775,6 +802,23 @@ get_query_object(struct gl_context *ctx, const char *func,
return;
}
/* From GL_EXT_occlusion_query_boolean spec:
*
* "Accepted by the <pname> parameter of GetQueryObjectivEXT and
* GetQueryObjectuivEXT:
*
* QUERY_RESULT_EXT 0x8866
* QUERY_RESULT_AVAILABLE_EXT 0x8867"
*
* Same rule is present also in ES 3.2 spec.
*/
if (_mesa_is_gles(ctx) &&
(pname != GL_QUERY_RESULT && pname != GL_QUERY_RESULT_AVAILABLE)) {
_mesa_error(ctx, GL_INVALID_ENUM, "%s(%s)", func,
_mesa_enum_to_string(pname));
return;
}
if (buf && buf != ctx->Shared->NullBufferObj) {
bool is_64bit = ptype == GL_INT64_ARB ||
ptype == GL_UNSIGNED_INT64_ARB;