diff options
| author | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2018-11-07 13:22:41 +0100 |
|---|---|---|
| committer | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2018-11-23 10:48:35 +0100 |
| commit | fff1738d5793eb57a1f024c46c583b2b295687d3 (patch) | |
| tree | 9aed24a0003ead3139ef19cacb5c6517da5ac547 | |
| parent | 9c13ad0ea403fa8699b505c05db6d4c0aeb870a6 (diff) | |
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 <erik.faye-lund@collabora.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
| -rw-r--r-- | src/mesa/main/queryobj.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |