From b6e238023c4f8af2328dc3bcab1d73a3e19f4fbb Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Wed, 17 Jun 2015 15:09:26 -0400 Subject: [PATCH] glsl: add version checks to conditionals for builtin variable enablement A number of builtin variables have checks based on the extension being enabled, but were missing enablement via a higher GLSL version. Signed-off-by: Ilia Mirkin Reviewed-by: Timothy Arceri Cc: "10.5 10.6" --- src/glsl/builtin_variables.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp index 6806aa1f962..c52b2526797 100644 --- a/src/glsl/builtin_variables.cpp +++ b/src/glsl/builtin_variables.cpp @@ -876,9 +876,9 @@ void builtin_variable_generator::generate_gs_special_vars() { add_output(VARYING_SLOT_LAYER, int_t, "gl_Layer"); - if (state->ARB_viewport_array_enable) + if (state->is_version(410, 0) || state->ARB_viewport_array_enable) add_output(VARYING_SLOT_VIEWPORT, int_t, "gl_ViewportIndex"); - if (state->ARB_gpu_shader5_enable) + if (state->is_version(400, 0) || state->ARB_gpu_shader5_enable) add_system_value(SYSTEM_VALUE_INVOCATION_ID, int_t, "gl_InvocationID"); /* Although gl_PrimitiveID appears in tessellation control and tessellation @@ -946,7 +946,7 @@ builtin_variable_generator::generate_fs_special_vars() var->enable_extension_warning("GL_AMD_shader_stencil_export"); } - if (state->ARB_sample_shading_enable) { + if (state->is_version(400, 0) || state->ARB_sample_shading_enable) { add_system_value(SYSTEM_VALUE_SAMPLE_ID, int_t, "gl_SampleID"); add_system_value(SYSTEM_VALUE_SAMPLE_POS, vec2_t, "gl_SamplePosition"); /* From the ARB_sample_shading specification: @@ -959,11 +959,11 @@ builtin_variable_generator::generate_fs_special_vars() add_output(FRAG_RESULT_SAMPLE_MASK, array(int_t, 1), "gl_SampleMask"); } - if (state->ARB_gpu_shader5_enable) { + if (state->is_version(400, 0) || state->ARB_gpu_shader5_enable) { add_system_value(SYSTEM_VALUE_SAMPLE_MASK_IN, array(int_t, 1), "gl_SampleMaskIn"); } - if (state->ARB_fragment_layer_viewport_enable) { + if (state->is_version(430, 0) || state->ARB_fragment_layer_viewport_enable) { add_input(VARYING_SLOT_LAYER, int_t, "gl_Layer"); add_input(VARYING_SLOT_VIEWPORT, int_t, "gl_ViewportIndex"); } -- 2.30.2