Mesa (master): mesa: add always-false enable for GL 4.6
Samuel Pitoiset
hakzsam at kemper.freedesktop.org
Wed Aug 2 11:37:51 UTC 2017
Module: Mesa
Branch: master
Commit: c2455029189542b510191eaadfd7416347bc1de4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c2455029189542b510191eaadfd7416347bc1de4
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date: Tue Aug 1 12:26:30 2017 +0200
mesa: add always-false enable for GL 4.6
I believe this should be enough for now.
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
---
src/mesa/main/version.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 34f8bbbcb1..f04c43ddf5 100644
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -385,8 +385,24 @@ compute_version(const struct gl_extensions *extensions,
extensions->ARB_derivative_control &&
extensions->ARB_shader_texture_image_samples &&
extensions->NV_texture_barrier);
-
- if (ver_4_5) {
+ const bool ver_4_6 = (ver_4_5 &&
+ consts->GLSLVersion >= 460 &&
+ /* extensions->ARB_gl_spirv */ 0 &&
+ /* extensions->ARB_gl_spirv_extensions */ 0 &&
+ extensions->ARB_indirect_parameters &&
+ extensions->ARB_pipeline_statistics_query &&
+ /* extensions->ARB_polygon_offset_clamp */ 0 &&
+ extensions->ARB_shader_atomic_counter_ops &&
+ extensions->ARB_shader_draw_parameters &&
+ extensions->ARB_shader_group_vote &&
+ /* extensions->ARB_texture_filter_anisotropic */ 0 &&
+ extensions->ARB_transform_feedback_overflow_query);
+
+ if (ver_4_6) {
+ major = 4;
+ minor = 6;
+ }
+ else if (ver_4_5) {
major = 4;
minor = 5;
}
More information about the mesa-commit
mailing list