Merge Mesa 13.0.3

9 files changed, 67 insertions, 12 deletions

diff --git a/lib/mesa/src/compiler/Makefile.glsl.am b/lib/mesa/src/compiler/Makefile.glsl.am
index 199ee9e54..1fbcbe00b 100644
--- a/lib/mesa/src/compiler/Makefile.glsl.am
+++ b/lib/mesa/src/compiler/Makefile.glsl.am
@@ -62,8 +62,11 @@ glsl_tests_blob_test_LDADD =				\
 
 glsl_tests_cache_test_SOURCES =				\
 	glsl/tests/cache_test.c
+glsl_tests_cache_test_CFLAGS =				\
+	$(PTHREAD_CFLAGS)
 glsl_tests_cache_test_LDADD =				\
-	glsl/libglsl.la
+	glsl/libglsl.la					\
+	$(PTHREAD_LIBS)
 
 glsl_tests_general_ir_test_SOURCES =			\
 	glsl/tests/builtin_variable_test.cpp		\
diff --git a/lib/mesa/src/compiler/Makefile.in b/lib/mesa/src/compiler/Makefile.in
index 49a03e223..2a1064936 100644
--- a/lib/mesa/src/compiler/Makefile.in
+++ b/lib/mesa/src/compiler/Makefile.in
@@ -365,9 +365,15 @@ glsl_glsl_test_DEPENDENCIES = glsl/libglsl.la glsl/libstandalone.la \
 am_glsl_tests_blob_test_OBJECTS = glsl/tests/blob_test.$(OBJEXT)
 glsl_tests_blob_test_OBJECTS = $(am_glsl_tests_blob_test_OBJECTS)
 glsl_tests_blob_test_DEPENDENCIES = glsl/libglsl.la
-am_glsl_tests_cache_test_OBJECTS = glsl/tests/cache_test.$(OBJEXT)
+am_glsl_tests_cache_test_OBJECTS =  \
+	glsl/tests/glsl_tests_cache_test-cache_test.$(OBJEXT)
 glsl_tests_cache_test_OBJECTS = $(am_glsl_tests_cache_test_OBJECTS)
-glsl_tests_cache_test_DEPENDENCIES = glsl/libglsl.la
+glsl_tests_cache_test_DEPENDENCIES = glsl/libglsl.la \
+	$(am__DEPENDENCIES_1)
+glsl_tests_cache_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(glsl_tests_cache_test_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 am_glsl_tests_general_ir_test_OBJECTS =  \
 	glsl/tests/builtin_variable_test.$(OBJEXT) \
 	glsl/tests/invalidate_locations_test.$(OBJEXT) \
@@ -1133,8 +1139,12 @@ glsl_tests_blob_test_LDADD = \
 glsl_tests_cache_test_SOURCES = \
 	glsl/tests/cache_test.c
 
+glsl_tests_cache_test_CFLAGS = \
+	$(PTHREAD_CFLAGS)
+
 glsl_tests_cache_test_LDADD = \
-	glsl/libglsl.la
+	glsl/libglsl.la					\
+	$(PTHREAD_LIBS)
 
 glsl_tests_general_ir_test_SOURCES = \
 	glsl/tests/builtin_variable_test.cpp		\
@@ -1761,11 +1771,12 @@ glsl/tests/blob_test.$(OBJEXT): glsl/tests/$(am__dirstamp) \
 glsl/tests/blob-test$(EXEEXT): $(glsl_tests_blob_test_OBJECTS) $(glsl_tests_blob_test_DEPENDENCIES) $(EXTRA_glsl_tests_blob_test_DEPENDENCIES) glsl/tests/$(am__dirstamp)
 	@rm -f glsl/tests/blob-test$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(glsl_tests_blob_test_OBJECTS) $(glsl_tests_blob_test_LDADD) $(LIBS)
-glsl/tests/cache_test.$(OBJEXT): glsl/tests/$(am__dirstamp) \
+glsl/tests/glsl_tests_cache_test-cache_test.$(OBJEXT):  \
+	glsl/tests/$(am__dirstamp) \
 	glsl/tests/$(DEPDIR)/$(am__dirstamp)
 glsl/tests/cache-test$(EXEEXT): $(glsl_tests_cache_test_OBJECTS) $(glsl_tests_cache_test_DEPENDENCIES) $(EXTRA_glsl_tests_cache_test_DEPENDENCIES) glsl/tests/$(am__dirstamp)
 	@rm -f glsl/tests/cache-test$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(glsl_tests_cache_test_OBJECTS) $(glsl_tests_cache_test_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(glsl_tests_cache_test_LINK) $(glsl_tests_cache_test_OBJECTS) $(glsl_tests_cache_test_LDADD) $(LIBS)
 glsl/tests/builtin_variable_test.$(OBJEXT):  \
 	glsl/tests/$(am__dirstamp) \
 	glsl/tests/$(DEPDIR)/$(am__dirstamp)
@@ -1950,9 +1961,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/glcpp/$(DEPDIR)/pp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/blob_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/builtin_variable_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/cache_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/copy_constant_to_storage_tests.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/general_ir_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/glsl_tests_cache_test-cache_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/invalidate_locations_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/sampler_types_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@glsl/tests/$(DEPDIR)/set_uniform_initializer_tests.Po@am__quote@
@@ -2061,6 +2072,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+glsl/tests/glsl_tests_cache_test-cache_test.o: glsl/tests/cache_test.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glsl_tests_cache_test_CFLAGS) $(CFLAGS) -MT glsl/tests/glsl_tests_cache_test-cache_test.o -MD -MP -MF glsl/tests/$(DEPDIR)/glsl_tests_cache_test-cache_test.Tpo -c -o glsl/tests/glsl_tests_cache_test-cache_test.o `test -f 'glsl/tests/cache_test.c' || echo '$(srcdir)/'`glsl/tests/cache_test.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) glsl/tests/$(DEPDIR)/glsl_tests_cache_test-cache_test.Tpo glsl/tests/$(DEPDIR)/glsl_tests_cache_test-cache_test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='glsl/tests/cache_test.c' object='glsl/tests/glsl_tests_cache_test-cache_test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glsl_tests_cache_test_CFLAGS) $(CFLAGS) -c -o glsl/tests/glsl_tests_cache_test-cache_test.o `test -f 'glsl/tests/cache_test.c' || echo '$(srcdir)/'`glsl/tests/cache_test.c
+
+glsl/tests/glsl_tests_cache_test-cache_test.obj: glsl/tests/cache_test.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glsl_tests_cache_test_CFLAGS) $(CFLAGS) -MT glsl/tests/glsl_tests_cache_test-cache_test.obj -MD -MP -MF glsl/tests/$(DEPDIR)/glsl_tests_cache_test-cache_test.Tpo -c -o glsl/tests/glsl_tests_cache_test-cache_test.obj `if test -f 'glsl/tests/cache_test.c'; then $(CYGPATH_W) 'glsl/tests/cache_test.c'; else $(CYGPATH_W) '$(srcdir)/glsl/tests/cache_test.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) glsl/tests/$(DEPDIR)/glsl_tests_cache_test-cache_test.Tpo glsl/tests/$(DEPDIR)/glsl_tests_cache_test-cache_test.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='glsl/tests/cache_test.c' object='glsl/tests/glsl_tests_cache_test-cache_test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glsl_tests_cache_test_CFLAGS) $(CFLAGS) -c -o glsl/tests/glsl_tests_cache_test-cache_test.obj `if test -f 'glsl/tests/cache_test.c'; then $(CYGPATH_W) 'glsl/tests/cache_test.c'; else $(CYGPATH_W) '$(srcdir)/glsl/tests/cache_test.c'; fi`
+
 spirv/spirv2nir-spirv2nir.o: spirv/spirv2nir.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(spirv2nir_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT spirv/spirv2nir-spirv2nir.o -MD -MP -MF spirv/$(DEPDIR)/spirv2nir-spirv2nir.Tpo -c -o spirv/spirv2nir-spirv2nir.o `test -f 'spirv/spirv2nir.c' || echo '$(srcdir)/'`spirv/spirv2nir.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) spirv/$(DEPDIR)/spirv2nir-spirv2nir.Tpo spirv/$(DEPDIR)/spirv2nir-spirv2nir.Po
diff --git a/lib/mesa/src/compiler/glsl/tests/.deps/cache_test.Po b/lib/mesa/src/compiler/glsl/tests/.deps/cache_test.Po
deleted file mode 100644
index 9ce06a81e..000000000
--- a/lib/mesa/src/compiler/glsl/tests/.deps/cache_test.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lib/mesa/src/getopt/getopt.h b/lib/mesa/src/getopt/getopt.h
index d807fef7c..4279c8da5 100644
--- a/lib/mesa/src/getopt/getopt.h
+++ b/lib/mesa/src/getopt/getopt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getopt.h,v 1.3 2016/12/11 08:53:21 jsg Exp $	*/
+/*	$OpenBSD: getopt.h,v 1.4 2017/01/19 05:53:24 jsg Exp $	*/
 /*	$NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $	*/
 
 /*-
diff --git a/lib/mesa/src/getopt/getopt_long.c b/lib/mesa/src/getopt/getopt_long.c
index eb81e7c12..44b94a141 100644
--- a/lib/mesa/src/getopt/getopt_long.c
+++ b/lib/mesa/src/getopt/getopt_long.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getopt_long.c,v 1.3 2016/12/11 08:53:21 jsg Exp $	*/
+/*	$OpenBSD: getopt_long.c,v 1.4 2017/01/19 05:53:24 jsg Exp $	*/
 /*	$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $	*/
 
 /*
diff --git a/lib/mesa/src/glx/Makefile.am b/lib/mesa/src/glx/Makefile.am
index 7072f3f08..b8c1662c7 100644
--- a/lib/mesa/src/glx/Makefile.am
+++ b/lib/mesa/src/glx/Makefile.am
@@ -170,7 +170,7 @@ libglx_la_SOURCES += \
 GL_LIB_VERSION=0
 else
 AM_CFLAGS += \
-	-DGL_LIB_NAME=\"lib@GL_LIB@.so\"
+	-DGL_LIB_NAME=\"lib@GL_LIB@.so.1\"
 GL_LIB_VERSION=1:2
 endif
 
diff --git a/lib/mesa/src/glx/Makefile.in b/lib/mesa/src/glx/Makefile.in
index 2b1849cfe..f15b4509f 100644
--- a/lib/mesa/src/glx/Makefile.in
+++ b/lib/mesa/src/glx/Makefile.in
@@ -127,7 +127,7 @@ target_triplet = @target@
 @USE_LIBGLVND_GLX_TRUE@	glxglvnddispatchfuncs.h
 
 @USE_LIBGLVND_GLX_FALSE@am__append_14 = \
-@USE_LIBGLVND_GLX_FALSE@	-DGL_LIB_NAME=\"lib@GL_LIB@.so\"
+@USE_LIBGLVND_GLX_FALSE@	-DGL_LIB_NAME=\"lib@GL_LIB@.so.1\"
 
 @HAVE_WINDOWSDRI_TRUE@am__append_15 = -lgdi32 -lopengl32 -Wl,--disable-stdcall-fixup
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
diff --git a/lib/mesa/src/mesa/drivers/dri/i965/Makefile.am b/lib/mesa/src/mesa/drivers/dri/i965/Makefile.am
index 1933f234b..a09ade383 100644
--- a/lib/mesa/src/mesa/drivers/dri/i965/Makefile.am
+++ b/lib/mesa/src/mesa/drivers/dri/i965/Makefile.am
@@ -108,6 +108,7 @@ TEST_LIBS = \
 
 TESTS = \
 	test_fs_cmod_propagation \
+	test_fs_copy_propagation \
 	test_fs_saturate_propagation \
         test_eu_compact \
 	test_vf_float_conversions \
@@ -123,6 +124,12 @@ test_fs_cmod_propagation_LDADD = \
 	$(top_builddir)/src/gtest/libgtest.la \
 	$(TEST_LIBS)
 
+test_fs_copy_propagation_SOURCES = \
+	test_fs_copy_propagation.cpp
+test_fs_copy_propagation_LDADD = \
+	$(top_builddir)/src/gtest/libgtest.la \
+	$(TEST_LIBS)
+
 test_fs_saturate_propagation_SOURCES = \
 	test_fs_saturate_propagation.cpp
 test_fs_saturate_propagation_LDADD = \
diff --git a/lib/mesa/src/mesa/drivers/dri/i965/Makefile.in b/lib/mesa/src/mesa/drivers/dri/i965/Makefile.in
index e7b325dfd..4f16a253c 100644
--- a/lib/mesa/src/mesa/drivers/dri/i965/Makefile.in
+++ b/lib/mesa/src/mesa/drivers/dri/i965/Makefile.in
@@ -75,6 +75,7 @@ target_triplet = @target@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/Makefile.sources $(top_srcdir)/bin/depcomp
 TESTS = test_fs_cmod_propagation$(EXEEXT) \
+	test_fs_copy_propagation$(EXEEXT) \
 	test_fs_saturate_propagation$(EXEEXT) test_eu_compact$(EXEEXT) \
 	test_vf_float_conversions$(EXEEXT) \
 	test_vec4_cmod_propagation$(EXEEXT) \
@@ -225,6 +226,7 @@ libi965_gen9_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(libi965_gen9_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
 am__EXEEXT_1 = test_fs_cmod_propagation$(EXEEXT) \
+	test_fs_copy_propagation$(EXEEXT) \
 	test_fs_saturate_propagation$(EXEEXT) test_eu_compact$(EXEEXT) \
 	test_vf_float_conversions$(EXEEXT) \
 	test_vec4_cmod_propagation$(EXEEXT) \
@@ -244,6 +246,12 @@ test_fs_cmod_propagation_OBJECTS =  \
 	$(am_test_fs_cmod_propagation_OBJECTS)
 test_fs_cmod_propagation_DEPENDENCIES =  \
 	$(top_builddir)/src/gtest/libgtest.la $(am__DEPENDENCIES_2)
+am_test_fs_copy_propagation_OBJECTS =  \
+	test_fs_copy_propagation.$(OBJEXT)
+test_fs_copy_propagation_OBJECTS =  \
+	$(am_test_fs_copy_propagation_OBJECTS)
+test_fs_copy_propagation_DEPENDENCIES =  \
+	$(top_builddir)/src/gtest/libgtest.la $(am__DEPENDENCIES_2)
 am_test_fs_saturate_propagation_OBJECTS =  \
 	test_fs_saturate_propagation.$(OBJEXT)
 test_fs_saturate_propagation_OBJECTS =  \
@@ -332,6 +340,7 @@ SOURCES = $(libi965_compiler_la_SOURCES) $(libi965_dri_la_SOURCES) \
 	$(libi965_gen9_la_SOURCES) $(test_eu_compact_SOURCES) \
 	$(nodist_EXTRA_test_eu_compact_SOURCES) \
 	$(test_fs_cmod_propagation_SOURCES) \
+	$(test_fs_copy_propagation_SOURCES) \
 	$(test_fs_saturate_propagation_SOURCES) \
 	$(test_vec4_cmod_propagation_SOURCES) \
 	$(test_vec4_copy_propagation_SOURCES) \
@@ -342,6 +351,7 @@ DIST_SOURCES = $(libi965_compiler_la_SOURCES) \
 	$(libi965_gen7_la_SOURCES) $(libi965_gen75_la_SOURCES) \
 	$(libi965_gen8_la_SOURCES) $(libi965_gen9_la_SOURCES) \
 	$(test_eu_compact_SOURCES) $(test_fs_cmod_propagation_SOURCES) \
+	$(test_fs_copy_propagation_SOURCES) \
 	$(test_fs_saturate_propagation_SOURCES) \
 	$(test_vec4_cmod_propagation_SOURCES) \
 	$(test_vec4_copy_propagation_SOURCES) \
@@ -1004,6 +1014,13 @@ test_fs_cmod_propagation_LDADD = \
 	$(top_builddir)/src/gtest/libgtest.la \
 	$(TEST_LIBS)
 
+test_fs_copy_propagation_SOURCES = \
+	test_fs_copy_propagation.cpp
+
+test_fs_copy_propagation_LDADD = \
+	$(top_builddir)/src/gtest/libgtest.la \
+	$(TEST_LIBS)
+
 test_fs_saturate_propagation_SOURCES = \
 	test_fs_saturate_propagation.cpp
 
@@ -1120,6 +1137,9 @@ test_eu_compact$(EXEEXT): $(test_eu_compact_OBJECTS) $(test_eu_compact_DEPENDENC
 test_fs_cmod_propagation$(EXEEXT): $(test_fs_cmod_propagation_OBJECTS) $(test_fs_cmod_propagation_DEPENDENCIES) $(EXTRA_test_fs_cmod_propagation_DEPENDENCIES) 
 	@rm -f test_fs_cmod_propagation$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(test_fs_cmod_propagation_OBJECTS) $(test_fs_cmod_propagation_LDADD) $(LIBS)
+test_fs_copy_propagation$(EXEEXT): $(test_fs_copy_propagation_OBJECTS) $(test_fs_copy_propagation_DEPENDENCIES) $(EXTRA_test_fs_copy_propagation_DEPENDENCIES) 
+	@rm -f test_fs_copy_propagation$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(test_fs_copy_propagation_OBJECTS) $(test_fs_copy_propagation_LDADD) $(LIBS)
 test_fs_saturate_propagation$(EXEEXT): $(test_fs_saturate_propagation_OBJECTS) $(test_fs_saturate_propagation_DEPENDENCIES) $(EXTRA_test_fs_saturate_propagation_DEPENDENCIES) 
 	@rm -f test_fs_saturate_propagation$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(test_fs_saturate_propagation_OBJECTS) $(test_fs_saturate_propagation_LDADD) $(LIBS)
@@ -1342,6 +1362,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libi965_gen9_la-genX_blorp_exec.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_eu_compact.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_fs_cmod_propagation.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_fs_copy_propagation.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_fs_saturate_propagation.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_vec4_cmod_propagation.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_vec4_copy_propagation.Po@am__quote@