[Mesa-dev] [PATCH] glsl: move gl_NumSamples enablement with other ARB_sample_shading vars

[Ilia Mirkin]

gl_NumSamples should only be enabled when ARB_sample_shading is enabled,
and only in the fragment shader. Move to the generate_fs_special_vars
function, next to the other ARB_sample_shading-provided variables.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
---
 src/glsl/builtin_variables.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp
index c52b252..d2acbac 100644
--- a/src/glsl/builtin_variables.cpp
+++ b/src/glsl/builtin_variables.cpp
@@ -764,7 +764,6 @@ builtin_variable_generator::generate_constants()
 void
 builtin_variable_generator::generate_uniforms()
 {
-   add_uniform(int_t, "gl_NumSamples");
    add_uniform(type("gl_DepthRangeParameters"), "gl_DepthRange");
    add_uniform(array(vec4_t, VERT_ATTRIB_MAX), "gl_CurrentAttribVertMESA");
    add_uniform(array(vec4_t, VARYING_SLOT_MAX), "gl_CurrentAttribFragMESA");
@@ -947,6 +946,7 @@ builtin_variable_generator::generate_fs_special_vars()
    }
 
    if (state->is_version(400, 0) || state->ARB_sample_shading_enable) {
+      add_uniform(int_t, "gl_NumSamples");
       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:
-- 
2.3.6