Merge remote-tracking branch 'origin/released'

Conflicts:
	libX11/configure.ac
	mesalib/src/mesa/main/ff_fragment_shader.cpp
	mesalib/src/mesa/main/framebuffer.c
	mesalib/src/mesa/main/texparam.c
	pixman/pixman/pixman-arm-neon-asm.S

9 files changed, 280 insertions, 281 deletions

diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index 5c832e646..1b1823a21 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -951,7 +951,7 @@ xyesyes)
         GL_PC_LIB_PRIV="$GL_LIB_DEPS"
         GL_PC_CFLAGS="$X11_INCLUDES"
     fi
-    GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread"
+    GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread $DLOPEN_LIBS"
     GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread"
 
     # if static, move the external libraries to the programs
@@ -1936,11 +1936,12 @@ if test "x$with_gallium_drivers" != x; then
             gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau" "" "xvmc-nouveau"
             ;;
         xswrast)
+            GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS softpipe"
+            if test "x$MESA_LLVM" = x1; then
+                GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
+            fi
+
             if test "x$HAVE_ST_DRI" = xyes; then
-                GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS softpipe"
-                if test "x$MESA_LLVM" = x1; then
-                    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
-                fi
                 GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-swrast"
             fi
             if test "x$HAVE_ST_VDPAU" = xyes; then
@@ -1958,9 +1959,6 @@ if test "x$with_gallium_drivers" != x; then
                if test "x$HAVE_WINSYS_XLIB" != xyes; then
                   GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib"
                fi
-               if test "x$HAVE_ST_DRI" != xyes; then
-                GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS softpipe"
-               fi
             fi
             ;;
         *)
diff --git a/mesalib/src/glsl/Makefile b/mesalib/src/glsl/Makefile
index 005b51d72..c20a6c9ed 100644
--- a/mesalib/src/glsl/Makefile
+++ b/mesalib/src/glsl/Makefile
@@ -164,6 +164,7 @@ depend: $(ALL_SOURCES) Makefile
 	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(ALL_SOURCES) 2> /dev/null
+	$(MKDEP) $(MKDEP_OPTIONS) -a -p $(DRICORE_OBJ_DIR)/ $(INCLUDES) $(ALL_SOURCES) 2> /dev/null
 
 # Remove .o and backup files
 clean: clean-dricore
diff --git a/mesalib/src/glsl/TODO b/mesalib/src/glsl/TODO
index 6eed986bf..c99d7e152 100644
--- a/mesalib/src/glsl/TODO
+++ b/mesalib/src/glsl/TODO
@@ -1,38 +1,27 @@
-- Detect code paths in non-void functions that don't reach a return statement

-

-- Improve handling of constants and their initializers.  Constant initializers

-  should never generate any code.  This is trival for scalar constants.  It is

-  also trivial for arrays, matrices, and vectors that are accessed with

-  constant index values.  For others it is more complicated.  Perhaps these

-  cases should be silently converted to uniforms?

-

-- Implement support for ir_binop_dot in ir_algebraic.cpp.  Perform

-  transformations such as "dot(v, vec3(0.0, 1.0, 0.0))" -> v.y.

-

-1.30 features:

-

-- Implement AST-to-HIR conversion of bit-shift operators.

-

-- Implement AST-to-HIR conversion of bit-wise {&,|,^,!} operators.

-

-- Implement AST-to-HIR conversion of switch-statements

-  - switch

-  - case

-  - Update break to correcly handle mixed nexting of switch-statements

-    and loops.

-

-- Handle currently unsupported constant expression types

-  - ir_unop_bit_not

-  - ir_binop_mod

-  - ir_binop_lshift

-  - ir_binop_rshift

-  - ir_binop_bit_and

-  - ir_binop_bit_xor

-  - ir_binop_bit_or

-

-- Implement support for 1.30 style shadow compares which only return a float

-  instead of a vec4.

-

-- Implement support for gl_ClipDistance.  This is non-trivial because

-  gl_ClipDistance is exposed as a float[8], but all hardware actually

+- Detect code paths in non-void functions that don't reach a return statement
+
+- Improve handling of constants and their initializers.  Constant initializers
+  should never generate any code.  This is trival for scalar constants.  It is
+  also trivial for arrays, matrices, and vectors that are accessed with
+  constant index values.  For others it is more complicated.  Perhaps these
+  cases should be silently converted to uniforms?
+
+- Implement support for ir_binop_dot in ir_algebraic.cpp.  Perform
+  transformations such as "dot(v, vec3(0.0, 1.0, 0.0))" -> v.y.
+
+- Track source locations throughout the IR.  There are currently several
+  places where we cannot emit line numbers for errors (and currently emit 0:0)
+  because we've "lost" the line number information.  This is particularly
+  noticeable at link time.
+
+1.30 features:
+
+- Implement AST-to-HIR conversion of switch-statements
+  - switch
+  - case
+  - Update break to correcly handle mixed nexting of switch-statements
+    and loops.
+
+- Implement support for gl_ClipDistance.  This is non-trivial because
+  gl_ClipDistance is exposed as a float[8], but all hardware actually
   implements it as vec4[2].
\ No newline at end of file
diff --git a/mesalib/src/mesa/Makefile b/mesalib/src/mesa/Makefile
index e17ee3b58..88f31b686 100644
--- a/mesalib/src/mesa/Makefile
+++ b/mesalib/src/mesa/Makefile
@@ -1,230 +1,231 @@
-# src/mesa/Makefile

-

-TOP = ../..

-include $(TOP)/configs/current

-

-MESA_LIBS := libmesa.a libmesagallium.a

-DEPENDS := depend

-

-MESA_OBJ_DIR := .

-DRICORE_OBJ_DIR := objs-dricore

-

-include sources.mak

-

-# adjust object dirs

-MESA_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_OBJECTS))

-MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))

-

-DRICORE_OBJECTS := $(addprefix $(DRICORE_OBJ_DIR)/, $(MESA_OBJECTS))

-

-# define preprocessor flags

-MESA_CPPFLAGS := $(API_DEFINES) $(DEFINES)

-

-# append include dirs

-MESA_CPPFLAGS += $(INCLUDE_DIRS)

-

-DRICORE_CPPFLAGS = $(MESA_CPPFLAGS)

-

-# tidy compiler flags

-CFLAGS := $(filter-out $(DEFINES), $(CFLAGS))

-CXXFLAGS := $(filter-out $(DEFINES), $(CXXFLAGS))

-

-# LLVM is needed for the state tracker

-MESA_CFLAGS := $(LLVM_CFLAGS) $(CFLAGS)

-DRICORE_CFLAGS := $(LLVM_CFLAGS) $(DRI_CFLAGS)

-

-MESA_CXXFLAGS := $(LLVM_CFLAGS) $(CXXFLAGS)

-DRICORE_CXXFLAGS := $(LLVM_CFLAGS) $(DRI_CXXFLAGS)

-

-define mesa-cc-c

-	@mkdir -p $(dir $@)

-	$(CC) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS)

-endef

-

-define mesa-cxx-c

-	@mkdir -p $(dir $@)

-	$(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CXXFLAGS)

-endef

-

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

-	$(call mesa-cc-c,MESA)

-

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

-	$(call mesa-cxx-c,MESA)

-

-$(MESA_OBJ_DIR)/%.o: %.S

-	$(call mesa-cc-c,MESA)

-

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

-	$(call mesa-cc-c,DRICORE)

-

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

-	$(call mesa-cxx-c,DRICORE)

-

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

-	$(call mesa-cc-c,DRICORE)

-

-# Default: build dependencies, then asm_subdirs, GLSL built-in lib,

-# then convenience libs (.a) and finally the device drivers:

-default: $(DEPENDS) asm_subdirs $(MESA_LIBS) $(DRICORE_LIBS) driver_subdirs

-

-main/api_exec_es1.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py

-	$(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES1.1 > $@

-

-main/api_exec_es2.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py

-	$(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES2.0 > $@

-

-program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y

-	$(BISON) -v -d --output=program/program_parse.tab.c $<

-

-program/lex.yy.c: program/program_lexer.l

-	$(FLEX) --never-interactive --outfile=$@ $<

-

-######################################################################

-# Helper libraries used by many drivers:

-

-# Make archive of core mesa object files

-libmesa.a: $(MESA_OBJECTS) $(GLSL_LIBS)

-	@ $(MKLIB) -o mesa -static $(MESA_OBJECTS) $(GLSL_LIBS)

-

-# Shared dricore library for classic DRI drivers

-$(TOP)/$(LIB_DIR)/libdricore.so: $(DRICORE_OBJECTS) $(DRICORE_GLSL_LIBS)

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

-		-cplusplus -noprefix \

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

-		$(DRICORE_LIB_DEPS) $(DRICORE_OBJECTS)

-

-# Make archive of subset of core mesa object files for gallium

-libmesagallium.a: $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS)

-	@ $(MKLIB) -o mesagallium -static $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS)

-

-######################################################################

-# Device drivers

-driver_subdirs: $(MESA_LIBS) $(DRICORE_LIBS)

-	@ (cd drivers && $(MAKE))

-

-

-######################################################################

-# Assembly subdirs

-asm_subdirs:

-	@ if echo "$(ASM_FLAGS)" | grep -q USE_X86_ASM ; then \

-		(cd x86 && $(MAKE)) || exit 1 ; \

-	fi

-	@ if echo "$(ASM_FLAGS)" | grep -q USE_X86_64_ASM ; then \

-		(cd x86 && $(MAKE)) || exit 1 ; \

-		(cd x86-64 && $(MAKE)) || exit 1 ; \

-	fi

-

-

-######################################################################

-# Dependency generation

-

-depend: $(ALL_SOURCES)

-	@ echo "running $(MKDEP)"

-	@ touch depend

-	@$(MKDEP) $(MKDEP_OPTIONS) -p$(MESA_OBJ_DIR)/ $(MESA_CPPFLAGS) \

-		$(ALL_SOURCES) > /dev/null 2>/dev/null

-

-######################################################################

-# Installation rules

-

-# this isn't fleshed out yet but is probably the way to go in the future

-new_install:

-	(cd drivers && $(MAKE) install)

-

-ifneq (,$(DRICORE_LIBS))

-DRICORE_INSTALL_TARGET = install-dricore

-endif

-

-# XXX replace this with new_install above someday

-install: default $(DRICORE_INSTALL_TARGET)

-	@for driver in $(DRIVER_DIRS) ; do \

-	  case "$$driver" in \

-	    osmesa) if [ "$(DRIVER_DIRS)" = osmesa ]; then \

-	              $(MAKE) install-headers install-osmesa || exit 1 ; \

-	            else \

-	              $(MAKE) install-osmesa || exit 1 ; \

-	            fi ;; \

-	    dri)    $(MAKE) install-libgl install-dri || exit 1 ;; \

-	    *)      $(MAKE) install-libgl || exit 1 ;; \

-	  esac ; \

-	done

-

-pcedit = \

-	-e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \

-	-e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \

-	-e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \

-	-e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \

-

-

-gl_pcedit = sed \

-	$(pcedit) \

-	-e 's,@GL_PC_REQ_PRIV@,$(GL_PC_REQ_PRIV),' \

-	-e 's,@GL_PC_LIB_PRIV@,$(GL_PC_LIB_PRIV),' \

-	-e 's,@GL_PC_CFLAGS@,$(GL_PC_CFLAGS),' \

-	-e 's,@GLX_TLS@,$(GLX_TLS),' \

-	-e 's,@GL_LIB@,$(GL_LIB),'

-

-gl.pc: gl.pc.in

-	$(gl_pcedit) $< > $@

-

-osmesa_pcedit = sed \

-	$(pcedit) \

-	-e 's,@OSMESA_LIB@,$(OSMESA_LIB),' \

-	-e 's,@OSMESA_PC_REQ@,$(OSMESA_PC_REQ),' \

-	-e 's,@OSMESA_PC_LIB_PRIV@,$(OSMESA_PC_LIB_PRIV),'

-

-osmesa.pc: osmesa.pc.in

-	$(osmesa_pcedit) $< > $@

-

-install-headers:

-	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL

-	$(INSTALL) -m 644 $(TOP)/include/GL/*.h \

-		$(DESTDIR)$(INSTALL_INC_DIR)/GL

-

-install-libgl: default gl.pc install-headers

-	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)

-	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig

-	$(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \

-		$(DESTDIR)$(INSTALL_LIB_DIR)

-	$(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig

-

-install-osmesa: default osmesa.pc

-	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)

-	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig

-	$(MINSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \

-		$(DESTDIR)$(INSTALL_LIB_DIR)

-	$(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig

-

-install-dri: default

-	cd drivers/dri && $(MAKE) install

-

-# We don't need MINSTALL here because we're not installing symbolic links

-install-dricore: default

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

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

-

-

-# Emacs tags

-tags:

-	etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h

-

-clean-dricore:

-	-rm -f libdricore.so

-	-rm -f $(DRICORE_LIBS)

-	-rm -rf $(DRICORE_OBJ_DIR)

-

-clean: clean-dricore

-	-rm -f */*.o

-	-rm -f */*/*.o

-	-rm -f depend depend.bak libmesa.a libmesagallium.a

-	-rm -f drivers/*/*.o

-	-rm -f *.pc

-	-@cd drivers/dri && $(MAKE) clean

-	-@cd drivers/x11 && $(MAKE) clean

-	-@cd drivers/osmesa && $(MAKE) clean

-	-@cd x86 && $(MAKE) clean

-	-@cd x86-64 && $(MAKE) clean

-

-

--include $(DEPENDS)

+# src/mesa/Makefile
+
+TOP = ../..
+include $(TOP)/configs/current
+
+MESA_LIBS := libmesa.a libmesagallium.a
+DEPENDS := depend
+
+MESA_OBJ_DIR := .
+DRICORE_OBJ_DIR := objs-dricore
+
+include sources.mak
+
+# adjust object dirs
+DRICORE_OBJECTS := $(addprefix $(DRICORE_OBJ_DIR)/, $(MESA_OBJECTS))
+MESA_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_OBJECTS))
+MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))
+
+# define preprocessor flags
+MESA_CPPFLAGS := $(API_DEFINES) $(DEFINES)
+
+# append include dirs
+MESA_CPPFLAGS += $(INCLUDE_DIRS)
+
+DRICORE_CPPFLAGS = $(MESA_CPPFLAGS)
+
+# tidy compiler flags
+CFLAGS := $(filter-out $(DEFINES), $(CFLAGS))
+CXXFLAGS := $(filter-out $(DEFINES), $(CXXFLAGS))
+
+# LLVM is needed for the state tracker
+MESA_CFLAGS := $(LLVM_CFLAGS) $(CFLAGS)
+DRICORE_CFLAGS := $(LLVM_CFLAGS) $(DRI_CFLAGS)
+
+MESA_CXXFLAGS := $(LLVM_CFLAGS) $(CXXFLAGS)
+DRICORE_CXXFLAGS := $(LLVM_CFLAGS) $(DRI_CXXFLAGS)
+
+define mesa-cc-c
+	@mkdir -p $(dir $@)
+	$(CC) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS)
+endef
+
+define mesa-cxx-c
+	@mkdir -p $(dir $@)
+	$(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CXXFLAGS)
+endef
+
+$(MESA_OBJ_DIR)/%.o: %.c
+	$(call mesa-cc-c,MESA)
+
+$(MESA_OBJ_DIR)/%.o: %.cpp
+	$(call mesa-cxx-c,MESA)
+
+$(MESA_OBJ_DIR)/%.o: %.S
+	$(call mesa-cc-c,MESA)
+
+$(DRICORE_OBJ_DIR)/%.o: %.c
+	$(call mesa-cc-c,DRICORE)
+
+$(DRICORE_OBJ_DIR)/%.o: %.cpp
+	$(call mesa-cxx-c,DRICORE)
+
+$(DRICORE_OBJ_DIR)/%.o: %.S
+	$(call mesa-cc-c,DRICORE)
+
+# Default: build dependencies, then asm_subdirs, GLSL built-in lib,
+# then convenience libs (.a) and finally the device drivers:
+default: $(DEPENDS) asm_subdirs $(MESA_LIBS) $(DRICORE_LIBS) driver_subdirs
+
+main/api_exec_es1.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py
+	$(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES1.1 > $@
+
+main/api_exec_es2.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py
+	$(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES2.0 > $@
+
+program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y
+	$(BISON) -v -d --output=program/program_parse.tab.c $<
+
+program/lex.yy.c: program/program_lexer.l
+	$(FLEX) --never-interactive --outfile=$@ $<
+
+######################################################################
+# Helper libraries used by many drivers:
+
+# Make archive of core mesa object files
+libmesa.a: $(MESA_OBJECTS) $(GLSL_LIBS)
+	@ $(MKLIB) -o mesa -static $(MESA_OBJECTS) $(GLSL_LIBS)
+
+# Shared dricore library for classic DRI drivers
+$(TOP)/$(LIB_DIR)/libdricore.so: $(DRICORE_OBJECTS) $(DRICORE_GLSL_LIBS)
+	@$(MKLIB) -o $@ -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
+		-cplusplus -noprefix \
+		-install $(TOP)/$(LIB_DIR) -id $(DRI_DRIVER_INSTALL_DIR)/$@.dylib \
+		$(DRICORE_LIB_DEPS) $(DRICORE_OBJECTS)
+
+# Make archive of subset of core mesa object files for gallium
+libmesagallium.a: $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS)
+	@ $(MKLIB) -o mesagallium -static $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS)
+
+######################################################################
+# Device drivers
+driver_subdirs: $(MESA_LIBS) $(DRICORE_LIBS)
+	@ (cd drivers && $(MAKE))
+
+
+######################################################################
+# Assembly subdirs
+asm_subdirs:
+	@ if echo "$(ASM_FLAGS)" | grep -q USE_X86_ASM ; then \
+		(cd x86 && $(MAKE)) || exit 1 ; \
+	fi
+	@ if echo "$(ASM_FLAGS)" | grep -q USE_X86_64_ASM ; then \
+		(cd x86 && $(MAKE)) || exit 1 ; \
+		(cd x86-64 && $(MAKE)) || exit 1 ; \
+	fi
+
+
+######################################################################
+# Dependency generation
+
+depend: $(ALL_SOURCES)
+	@ echo "running $(MKDEP)"
+	@ touch depend
+	@$(MKDEP) $(MKDEP_OPTIONS) -p$(MESA_OBJ_DIR)/ $(MESA_CPPFLAGS) \
+		$(ALL_SOURCES) > /dev/null 2>/dev/null
+	@$(MKDEP) $(MKDEP_OPTIONS) -a -p$(DRICORE_OBJ_DIR)/ $(MESA_CPPFLAGS) \
+		$(ALL_SOURCES) > /dev/null 2>/dev/null
+
+######################################################################
+# Installation rules
+
+# this isn't fleshed out yet but is probably the way to go in the future
+new_install:
+	(cd drivers && $(MAKE) install)
+
+ifneq (,$(DRICORE_LIBS))
+DRICORE_INSTALL_TARGET = install-dricore
+endif
+
+# XXX replace this with new_install above someday
+install: default $(DRICORE_INSTALL_TARGET)
+	@for driver in $(DRIVER_DIRS) ; do \
+	  case "$$driver" in \
+	    osmesa) if [ "$(DRIVER_DIRS)" = osmesa ]; then \
+	              $(MAKE) install-headers install-osmesa || exit 1 ; \
+	            else \
+	              $(MAKE) install-osmesa || exit 1 ; \
+	            fi ;; \
+	    dri)    $(MAKE) install-libgl install-dri || exit 1 ;; \
+	    *)      $(MAKE) install-libgl || exit 1 ;; \
+	  esac ; \
+	done
+
+pcedit = \
+	-e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
+	-e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \
+	-e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \
+	-e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \
+
+
+gl_pcedit = sed \
+	$(pcedit) \
+	-e 's,@GL_PC_REQ_PRIV@,$(GL_PC_REQ_PRIV),' \
+	-e 's,@GL_PC_LIB_PRIV@,$(GL_PC_LIB_PRIV),' \
+	-e 's,@GL_PC_CFLAGS@,$(GL_PC_CFLAGS),' \
+	-e 's,@GLX_TLS@,$(GLX_TLS),' \
+	-e 's,@GL_LIB@,$(GL_LIB),'
+
+gl.pc: gl.pc.in
+	$(gl_pcedit) $< > $@
+
+osmesa_pcedit = sed \
+	$(pcedit) \
+	-e 's,@OSMESA_LIB@,$(OSMESA_LIB),' \
+	-e 's,@OSMESA_PC_REQ@,$(OSMESA_PC_REQ),' \
+	-e 's,@OSMESA_PC_LIB_PRIV@,$(OSMESA_PC_LIB_PRIV),'
+
+osmesa.pc: osmesa.pc.in
+	$(osmesa_pcedit) $< > $@
+
+install-headers:
+	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
+	$(INSTALL) -m 644 $(TOP)/include/GL/*.h \
+		$(DESTDIR)$(INSTALL_INC_DIR)/GL
+
+install-libgl: default gl.pc install-headers
+	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+	$(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \
+		$(DESTDIR)$(INSTALL_LIB_DIR)
+	$(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+
+install-osmesa: default osmesa.pc
+	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+	$(MINSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \
+		$(DESTDIR)$(INSTALL_LIB_DIR)
+	$(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+
+install-dri: default
+	cd drivers/dri && $(MAKE) install
+
+# We don't need MINSTALL here because we're not installing symbolic links
+install-dricore: default
+	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
+	$(INSTALL) -m 755 $(DRICORE_LIBS) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
+
+
+# Emacs tags
+tags:
+	etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h
+
+clean-dricore:
+	-rm -f libdricore.so
+	-rm -f $(DRICORE_LIBS)
+	-rm -rf $(DRICORE_OBJ_DIR)
+
+clean: clean-dricore
+	-rm -f */*.o
+	-rm -f */*/*.o
+	-rm -f depend depend.bak libmesa.a libmesagallium.a
+	-rm -f drivers/*/*.o
+	-rm -f *.pc
+	-@cd drivers/dri && $(MAKE) clean
+	-@cd drivers/x11 && $(MAKE) clean
+	-@cd drivers/osmesa && $(MAKE) clean
+	-@cd x86 && $(MAKE) clean
+	-@cd x86-64 && $(MAKE) clean
+
+
+-include $(DEPENDS)
diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c
index 26c895196..f9b475598 100644
--- a/mesalib/src/mesa/drivers/common/meta.c
+++ b/mesalib/src/mesa/drivers/common/meta.c
@@ -2869,6 +2869,16 @@ copy_tex_sub_image(struct gl_context *ctx,
 
    /* Choose format/type for temporary image buffer */
    format = _mesa_get_format_base_format(texImage->TexFormat);
+   if (format == GL_LUMINANCE ||
+       format == GL_LUMINANCE_ALPHA ||
+       format == GL_INTENSITY) {
+      /* We don't want to use GL_LUMINANCE, GL_INTENSITY, etc. for the
+       * temp image buffer because glReadPixels will do L=R+G+B which is
+       * not what we want (should be L=R).
+       */
+      format = GL_RGBA;
+   }
+
    type = get_temp_image_type(ctx, format);
    bpp = _mesa_bytes_per_pixel(format, type);
    if (bpp <= 0) {
diff --git a/mesalib/src/mesa/main/ff_fragment_shader.cpp b/mesalib/src/mesa/main/ff_fragment_shader.cpp
index 562a37b81..28032b1a0 100644
--- a/mesalib/src/mesa/main/ff_fragment_shader.cpp
+++ b/mesalib/src/mesa/main/ff_fragment_shader.cpp
@@ -330,8 +330,7 @@ static GLbitfield get_fp_input_mask( struct gl_context *ctx )
       /* _NEW_RENDERMODE */

       fp_inputs = (FRAG_BIT_COL0 | FRAG_BIT_TEX0);

    }

-   else if (!(vertexProgram || vertexShader) ||

-            !ctx->VertexProgram._Current) {

+   else if (!(vertexProgram || vertexShader)) {

       /* Fixed function vertex logic */

       /* _NEW_ARRAY */

       GLbitfield varying_inputs = ctx->varying_vp_inputs;

diff --git a/mesalib/src/mesa/main/framebuffer.c b/mesalib/src/mesa/main/framebuffer.c
index a32976211..fd499ab2b 100644
--- a/mesalib/src/mesa/main/framebuffer.c
+++ b/mesalib/src/mesa/main/framebuffer.c
@@ -548,6 +548,7 @@ _mesa_update_framebuffer_visual(struct gl_context *ctx,
             fb->Visual.rgbBits = fb->Visual.redBits

                + fb->Visual.greenBits + fb->Visual.blueBits;

             fb->Visual.samples = rb->NumSamples;

+            fb->Visual.sampleBuffers = rb->NumSamples > 0 ? 1 : 0;

             if (_mesa_get_format_color_encoding(fmt) == GL_SRGB)

                 fb->Visual.sRGBCapable = ctx->Const.sRGBCapable;

             break;

diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c
index f62745770..1e51782d7 100644
--- a/mesalib/src/mesa/main/texparam.c
+++ b/mesalib/src/mesa/main/texparam.c
@@ -888,7 +888,7 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
    texObj = _mesa_select_tex_object(ctx, texUnit, target);

 

    img = _mesa_select_tex_image(ctx, texObj, target, level);

-   if (!img || !img->TexFormat) {

+   if (!img || img->TexFormat == MESA_FORMAT_NONE) {

       /* undefined texture image */

       if (pname == GL_TEXTURE_COMPONENTS)

          *params = 1;

diff --git a/mesalib/src/mesa/state_tracker/st_atom_texture.c b/mesalib/src/mesa/state_tracker/st_atom_texture.c
index 800a9f1f0..3115a2511 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_texture.c
@@ -221,9 +221,9 @@ update_single_texture(struct st_context *st, struct pipe_sampler_view **sampler_
 
       if ((samp->sRGBDecode == GL_SKIP_DECODE_EXT) &&
 	  (_mesa_get_format_color_encoding(texFormat) == GL_SRGB)) {
-	 /* don't do sRGB->RGB conversion.  Interpret the texture
-	  * texture data as linear values.
-	  */
+         /* Don't do sRGB->RGB conversion.  Interpret the texture data as
+          * linear values.
+          */
 	 const gl_format linearFormat =
 	    _mesa_get_srgb_format_linear(texFormat);
 	 firstImageFormat = st_mesa_format_to_pipe_format(linearFormat);