Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013

Conflicts:
	mesalib/src/glsl/.gitignore

7 files changed, 147 insertions, 116 deletions

diff --git a/mesalib/src/glsl/.gitignore b/mesalib/src/glsl/.gitignore
index 38e2117af..050084d2d 100755
--- a/mesalib/src/glsl/.gitignore
+++ b/mesalib/src/glsl/.gitignore
@@ -1,7 +1,8 @@
 glsl_compiler

-glsl_lexer.cc

-glsl_parser.cc

+glsl_lexer.cpp

+glsl_parser.cpp

 glsl_parser.h

 glsl_parser.output

 builtin_function.cpp

+builtincompiler

 glsl_test

diff --git a/mesalib/src/glsl/Android.mk b/mesalib/src/glsl/Android.mk
index f5006ab03..f088e67cb 100644
--- a/mesalib/src/glsl/Android.mk
+++ b/mesalib/src/glsl/Android.mk
@@ -58,7 +58,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
 	$(LIBGLCPP_FILES) \
 	$(LIBGLSL_FILES) \
-	$(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp \
+	$(BUILTIN_COMPILER_CXX_FILES) \
 	$(GLSL_COMPILER_CXX_FILES)
 
 LOCAL_C_INCLUDES := \
diff --git a/mesalib/src/glsl/Makefile.am b/mesalib/src/glsl/Makefile.am
index 36af90ef1..058d8aed3 100644
--- a/mesalib/src/glsl/Makefile.am
+++ b/mesalib/src/glsl/Makefile.am
@@ -19,41 +19,84 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-SUBDIRS = builtin_compiler glcpp
+SUBDIRS = builtin_compiler
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/mapi \
 	-I$(top_srcdir)/src/mesa/ \
+	-I$(top_srcdir)/src/glsl/glcpp \
+	-I$(top_srcdir)/src/gtest/include \
 	$(DEFINES) \
 	$(API_DEFINES)
 AM_CFLAGS = $(VISIBILITY_CFLAGS)
 AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
 
-AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c
-
 include Makefile.sources
 
-noinst_LTLIBRARIES = libglsl.la
-check_PROGRAMS = glsl_test
-noinst_PROGRAMS = glsl_compiler
+TESTS = glcpp/tests/glcpp-test				\
+	tests/optimization-test				\
+	tests/ralloc-test				\
+	tests/uniform-initializer-test
 
-libglsl_la_SOURCES = \
-	glsl_lexer.ll \
-	glsl_parser.cc \
-	$(LIBGLSL_FILES) \
-	builtin_function.cpp
+TESTS_ENVIRONMENT= \
+	export PYTHON2=$(PYTHON2); \
+	export PYTHON_FLAGS=$(PYTHON_FLAGS);
 
-libglsl_la_LIBADD = glcpp/libglcpp.la
-libglsl_la_LDFLAGS =
+noinst_LTLIBRARIES = libglsl.la libglcpp.la
+check_PROGRAMS =					\
+	glcpp/glcpp					\
+	glsl_test					\
+	tests/ralloc-test				\
+	tests/uniform-initializer-test
 
-glsl_compiler_SOURCES = \
-	$(top_srcdir)/src/mesa/main/hash_table.c \
-	$(top_srcdir)/src/mesa/program/prog_hash_table.c \
-	$(top_srcdir)/src/mesa/program/symbol_table.c \
-	$(GLSL_COMPILER_CXX_FILES)
+tests_uniform_initializer_test_SOURCES =		\
+	$(top_srcdir)/src/mesa/main/hash_table.c	\
+	$(top_srcdir)/src/mesa/program/prog_hash_table.c\
+	$(top_srcdir)/src/mesa/program/symbol_table.c	\
+	tests/copy_constant_to_storage_tests.cpp	\
+	tests/set_uniform_initializer_tests.cpp		\
+	tests/uniform_initializer_utils.cpp
+tests_uniform_initializer_test_CFLAGS =			\
+	$(PTHREAD_CFLAGS)
+tests_uniform_initializer_test_LDADD =			\
+	$(top_builddir)/src/gtest/libgtest.la		\
+	$(top_builddir)/src/glsl/libglsl.la		\
+	$(PTHREAD_LIBS)
+
+tests_ralloc_test_SOURCES =				\
+	tests/ralloc_test.cpp				\
+	$(top_builddir)/src/glsl/ralloc.c
+tests_ralloc_test_CFLAGS = $(PTHREAD_CFLAGS)
+tests_ralloc_test_LDADD =				\
+	$(top_builddir)/src/gtest/libgtest.la		\
+	$(PTHREAD_LIBS)
 
-glsl_compiler_LDADD = libglsl.la
+if CROSS_COMPILING
+libglcpp_la_SOURCES =					\
+	glcpp/glcpp-lex.c				\
+	glcpp/glcpp-parse.c				\
+	$(LIBGLCPP_FILES)
+else
+libglcpp_la_LIBADD = builtin_compiler/libglcpp.la
+endif
+
+glcpp_glcpp_SOURCES =					\
+	glcpp/glcpp.c					\
+	$(top_srcdir)/src/mesa/program/prog_hash_table.c
+glcpp_glcpp_LDADD = libglcpp.la
+
+libglsl_la_SOURCES = builtin_function.cpp
+libglsl_la_LIBADD = libglcpp.la
+if CROSS_COMPILING
+libglsl_la_SOURCES +=					\
+	glsl_lexer.cpp					\
+	glsl_parser.cpp					\
+	$(LIBGLSL_FILES)
+else
+libglsl_la_LIBADD +=					\
+	builtin_compiler/libglslcore.la
+endif
 
 glsl_test_SOURCES = \
 	$(top_srcdir)/src/mesa/main/hash_table.c \
@@ -65,15 +108,65 @@ glsl_test_SOURCES = \
 
 glsl_test_LDADD = libglsl.la
 
-# automake <=1.11 and automake >=1.12 have different conventions for naming C++ header files
-# made by yacc.  To work with both, we write our own rule rather than using automake's.
-# When (if) we require automake >=1.12 in configure.ac, this can be removed, and we can use
-# the automake rule.
-glsl_parser.cc glsl_parser.h: glsl_parser.yy
-	$(AM_V_GEN) $(YACC) -v -o glsl_parser.cc -p "_mesa_glsl_" --defines=glsl_parser.h $<
+# We write our own rules for yacc and lex below. We'd rather use automake,
+# but automake makes it especially difficult for a number of reasons:
+#
+#  * < automake-1.12 generates .h files from .yy and .ypp files, but
+#    >=automake-1.12 generates .hh and .hpp files respectively. There's no
+#    good way of making a project that uses C++ yacc files compatible with
+#    both versions of automake. Strong work automake developers.
+#
+#  * Since we're generating code from .l/.y files in a subdirectory (glcpp/)
+#    we'd like the resulting generated code to also go in glcpp/ for purposes
+#    of distribution. Automake gives no way to do this.
+#
+#  * Since we're building multiple yacc parsers into one library (and via one
+#    Makefile) we have to use per-target YFLAGS. Using per-target YFLAGS causes
+#    automake to name the resulting generated code as <library-name>_filename.c.
+#    Frankly, that's ugly and we don't want a libglcpp_glcpp_parser.h file.
+
+# In order to make build output print "LEX" and "YACC", we reproduce the
+# automake variables below.
+
+AM_V_LEX = $(am__v_LEX_$(V))
+am__v_LEX_ = $(am__v_LEX_$(AM_DEFAULT_VERBOSITY))
+am__v_LEX_0 = @echo "  LEX     " $@;
+am__v_LEX_1 =
+
+AM_V_YACC = $(am__v_YACC_$(V))
+am__v_YACC_ = $(am__v_YACC_$(AM_DEFAULT_VERBOSITY))
+am__v_YACC_0 = @echo "  YACC    " $@;
+am__v_YACC_1 =
+
+glsl_parser.cpp glsl_parser.h: glsl_parser.yy
+	$(AM_V_YACC) $(YACC) $(YFLAGS) -o $@ -p "_mesa_glsl_" --defines=$(GLSL_BUILDDIR)/glsl_parser.h $<
+
+glsl_lexer.cpp: glsl_lexer.ll
+	$(AM_V_LEX) $(LEX) $(LFLAGS) -o $@ $<
+
+glcpp/glcpp-parse.c glcpp/glcpp-parse.h: glcpp/glcpp-parse.y
+	$(MKDIR_P) $(GLSL_BUILDDIR)/glcpp
+	$(AM_V_YACC) $(YACC) $(YFLAGS) -o $@ -p "glcpp_parser_" --defines=$(GLSL_BUILDDIR)/glcpp/glcpp-parse.h $<
+
+glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
+	$(MKDIR_P) $(GLSL_BUILDDIR)/glcpp
+	$(AM_V_LEX) $(LEX) $(LFLAGS) -o $@ $<
 
-BUILT_SOURCES = glsl_parser.h
-CLEANFILES = glsl_lexer.cc glsl_parser.cc $(BUILT_SOURCES) builtin_function.cpp
+# Only the parsers (specifically the header files generated at the same time)
+# need to be in BUILT_SOURCES. Though if we list the parser headers YACC is
+# called for the .c/.cpp file and the .h files. By listing the .c/.cpp files
+# YACC is only executed once for each parser. The rest of the generated code
+# will be created at the appropriate times according to standard automake
+# dependency rules.
+BUILT_SOURCES =						\
+	glsl_parser.cpp					\
+	glsl_lexer.cpp					\
+	glcpp/glcpp-parse.c				\
+	glcpp/glcpp-lex.c
+CLEANFILES =						\
+	glcpp/glcpp-parse.h				\
+	glsl_parser.h					\
+	$(BUILT_SOURCES)
 
-builtin_function.cpp: $(srcdir)/builtins/profiles/* $(srcdir)/builtins/ir/* $(srcdir)/builtins/glsl/* $(srcdir)/builtins/tools/generate_builtins.py $(srcdir)/builtins/tools/texture_builtins.py builtin_compiler/builtin_compiler$(BUILD_EXEEXT)
-	$(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/builtins/tools/generate_builtins.py builtin_compiler/builtin_compiler$(BUILD_EXEEXT) > builtin_function.cpp || rm -f builtin_function.cpp
+builtin_function.cpp: $(srcdir)/builtins/profiles/* $(srcdir)/builtins/ir/* $(srcdir)/builtins/glsl/* $(srcdir)/builtins/tools/generate_builtins.py $(srcdir)/builtins/tools/texture_builtins.py $(builddir)/builtin_compiler/builtin_compiler$(BUILD_EXEEXT)
+	$(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/builtins/tools/generate_builtins.py $(builddir)/builtin_compiler/builtin_compiler$(BUILD_EXEEXT) > builtin_function.cpp || rm -f builtin_function.cpp
diff --git a/mesalib/src/glsl/Makefile.sources b/mesalib/src/glsl/Makefile.sources
index 2227c5ef5..de63c3246 100644
--- a/mesalib/src/glsl/Makefile.sources
+++ b/mesalib/src/glsl/Makefile.sources
@@ -6,6 +6,7 @@ GLSL_BUILDDIR = $(top_builddir)/src/glsl
 # libglcpp
 
 LIBGLCPP_FILES = \
+	$(GLSL_SRCDIR)/ralloc.c \
 	$(GLSL_SRCDIR)/glcpp/pp.c
 
 LIBGLCPP_GENERATED_FILES = \
@@ -84,8 +85,7 @@ LIBGLSL_FILES = \
 	$(GLSL_SRCDIR)/opt_swizzle_swizzle.cpp \
 	$(GLSL_SRCDIR)/opt_tree_grafting.cpp \
 	$(GLSL_SRCDIR)/s_expression.cpp \
-	$(GLSL_SRCDIR)/strtod.c \
-	$(GLSL_SRCDIR)/ralloc.c
+	$(GLSL_SRCDIR)/strtod.c
 
 # glsl_compiler
 
@@ -100,11 +100,11 @@ GLSL_COMPILER_CXX_FILES = \
 # builtin_stubs.cpp, is used.
 
 BUILTIN_COMPILER_CXX_FILES = \
-	$(GLSL_SRCDIR)/builtin_stubs.cpp
+	$(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp
 
 BUILTIN_COMPILER_GENERATED_CXX_FILES = \
-	$(GLSL_BUILDDIR)/glsl_lexer.cc \
-	$(GLSL_BUILDDIR)/glsl_parser.cc
+	$(GLSL_BUILDDIR)/glsl_lexer.cpp \
+	$(GLSL_BUILDDIR)/glsl_parser.cpp
 
 # libglsl generated sources
 LIBGLSL_GENERATED_CXX_FILES = \
diff --git a/mesalib/src/glsl/SConscript b/mesalib/src/glsl/SConscript
index 6abba2a24..6981f041b 100644
--- a/mesalib/src/glsl/SConscript
+++ b/mesalib/src/glsl/SConscript
@@ -76,9 +76,8 @@ else:
 
     builtin_compiler = env.Program(
         target = 'builtin_compiler/builtin_compiler',
-        source = compiler_objs + glsl_sources + [
-            'builtin_compiler/builtin_stubs.cpp',
-        ]
+        source = compiler_objs + glsl_sources + \
+            source_lists['BUILTIN_COMPILER_CXX_FILES'],
     )
 
     # SCons builtin dependency scanner doesn't detect that glsl_lexer.ll
diff --git a/mesalib/src/glsl/builtin_compiler/Makefile.am b/mesalib/src/glsl/builtin_compiler/Makefile.am
index d27aca555..1a863b228 100644
--- a/mesalib/src/glsl/builtin_compiler/Makefile.am
+++ b/mesalib/src/glsl/builtin_compiler/Makefile.am
@@ -40,31 +40,23 @@ AM_CFLAGS = \
 
 AM_CXXFLAGS = $(AM_CFLAGS)
 
-AM_YFLAGS = -v -d -p "glcpp_parser_"
-AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c
-
 include ../Makefile.sources
 
 noinst_PROGRAMS = builtin_compiler
+noinst_LTLIBRARIES = libglslcore.la libglcpp.la
 
-builtin_compiler_SOURCES = \
-	$(GLSL_SRCDIR)/glcpp/glcpp-lex.l \
-	$(GLSL_SRCDIR)/glcpp/glcpp-parse.y \
-	$(LIBGLCPP_FILES) \
-	$(GLSL_SRCDIR)/glsl_lexer.ll \
-	$(GLSL_BUILDDIR)/glsl_parser.cc \
-	$(LIBGLSL_FILES) \
-	$(LIBGLSL_CXX_FILES) \
-	$(top_srcdir)/src/mesa/main/hash_table.c \
-	$(top_srcdir)/src/mesa/program/prog_hash_table.c \
-	$(top_srcdir)/src/mesa/program/symbol_table.c \
-	$(GLSL_COMPILER_CXX_FILES) \
-	builtin_stubs.cpp
+libglcpp_la_SOURCES =					\
+	$(LIBGLCPP_GENERATED_FILES)			\
+	$(LIBGLCPP_FILES)
 
-BUILT_SOURCES = \
-	glcpp-lex.c \
-	glcpp-parse.c \
-	glcpp-parse.h \
-	glsl_lexer.cc
+libglslcore_la_SOURCES =				\
+	$(BUILTIN_COMPILER_GENERATED_CXX_FILES)		\
+	$(LIBGLSL_FILES)
 
-CLEANFILES = $(BUILT_SOURCES)
+builtin_compiler_SOURCES = \
+	$(top_srcdir)/src/mesa/main/hash_table.c	\
+	$(top_srcdir)/src/mesa/program/prog_hash_table.c\
+	$(top_srcdir)/src/mesa/program/symbol_table.c	\
+	$(BUILTIN_COMPILER_CXX_FILES)			\
+	$(GLSL_COMPILER_CXX_FILES)
+builtin_compiler_LDADD = libglslcore.la libglcpp.la
diff --git a/mesalib/src/glsl/glcpp/Makefile.am b/mesalib/src/glsl/glcpp/Makefile.am
deleted file mode 100644
index d79f8653c..000000000
--- a/mesalib/src/glsl/glcpp/Makefile.am
+++ /dev/null
@@ -1,54 +0,0 @@
-
-# Copyright © 2012 Jon TURNEY
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-include ../Makefile.sources
-
-TESTS = tests/glcpp-test
-
-AM_CFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/mapi \
-	-I$(top_srcdir)/src/mesa/ \
-	$(VISIBILITY_CFLAGS) \
-	$(DEFINES) \
-	$(API_DEFINES)
-
-AM_YFLAGS = -v -d -p "glcpp_parser_"
-AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c
-
-noinst_LTLIBRARIES = libglcpp.la
-noinst_PROGRAMS = glcpp
-
-libglcpp_la_SOURCES = \
-	glcpp-lex.l \
-	glcpp-parse.y \
-	$(LIBGLCPP_FILES)
-
-glcpp_SOURCES = \
-	../ralloc.c \
-	$(top_srcdir)/src/mesa/program/prog_hash_table.c \
-	glcpp.c
-
-glcpp_LDADD = libglcpp.la
-
-BUILT_SOURCES = glcpp-lex.c glcpp-parse.c glcpp-parse.h
-CLEANFILES = $(BUILT_SOURCES)