Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1

Conflicts:

	src/mesa/drivers/dri/Makefile.template

3 files changed, 9 insertions, 6 deletions

diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 1d0b0726db..3e7e527a98 100644
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -2,13 +2,16 @@
 
 MESA_MODULES = $(TOP)/src/mesa/libmesa.a
 
-COMMON_SOURCES = \
+COMMON_GALLIUM_SOURCES = \
         ../common/utils.c \
-        ../common/texmem.c \
         ../common/vblank.c \
         ../common/dri_util.c \
-        ../common/xmlconfig.c \
-        ../common/drirenderbuffer.c 
+        ../common/xmlconfig.c
+
+COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \
+        ../../common/driverfuncs.c \
+        ../common/texmem.c \
+        ../common/drirenderbuffer.c
 
 COMMON_BM_SOURCES = \
 	../common/dri_bufmgr.c \
diff --git a/src/mesa/drivers/dri/intel_winsys/Makefile b/src/mesa/drivers/dri/intel_winsys/Makefile
index 46b9541d7d..9ae0f01325 100644
--- a/src/mesa/drivers/dri/intel_winsys/Makefile
+++ b/src/mesa/drivers/dri/intel_winsys/Makefile
@@ -22,7 +22,7 @@ DRIVER_SOURCES = \
 	intel_batchpool.c
 
 C_SOURCES = \
-	$(COMMON_SOURCES) \
+	$(COMMON_GALLIUM_SOURCES) \
 	$(COMMON_BM_SOURCES) \
 	$(DRIVER_SOURCES)
 
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c b/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
index 86ea86a58f..9c643dd0ba 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_winsys_pipe.c
@@ -191,7 +191,7 @@ intel_i915_surface_pitch(struct pipe_winsys *winsys,
     */
 
    /* XXX is the pitch different for textures vs. drawables? */
-   if (flags & PIPE_SURFACE_FLAG_TEXTURE)  /* or PIPE_SURFACE_FLAG_RENDER? */
+   if (1/*flags & PIPE_SURFACE_FLAG_TEXTURE*/)  /* or PIPE_SURFACE_FLAG_RENDER? */
       return ((cpp * width + 63) & ~63) / cpp;
    else
       return ((cpp * width + 63) & ~63) / cpp;