Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/glsl/ir_print_visitor.cpp
	mesalib/src/glsl/linker.cpp
	mesalib/src/glsl/opt_constant_propagation.cpp
	mesalib/src/mesa/program/ir_to_mesa.cpp

5 files changed, 313 insertions, 250 deletions

diff --git a/mesalib/src/glsl/Makefile b/mesalib/src/glsl/Makefile
index 2e379d84b..e0776c1b5 100644
--- a/mesalib/src/glsl/Makefile
+++ b/mesalib/src/glsl/Makefile
@@ -1,213 +1,213 @@
-

-#src/glsl/pp/Makefile

-

-TOP = ../..

-

-include $(TOP)/configs/current

-

-LIBNAME = glsl

-

-LIBGLCPP_SOURCES = \

-	glcpp/glcpp-lex.c \

-	glcpp/glcpp-parse.c \

-	glcpp/pp.c

-

-GLCPP_SOURCES = \

-	$(LIBGLCPP_SOURCES) \

-	ralloc.c \

-	glcpp/glcpp.c

-

-C_SOURCES = \

-	strtod.c \

-	ralloc.c \

-	$(LIBGLCPP_SOURCES)

-

-CXX_SOURCES = \

-	ast_expr.cpp \

-	ast_function.cpp \

-	ast_to_hir.cpp \

-	ast_type.cpp \

-	glsl_lexer.cpp \

-	glsl_parser.cpp \

-	glsl_parser_extras.cpp \

-	glsl_types.cpp \

-	glsl_symbol_table.cpp \

-	hir_field_selection.cpp \

-	ir_basic_block.cpp \

-	ir_clone.cpp \

-	ir_constant_expression.cpp \

-	ir.cpp \

-	ir_expression_flattening.cpp \

-	ir_function_can_inline.cpp \

-	ir_function.cpp \

-	ir_hierarchical_visitor.cpp \

-	ir_hv_accept.cpp \

-	ir_import_prototypes.cpp \

-	ir_print_visitor.cpp \

-	ir_reader.cpp \

-	ir_rvalue_visitor.cpp \

-	ir_set_program_inouts.cpp \

-	ir_validate.cpp \

-	ir_variable.cpp \

-	ir_variable_refcount.cpp \

-	linker.cpp \

-	link_functions.cpp \

-	loop_analysis.cpp \

-	loop_controls.cpp \

-	loop_unroll.cpp \

-	lower_discard.cpp \

-	lower_if_to_cond_assign.cpp \

-	lower_instructions.cpp \

-	lower_jumps.cpp \

-	lower_mat_op_to_vec.cpp \

-	lower_noise.cpp \

-	lower_texture_projection.cpp \

-	lower_variable_index_to_cond_assign.cpp \

-	lower_vec_index_to_cond_assign.cpp \

-	lower_vec_index_to_swizzle.cpp \

-	lower_vector.cpp \

-	opt_algebraic.cpp \

-	opt_constant_folding.cpp \

-	opt_constant_propagation.cpp \

-	opt_constant_variable.cpp \

-	opt_copy_propagation.cpp \

-	opt_copy_propagation_elements.cpp \

-	opt_dead_code.cpp \

-	opt_dead_code_local.cpp \

-	opt_dead_functions.cpp \

-	opt_discard_simplification.cpp \

-	opt_function_inlining.cpp \

-	opt_if_simplification.cpp \

-	opt_noop_swizzle.cpp \

-	opt_redundant_jumps.cpp \

-	opt_structure_splitting.cpp \

-	opt_swizzle_swizzle.cpp \

-	opt_tree_grafting.cpp \

-	s_expression.cpp

-

-LIBS = \

-	$(TOP)/src/glsl/libglsl.a

-

-APPS = glsl_compiler glcpp/glcpp

-

-GLSL2_C_SOURCES = \

-	../mesa/program/hash_table.c \

-	../mesa/program/symbol_table.c

-GLSL2_CXX_SOURCES = \

-	main.cpp

-

-GLSL2_OBJECTS = \

-	$(GLSL2_C_SOURCES:.c=.o) \

-	$(GLSL2_CXX_SOURCES:.cpp=.o)

-

-### Basic defines ###

-

-DEFINES += \

-	$(LIBRARY_DEFINES) \

-	$(API_DEFINES)

-

-GLCPP_OBJECTS = \

-	$(GLCPP_SOURCES:.c=.o) \

-	../mesa/program/hash_table.o

-

-OBJECTS = \

-	$(C_SOURCES:.c=.o) \

-	$(CXX_SOURCES:.cpp=.o)

-

-DRICORE_OBJ_DIR = obj-visible

-OBJECTS_DRICORE = $(addprefix $(DRICORE_OBJ_DIR)/,$(OBJECTS))

-

-INCLUDES = \

-	-I. \

-	-I../mesa \

-	-I../mapi \

-	-I../../include \

-	$(LIBRARY_INCLUDES)

-

-ALL_SOURCES = \

-	$(C_SOURCES) \

-	$(CXX_SOURCES) \

-	$(GLSL2_CXX_SOURCES) \

-	$(GLSL2_C_SOURCES)

-

-##### TARGETS #####

-

-default: depend lib$(LIBNAME).a $(APPS) $(DRICORE_GLSL_LIBS)

-

-$(TOP)/$(LIB_DIR)/libglsl.so: $(OBJECTS_DRICORE) builtin_function.o Makefile $(TOP)/src/glsl/Makefile.template

-	$(MKLIB) -o $@ -linker '$(CXX)' -ldflags '$(LDFLAGS)' \

-		-cplusplus -noprefix \

-		-install $(TOP)/$(LIB_DIR) -id $(INSTALL_LIB_DIR)/$@.dylib \

-		$(OBJECTS_DRICORE) builtin_function.o

-

-lib$(LIBNAME).a: $(OBJECTS) builtin_function.o Makefile $(TOP)/src/glsl/Makefile.template

-	$(MKLIB) -cplusplus -o $(LIBNAME) -static $(OBJECTS) builtin_function.o

-

-depend: $(ALL_SOURCES) Makefile

-	rm -f depend

-	touch depend

-	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(ALL_SOURCES) 2> /dev/null

-

-# Remove .o and backup files

-clean: clean-dricore

-	rm -f $(GLCPP_OBJECTS) $(GLSL2_OBJECTS) $(OBJECTS) lib$(LIBNAME).a depend depend.bak builtin_function.cpp builtin_function.o builtin_stubs.o builtin_compiler

-	-rm -f $(APPS)

-

-clean-dricore:

-	-rm -f $(DRICORE_OBJ_DIR) $(TOP)/$(LIB_DIR)/libglsl.so libglsl.so

-

-ifneq (,$(DRICORE_GLSL_LIBS))

-DRICORE_INSTALL_TARGET = install-dricore

-endif

-

-# Dummy target

-install: $(DRICORE_INSTALL_TARGET)

-	@echo -n ""

-

-install-dricore: default

-	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)

-	$(INSTALL) -m 755 $(DRICORE_GLSL_LIBS) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)

-

-##### RULES #####

-

-glsl_compiler: $(GLSL2_OBJECTS) libglsl.a builtin_stubs.o

-	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) builtin_stubs.o $(LIBS) -o $@

-

-glcpp: glcpp/glcpp

-glcpp/glcpp: $(GLCPP_OBJECTS)

-	$(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLCPP_OBJECTS) -o $@

-

-.cpp.o:

-	$(CXX) -c $(INCLUDES) $(CXXFLAGS) $(DEFINES) $< -o $@

-

-.c.o:

-	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@

-

-$(DRICORE_OBJ_DIR)/%.o : %.cpp

-	@mkdir -p $(dir $@)

-	$(CXX) -c $(INCLUDES) $(DRI_CXXFLAGS) $(DEFINES) $< -o $@

-

-$(DRICORE_OBJ_DIR)/%.o : %.c

-	@mkdir -p $(dir $@)

-	$(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DEFINES) $< -o $@

-

-glsl_lexer.cpp: glsl_lexer.ll

-	$(FLEX) --nounistd -o$@  $<

-

-glsl_parser.cpp: glsl_parser.yy

-	$(BISON) -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<

-

-glcpp/glcpp-lex.c: glcpp/glcpp-lex.l

-	$(FLEX) --nounistd -o$@  $<

-

-glcpp/glcpp-parse.c: glcpp/glcpp-parse.y

-	$(BISON) -v -o "$@" --defines=glcpp/glcpp-parse.h $<

-

-builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o

-	$(APP_CXX) $(INCLUDES) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o $@

-

-builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler

-	@echo Regenerating builtin_function.cpp...

-	$(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py ./builtin_compiler > builtin_function.cpp || rm -f builtin_function.cpp

-

--include depend

+
+#src/glsl/pp/Makefile
+
+TOP = ../..
+
+include $(TOP)/configs/current
+
+LIBNAME = glsl
+
+LIBGLCPP_SOURCES = \
+	glcpp/glcpp-lex.c \
+	glcpp/glcpp-parse.c \
+	glcpp/pp.c
+
+GLCPP_SOURCES = \
+	$(LIBGLCPP_SOURCES) \
+	ralloc.c \
+	glcpp/glcpp.c
+
+C_SOURCES = \
+	strtod.c \
+	ralloc.c \
+	$(LIBGLCPP_SOURCES)
+
+CXX_SOURCES = \
+	ast_expr.cpp \
+	ast_function.cpp \
+	ast_to_hir.cpp \
+	ast_type.cpp \
+	glsl_lexer.cpp \
+	glsl_parser.cpp \
+	glsl_parser_extras.cpp \
+	glsl_types.cpp \
+	glsl_symbol_table.cpp \
+	hir_field_selection.cpp \
+	ir_basic_block.cpp \
+	ir_clone.cpp \
+	ir_constant_expression.cpp \
+	ir.cpp \
+	ir_expression_flattening.cpp \
+	ir_function_can_inline.cpp \
+	ir_function.cpp \
+	ir_hierarchical_visitor.cpp \
+	ir_hv_accept.cpp \
+	ir_import_prototypes.cpp \
+	ir_print_visitor.cpp \
+	ir_reader.cpp \
+	ir_rvalue_visitor.cpp \
+	ir_set_program_inouts.cpp \
+	ir_validate.cpp \
+	ir_variable.cpp \
+	ir_variable_refcount.cpp \
+	linker.cpp \
+	link_functions.cpp \
+	loop_analysis.cpp \
+	loop_controls.cpp \
+	loop_unroll.cpp \
+	lower_discard.cpp \
+	lower_if_to_cond_assign.cpp \
+	lower_instructions.cpp \
+	lower_jumps.cpp \
+	lower_mat_op_to_vec.cpp \
+	lower_noise.cpp \
+	lower_texture_projection.cpp \
+	lower_variable_index_to_cond_assign.cpp \
+	lower_vec_index_to_cond_assign.cpp \
+	lower_vec_index_to_swizzle.cpp \
+	lower_vector.cpp \
+	opt_algebraic.cpp \
+	opt_constant_folding.cpp \
+	opt_constant_propagation.cpp \
+	opt_constant_variable.cpp \
+	opt_copy_propagation.cpp \
+	opt_copy_propagation_elements.cpp \
+	opt_dead_code.cpp \
+	opt_dead_code_local.cpp \
+	opt_dead_functions.cpp \
+	opt_discard_simplification.cpp \
+	opt_function_inlining.cpp \
+	opt_if_simplification.cpp \
+	opt_noop_swizzle.cpp \
+	opt_redundant_jumps.cpp \
+	opt_structure_splitting.cpp \
+	opt_swizzle_swizzle.cpp \
+	opt_tree_grafting.cpp \
+	s_expression.cpp
+
+LIBS = \
+	$(TOP)/src/glsl/libglsl.a
+
+APPS = glsl_compiler glcpp/glcpp
+
+GLSL2_C_SOURCES = \
+	../mesa/program/hash_table.c \
+	../mesa/program/symbol_table.c
+GLSL2_CXX_SOURCES = \
+	main.cpp
+
+GLSL2_OBJECTS = \
+	$(GLSL2_C_SOURCES:.c=.o) \
+	$(GLSL2_CXX_SOURCES:.cpp=.o)
+
+### Basic defines ###
+
+DEFINES += \
+	$(LIBRARY_DEFINES) \
+	$(API_DEFINES)
+
+GLCPP_OBJECTS = \
+	$(GLCPP_SOURCES:.c=.o) \
+	../mesa/program/hash_table.o
+
+OBJECTS = \
+	$(C_SOURCES:.c=.o) \
+	$(CXX_SOURCES:.cpp=.o)
+
+DRICORE_OBJ_DIR = obj-visible
+OBJECTS_DRICORE = $(addprefix $(DRICORE_OBJ_DIR)/,$(OBJECTS))
+
+INCLUDES = \
+	-I. \
+	-I../mesa \
+	-I../mapi \
+	-I../../include \
+	$(LIBRARY_INCLUDES)
+
+ALL_SOURCES = \
+	$(C_SOURCES) \
+	$(CXX_SOURCES) \
+	$(GLSL2_CXX_SOURCES) \
+	$(GLSL2_C_SOURCES)
+
+##### TARGETS #####
+
+default: depend lib$(LIBNAME).a $(APPS) $(DRICORE_GLSL_LIBS)
+
+$(TOP)/$(LIB_DIR)/libglsl.so: $(OBJECTS_DRICORE) builtin_function.o Makefile $(TOP)/src/glsl/Makefile.template
+	$(MKLIB) -o $@ -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
+		-cplusplus -noprefix \
+		-install $(TOP)/$(LIB_DIR) -id $(INSTALL_LIB_DIR)/$@.dylib \
+		$(OBJECTS_DRICORE) builtin_function.o
+
+lib$(LIBNAME).a: $(OBJECTS) builtin_function.o Makefile $(TOP)/src/glsl/Makefile.template
+	$(MKLIB) -cplusplus -o $(LIBNAME) -static $(OBJECTS) builtin_function.o
+
+depend: $(ALL_SOURCES) Makefile
+	rm -f depend
+	touch depend
+	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(ALL_SOURCES) 2> /dev/null
+
+# Remove .o and backup files
+clean: clean-dricore
+	rm -f $(GLCPP_OBJECTS) $(GLSL2_OBJECTS) $(OBJECTS) lib$(LIBNAME).a depend depend.bak builtin_function.cpp builtin_function.o builtin_stubs.o builtin_compiler
+	-rm -f $(APPS)
+
+clean-dricore:
+	-rm -f $(OBJECTS_DRICORE) $(TOP)/$(LIB_DIR)/libglsl.so libglsl.so
+
+ifneq (,$(DRICORE_GLSL_LIBS))
+DRICORE_INSTALL_TARGET = install-dricore
+endif
+
+# Dummy target
+install: $(DRICORE_INSTALL_TARGET)
+	@echo -n ""
+
+install-dricore: default
+	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
+	$(INSTALL) -m 755 $(DRICORE_GLSL_LIBS) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
+
+##### RULES #####
+
+glsl_compiler: $(GLSL2_OBJECTS) libglsl.a builtin_stubs.o
+	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLSL2_OBJECTS) builtin_stubs.o $(LIBS) -o $@
+
+glcpp: glcpp/glcpp
+glcpp/glcpp: $(GLCPP_OBJECTS)
+	$(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(GLCPP_OBJECTS) -o $@
+
+.cpp.o:
+	$(CXX) -c $(INCLUDES) $(CXXFLAGS) $(DEFINES) $< -o $@
+
+.c.o:
+	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+
+$(DRICORE_OBJ_DIR)/%.o : %.cpp
+	@mkdir -p $(dir $@)
+	$(CXX) -c $(INCLUDES) $(DRI_CXXFLAGS) $(DEFINES) $< -o $@
+
+$(DRICORE_OBJ_DIR)/%.o : %.c
+	@mkdir -p $(dir $@)
+	$(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DEFINES) $< -o $@
+
+glsl_lexer.cpp: glsl_lexer.ll
+	$(FLEX) --nounistd -o$@  $<
+
+glsl_parser.cpp: glsl_parser.yy
+	$(BISON) -v -o "$@" -p "_mesa_glsl_" --defines=glsl_parser.h $<
+
+glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
+	$(FLEX) --nounistd -o$@  $<
+
+glcpp/glcpp-parse.c: glcpp/glcpp-parse.y
+	$(BISON) -v -o "$@" --defines=glcpp/glcpp-parse.h $<
+
+builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o
+	$(APP_CXX) $(INCLUDES) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o $@
+
+builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler
+	@echo Regenerating builtin_function.cpp...
+	$(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py ./builtin_compiler > builtin_function.cpp || rm -f builtin_function.cpp
+
+-include depend
diff --git a/mesalib/src/glsl/ir_function.cpp b/mesalib/src/glsl/ir_function.cpp
index ef8d4fcfc..1255072a5 100644
--- a/mesalib/src/glsl/ir_function.cpp
+++ b/mesalib/src/glsl/ir_function.cpp
@@ -165,7 +165,7 @@ ir_function_signature *
 ir_function::matching_signature(const exec_list *actual_parameters)
 {
    ir_function_signature *match = NULL;
-   int matched_score;
+   int matched_score = 0;
 
    foreach_iter(exec_list_iterator, iter, signatures) {
       ir_function_signature *const sig =
diff --git a/mesalib/src/glsl/ir_print_visitor.cpp b/mesalib/src/glsl/ir_print_visitor.cpp
index cabb2f6cc..7e3649477 100644
--- a/mesalib/src/glsl/ir_print_visitor.cpp
+++ b/mesalib/src/glsl/ir_print_visitor.cpp
@@ -96,6 +96,16 @@ void ir_print_visitor::indent(void)
 const char *

 ir_print_visitor::unique_name(ir_variable *var)

 {

+   /* var->name can be NULL in function prototypes when a type is given for a

+    * parameter but no name is given.  In that case, just return an empty

+    * string.  Don't worry about tracking the generated name in the printable

+    * names hash because this is the only scope where it can ever appear.

+    */

+   if (var->name == NULL) {

+      static unsigned arg = 1;

+      return ralloc_asprintf(this->mem_ctx, "parameter@%u", arg++);

+   }

+

    /* Do we already have a name for this variable? */

    const char *name = (const char *) hash_table_find(this->printable_names, var);

    if (name != NULL)

diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp
index 1ad9dbcb5..1c0785ad7 100644
--- a/mesalib/src/glsl/linker.cpp
+++ b/mesalib/src/glsl/linker.cpp
@@ -1194,16 +1194,43 @@ find_available_slots(unsigned used_mask, unsigned needed_count)
 }

 

 

+/**

+ * Assign locations for either VS inputs for FS outputs

+ *

+ * \param prog          Shader program whose variables need locations assigned

+ * \param target_index  Selector for the program target to receive location

+ *                      assignmnets.  Must be either \c MESA_SHADER_VERTEX or

+ *                      \c MESA_SHADER_FRAGMENT.

+ * \param max_index     Maximum number of generic locations.  This corresponds

+ *                      to either the maximum number of draw buffers or the

+ *                      maximum number of generic attributes.

+ *

+ * \return

+ * If locations are successfully assigned, true is returned.  Otherwise an

+ * error is emitted to the shader link log and false is returned.

+ *

+ * \bug

+ * Locations set via \c glBindFragDataLocation are not currently supported.

+ * Only locations assigned automatically by the linker, explicitly set by a

+ * layout qualifier, or explicitly set by a built-in variable (e.g., \c

+ * gl_FragColor) are supported for fragment shaders.

+ */

 bool

-assign_attribute_locations(gl_shader_program *prog, unsigned max_attribute_index)

+assign_attribute_or_color_locations(gl_shader_program *prog,

+				    unsigned target_index,

+				    unsigned max_index)

 {

-   /* Mark invalid attribute locations as being used.

+   /* Mark invalid locations as being used.

     */

-   unsigned used_locations = (max_attribute_index >= 32)

-      ? ~0 : ~((1 << max_attribute_index) - 1);

+   unsigned used_locations = (max_index >= 32)

+      ? ~0 : ~((1 << max_index) - 1);

 

-   gl_shader *const sh = prog->_LinkedShaders[0];

-   assert(sh->Type == GL_VERTEX_SHADER);

+   assert((target_index == MESA_SHADER_VERTEX)

+	  || (target_index == MESA_SHADER_FRAGMENT));

+

+   gl_shader *const sh = prog->_LinkedShaders[target_index];

+   if (sh == NULL)

+      return true;

 

    /* Operate in a total of four passes.

     *

@@ -1220,9 +1247,16 @@ assign_attribute_locations(gl_shader_program *prog, unsigned max_attribute_index
     * 4. Assign locations to any inputs without assigned locations.

     */

 

-   invalidate_variable_locations(sh, ir_var_in, VERT_ATTRIB_GENERIC0);

+   const int generic_base = (target_index == MESA_SHADER_VERTEX)

+     ? VERT_ATTRIB_GENERIC0 : FRAG_RESULT_DATA0;

+

+   const enum ir_variable_mode direction =

+      (target_index == MESA_SHADER_VERTEX) ? ir_var_in : ir_var_out;

+

 

-   if (prog->Attributes != NULL) {

+   invalidate_variable_locations(sh, direction, generic_base);

+

+   if ((target_index == MESA_SHADER_VERTEX) && (prog->Attributes != NULL)) {

       for (unsigned i = 0; i < prog->Attributes->NumParameters; i++) {

 	 ir_variable *const var =

 	    sh->symbols->get_variable(prog->Attributes->Parameters[i].Name);

@@ -1309,15 +1343,15 @@ assign_attribute_locations(gl_shader_program *prog, unsigned max_attribute_index
    foreach_list(node, sh->ir) {

       ir_variable *const var = ((ir_instruction *) node)->as_variable();

 

-      if ((var == NULL) || (var->mode != ir_var_in))

+      if ((var == NULL) || (var->mode != direction))

 	 continue;

 

       if (var->explicit_location) {

 	 const unsigned slots = count_attribute_slots(var->type);

 	 const unsigned use_mask = (1 << slots) - 1;

-	 const int attr = var->location - VERT_ATTRIB_GENERIC0;

+	 const int attr = var->location - generic_base;

 

-	 if ((var->location >= (int)(max_attribute_index + VERT_ATTRIB_GENERIC0))

+	 if ((var->location >= (int)(max_index + generic_base))

 	     || (var->location < 0)) {

 	    linker_error_printf(prog,

 				"invalid explicit location %d specified for "

@@ -1325,7 +1359,7 @@ assign_attribute_locations(gl_shader_program *prog, unsigned max_attribute_index
 				(var->location < 0) ? var->location : attr,

 				var->name);

 	    return false;

-	 } else if (var->location >= VERT_ATTRIB_GENERIC0) {

+	 } else if (var->location >= generic_base) {

 	    used_locations |= (use_mask << attr);

 	 }

       }

@@ -1349,14 +1383,16 @@ assign_attribute_locations(gl_shader_program *prog, unsigned max_attribute_index
 

    qsort(to_assign, num_attr, sizeof(to_assign[0]), temp_attr::compare);

 

-   /* VERT_ATTRIB_GENERIC0 is a pseudo-alias for VERT_ATTRIB_POS.  It can only

-    * be explicitly assigned by via glBindAttribLocation.  Mark it as reserved

-    * to prevent it from being automatically allocated below.

-    */

-   find_deref_visitor find("gl_Vertex");

-   find.run(sh->ir);

-   if (find.variable_found())

-      used_locations |= (1 << 0);

+   if (target_index == MESA_SHADER_VERTEX) {

+      /* VERT_ATTRIB_GENERIC0 is a pseudo-alias for VERT_ATTRIB_POS.  It can

+       * only be explicitly assigned by via glBindAttribLocation.  Mark it as

+       * reserved to prevent it from being automatically allocated below.

+       */

+      find_deref_visitor find("gl_Vertex");

+      find.run(sh->ir);

+      if (find.variable_found())

+	 used_locations |= (1 << 0);

+   }

 

    for (unsigned i = 0; i < num_attr; i++) {

       /* Mask representing the contiguous slots that will be used by this

@@ -1367,14 +1403,17 @@ assign_attribute_locations(gl_shader_program *prog, unsigned max_attribute_index
       int location = find_available_slots(used_locations, to_assign[i].slots);

 

       if (location < 0) {

+	 const char *const string = (target_index == MESA_SHADER_VERTEX)

+	    ? "vertex shader input" : "fragment shader output";

+

 	 linker_error_printf(prog,

 			     "insufficient contiguous attribute locations "

-			     "available for vertex shader input `%s'",

-			     to_assign[i].var->name);

+			     "available for %s `%s'",

+			     string, to_assign[i].var->name);

 	 return false;

       }

 

-      to_assign[i].var->location = VERT_ATTRIB_GENERIC0 + location;

+      to_assign[i].var->location = generic_base + location;

       used_locations |= (use_mask << location);

    }

 

@@ -1671,16 +1710,19 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)
 

    assign_uniform_locations(prog);

 

-   if (prog->_LinkedShaders[MESA_SHADER_VERTEX] != NULL) {

-      /* FINISHME: The value of the max_attribute_index parameter is

-       * FINISHME: implementation dependent based on the value of

-       * FINISHME: GL_MAX_VERTEX_ATTRIBS.  GL_MAX_VERTEX_ATTRIBS must be

-       * FINISHME: at least 16, so hardcode 16 for now.

-       */

-      if (!assign_attribute_locations(prog, 16)) {

-	 prog->LinkStatus = false;

-	 goto done;

-      }

+   /* FINISHME: The value of the max_attribute_index parameter is

+    * FINISHME: implementation dependent based on the value of

+    * FINISHME: GL_MAX_VERTEX_ATTRIBS.  GL_MAX_VERTEX_ATTRIBS must be

+    * FINISHME: at least 16, so hardcode 16 for now.

+    */

+   if (!assign_attribute_or_color_locations(prog, MESA_SHADER_VERTEX, 16)) {

+      prog->LinkStatus = false;

+      goto done;

+   }

+

+   if (!assign_attribute_or_color_locations(prog, MESA_SHADER_FRAGMENT, ctx->Const.MaxDrawBuffers)) {

+      prog->LinkStatus = false;

+      goto done;

    }

 

    unsigned prev;

diff --git a/mesalib/src/glsl/opt_constant_propagation.cpp b/mesalib/src/glsl/opt_constant_propagation.cpp
index 55c271200..7c42b6191 100644
--- a/mesalib/src/glsl/opt_constant_propagation.cpp
+++ b/mesalib/src/glsl/opt_constant_propagation.cpp
@@ -51,11 +51,23 @@ public:
       this->var = var;

       this->write_mask = write_mask;

       this->constant = constant;

+      this->initial_values = write_mask;

+   }

+

+   acp_entry(const acp_entry *src)

+   {

+      this->var = src->var;

+      this->write_mask = src->write_mask;

+      this->constant = src->constant;

+      this->initial_values = src->initial_values;

    }

 

    ir_variable *var;

    ir_constant *constant;

    unsigned write_mask;

+

+   /** Mask of values initially available in the constant. */

+   unsigned initial_values;

 };

 

 

@@ -172,7 +184,7 @@ ir_constant_propagation_visitor::handle_rvalue(ir_rvalue **rvalue)
       for (int j = 0; j < 4; j++) {

 	 if (j == channel)

 	    break;

-	 if (found->write_mask & (1 << j))

+	 if (found->initial_values & (1 << j))

 	    rhs_channel++;

       }

 

@@ -285,8 +297,7 @@ ir_constant_propagation_visitor::handle_if_block(exec_list *instructions)
    /* Populate the initial acp with a constant of the original */

    foreach_iter(exec_list_iterator, iter, *orig_acp) {

       acp_entry *a = (acp_entry *)iter.get();

-      this->acp->push_tail(new(this->mem_ctx) acp_entry(a->var, a->write_mask,

-							a->constant));

+      this->acp->push_tail(new(this->mem_ctx) acp_entry(a));

    }

 

    visit_list_elements(this, instructions);