mesa: remove support for GL_APPLE_client_storage extension

[mesa.git] / src / glsl / ir_variable.cpp

diff --git a/src/glsl/ir_variable.cpp b/src/glsl/ir_variable.cpp
index b8487694c51fa0787908184af8a5aa391421eca7..e0b6f38f1c910def256831837a548dd42ddbf998 100644 (file)
--- a/src/glsl/ir_variable.cpp
+++ b/src/glsl/ir_variable.cpp
@@ -584,6 +584,17 @@ generate_120_vs_variables(exec_list *instructions,
 }
 
 
+static void
+generate_130_uniforms(exec_list *instructions,
+                     struct _mesa_glsl_parse_state *state)
+{
+   glsl_symbol_table *const symtab = state->symbols;
+
+   add_builtin_constant(instructions, symtab, "gl_MaxClipDistances",
+                        state->Const.MaxClipPlanes);
+}
+
+
 static void
 generate_130_vs_variables(exec_list *instructions,
                          struct _mesa_glsl_parse_state *state)
@@ -595,9 +606,20 @@ generate_130_vs_variables(exec_list *instructions,
                           & builtin_130_vs_variables[i]);
    }
 
+   generate_130_uniforms(instructions, state);
+
+   /* From the GLSL 1.30 spec, section 7.1 (Vertex Shader Special
+    * Variables):
+    *
+    *   The gl_ClipDistance array is predeclared as unsized and must
+    *   be sized by the shader either redeclaring it with a size or
+    *   indexing it only with integral constant expressions.
+    *
+    * We represent this in Mesa by initially declaring the array as
+    * size 0.
+    */
    const glsl_type *const clip_distance_array_type =
-      glsl_type::get_array_instance(glsl_type::float_type,
-                                   state->Const.MaxClipPlanes);
+      glsl_type::get_array_instance(glsl_type::float_type, 0);
 
    /* FINISHME: gl_ClipDistance needs a real location assigned. */
    add_variable(instructions, state->symbols,
@@ -802,9 +824,22 @@ generate_130_fs_variables(exec_list *instructions,
 {
    generate_120_fs_variables(instructions, state);
 
+   generate_130_uniforms(instructions, state);
+
+   /* From the GLSL 1.30 spec, section 7.2 (Fragment Shader Special
+    * Variables):
+    *
+    *   The built-in input variable gl_ClipDistance array contains linearly
+    *   interpolated values for the vertex values written by the vertex shader
+    *   to the gl_ClipDistance vertex output variable. This array must be
+    *   sized in the fragment shader either implicitly or explicitly to be the
+    *   same size as it was sized in the vertex shader.
+    *
+    * In other words, the array must be pre-declared as implicitly sized.  We
+    * represent this in Mesa by initially declaring the array as size 0.
+    */
    const glsl_type *const clip_distance_array_type =
-      glsl_type::get_array_instance(glsl_type::float_type,
-                                   state->Const.MaxClipPlanes);
+      glsl_type::get_array_instance(glsl_type::float_type, 0);
 
    /* FINISHME: gl_ClipDistance needs a real location assigned. */
    add_variable(instructions, state->symbols,