From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Thu, 18 Jun 2015 23:08:24 +0000 (-0400)
Subject: glsl: guard gl_NumSamples enablement on ARB_sample_shading
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5974841fd0be7e2c336f63bd9ef416723e1923dc;p=mesa.git

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@alum.mit.edu>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
---

diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp
index c52b2526797..a765d35fde0 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");