X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglsl%2Fast_to_hir.cpp;h=5157661b39eca7c6e15bc58a3157026ed1bfd618;hb=2acc7193743199701f8f6d1877a59ece0ec4fa5b;hp=1c54991cf7423f4164b6dd69de4846a4c2c907ed;hpb=b3c093c79c2ec49c36af37aa290d5ae452149f6e;p=mesa.git

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 1c54991cf74..5157661b39e 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -2086,9 +2086,24 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
 	 } else {
 	    var->location = qual->location;
 	 }
+
 	 if (qual->flags.q.explicit_index) {
-	    var->explicit_index = true;
-	    var->index = qual->index;
+            /* From the GLSL 4.30 specification, section 4.4.2 (Output
+             * Layout Qualifiers):
+             *
+             * "It is also a compile-time error if a fragment shader
+             *  sets a layout index to less than 0 or greater than 1."
+             *
+             * Older specifications don't mandate a behavior; we take
+             * this as a clarification and always generate the error.
+             */
+            if (qual->index < 0 || qual->index > 1) {
+               _mesa_glsl_error(loc, state,
+                                "explicit index may only be 0 or 1\n");
+            } else {
+               var->explicit_index = true;
+               var->index = qual->index;
+            }
 	 }
       }
    } else if (qual->flags.q.explicit_index) {
@@ -4054,11 +4069,15 @@ ast_uniform_block::hir(exec_list *instructions,
 	 ubo_var->Type = var->type;
 	 ubo_var->Buffer = ubo - state->uniform_blocks;
 	 ubo_var->Offset = 0; /* Assigned at link time. */
-	 ubo_var->RowMajor = block_row_major;
-	 if (decl_list->type->qualifier.flags.q.row_major)
-	    ubo_var->RowMajor = true;
-	 else if (decl_list->type->qualifier.flags.q.column_major)
-	    ubo_var->RowMajor = false;
+
+	 if (var->type->is_matrix() ||
+	     (var->type->is_array() && var->type->fields.array->is_matrix())) {
+	    ubo_var->RowMajor = block_row_major;
+	    if (decl_list->type->qualifier.flags.q.row_major)
+	       ubo_var->RowMajor = true;
+	    else if (decl_list->type->qualifier.flags.q.column_major)
+	       ubo_var->RowMajor = false;
+	 }
 
 	 /* From the GL_ARB_uniform_buffer_object spec:
 	  *