From: Rob Clark Date: Tue, 19 Jun 2018 12:10:43 +0000 (-0400) Subject: mesa: fix GLES 3.1 version calculation X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fbd154294f980544ad7e34f6fbdcdc9bc9c108b3;p=mesa.git 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 Acked-by: Ilia Mirkin Reviewed-by: Ian Romanick --- 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 &&