Mesa (master): glsl: guard gl_NumSamples enablement on ARB_sample_shading

[Ilia Mirkin]

Module: Mesa
Branch: master
Commit: 5974841fd0be7e2c336f63bd9ef416723e1923dc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5974841fd0be7e2c336f63bd9ef416723e1923dc

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Thu Jun 18 19:08:24 2015 -0400

glsl: guard gl_NumSamples enablement on ARB_sample_shading

gl_NumSamples should only be enabled when ARB_sample_shading is enabled.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>

---

 src/glsl/builtin_variables.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp
index c52b252..a765d35 100644
--- a/src/glsl/builtin_variables.cpp
+++ b/src/glsl/builtin_variables.cpp
@@ -764,7 +764,8 @@ builtin_variable_generator::generate_constants()
 void
 builtin_variable_generator::generate_uniforms()
 {
-   add_uniform(int_t, "gl_NumSamples");
+   if (state->is_version(400, 0) || state->ARB_sample_shading_enable)
+      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");