From: Erik Faye-Lund Date: Wed, 7 Nov 2018 12:22:41 +0000 (+0100) Subject: mesa/main: fix validation of GL_SAMPLES_PASSED X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fff1738d5793eb57a1f024c46c583b2b295687d3;p=mesa.git mesa/main: fix validation of GL_SAMPLES_PASSED ctx->Extensions.ARB_occlusion_query is set based on the driver- capabilities, not based on the context type. We need to check against _mesa_has_ARB_occlusion_query(ctx) instead to figure out if the extension is really supported. We also need to check for ARB_occlusion_query2, as ARB_occlusion_query isn't available in core contexts. This turns usage of GL_SAMPLES_PASSED into an error on ES 3, as is required by the spec. Signed-off-by: Erik Faye-Lund Reviewed-by: Tapani Pälli --- diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c index 96b1c6bb30a..4c8e4df98bb 100644 --- a/src/mesa/main/queryobj.c +++ b/src/mesa/main/queryobj.c @@ -179,7 +179,8 @@ get_query_binding_point(struct gl_context *ctx, GLenum target, GLuint index) switch (target) { case GL_SAMPLES_PASSED: - if (ctx->Extensions.ARB_occlusion_query) + if (_mesa_has_ARB_occlusion_query(ctx) || + _mesa_has_ARB_occlusion_query2(ctx)) return &ctx->Query.CurrentOcclusionObject; else return NULL;