summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Clark <[email protected]>2018-06-19 08:10:43 -0400
committerRob Clark <[email protected]>2018-06-21 08:54:47 -0400
commitfbd154294f980544ad7e34f6fbdcdc9bc9c108b3 (patch)
tree8f68f8975f8386c2d34c0ba61b3cf61a40c92fe0
parentcf0c7258ee0524709ab6d05a9aafc7415361bd23 (diff)
mesa: fix GLES 3.1 version calculation
All of ARB_gpu_shader5 is most certainly not required for GLES 3.1 (most of it is in OES_gpu_shader5 on top of GLES 3.1). Some of what is required from ARB_gpu_shader5 is provided by ARB_texture_gather, so check for that. The remaining subset of ARB_gpu_shader5 doesn't have individual extensions to check for, but I guess it is unlikely that some driver has all of these extensions but not, say, integer bitfield manipulation. Signed-off-by: Rob Clark <[email protected]> Acked-by: Ilia Mirkin <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
-rw-r--r--src/mesa/main/version.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 42f58ba175b..2ba4c0b57f8 100644
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -541,7 +541,8 @@ compute_version_es2(const struct gl_extensions *extensions,
extensions->ARB_shading_language_packing &&
extensions->ARB_stencil_texturing &&
extensions->ARB_texture_multisample &&
- extensions->ARB_gpu_shader5 &&
+ extensions->ARB_texture_gather &&
+ extensions->MESA_shader_integer_functions &&
extensions->EXT_shader_integer_mix);
const bool ver_3_2 = (ver_3_1 &&
extensions->EXT_draw_buffers2 &&