From 19360152f5bd8cff93359dbfe5a50a90b699c118 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 26 Mar 2010 18:05:27 -0700 Subject: [PATCH] Reject uniform initializers in GLSL 1.10 mode Now both glslparsertest/dataType3.frag and glslparsertest/dataType2.frag pass. --- ast_to_hir.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ast_to_hir.cpp b/ast_to_hir.cpp index d7bfb30..c5d60b8 100644 --- a/ast_to_hir.cpp +++ b/ast_to_hir.cpp @@ -980,6 +980,21 @@ ast_declarator_list::hir(exec_list *instructions, instructions->push_tail(var); + /* From page 24 (page 30 of the PDF) of the GLSL 1.10 spec: + * + * "All uniform variables are read-only and are initialized either + * directly by an application via API commands, or indirectly by + * OpenGL." + */ + if ((state->language_version <= 110) + && (var->mode == ir_var_uniform) + && (decl->initializer != NULL)) { + YYLTYPE loc = decl->initializer->get_location(); + + _mesa_glsl_error(& loc, state, "uniform initializers forbidden in " + "GLSL 1.10"); + } + /* FINISHME: Process the declaration initializer. */ } -- 2.7.4