From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 4 Aug 2008 19:11:27 +0000 (-0600)
Subject: mesa: glsl: error on const-qualified array declarations
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=250910a59d16cccb50ad8ebcb21da397fb8dcf91;p=mesa.git

mesa: glsl: error on const-qualified array declarations
---

diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index 117e82a3902..d0453751f41 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -2408,11 +2408,19 @@ _slang_gen_var_decl(slang_assemble_ctx *A, slang_variable *var)
 
       if (var->array_len > 0) {
          /* this is an array */
-         /* round up element size to mult of 4 */
-         GLint sz = (n->Store->Size + 3) & ~3;
-         /* mult by array size */
-         sz *= var->array_len;
-         n->Store->Size = sz;
+         /* cannot be const-qualified */
+         if (var->type.qualifier == SLANG_QUAL_CONST) {
+            slang_info_log_error(A->log, "array '%s' cannot be const",
+                                 (char*) var->a_name);
+            return NULL;
+         }
+         else {
+            /* round up element size to mult of 4 */
+            GLint sz = (n->Store->Size + 3) & ~3;
+            /* mult by array size */
+            sz *= var->array_len;
+            n->Store->Size = sz;
+         }
       }
 
       assert(n->Store->Size > 0);