From: Keith Packard <keithp@keithp.com>
Date: Mon, 5 May 2008 17:45:30 +0000 (-0700)
Subject: Temporarily disable intel pixel ops on i915 for GEM
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=367b1e35dc1dbeda65709b0ab4f7983d0c7a6cc2;p=mesa.git

Temporarily disable intel pixel ops on i915 for GEM

Instead of attempting to fix these for GEM, just disable until GEM is
working.
---

diff --git a/src/mesa/drivers/dri/i915/Makefile b/src/mesa/drivers/dri/i915/Makefile
index ed234106978..67f251a7faa 100644
--- a/src/mesa/drivers/dri/i915/Makefile
+++ b/src/mesa/drivers/dri/i915/Makefile
@@ -6,6 +6,11 @@ LIBNAME = i915_dri.so
 
 MINIGLX_SOURCES = server/intel_dri.c
 
+PIXEL_SOURCES = \
+	intel_pixel.c \
+	intel_pixel_read.c \
+	intel_pixel_draw.c
+
 DRIVER_SOURCES = \
 	i830_context.c \
 	i830_metaops.c \
@@ -27,10 +32,7 @@ DRIVER_SOURCES = \
 	intel_tex_validate.c \
 	intel_tex_format.c \
 	intel_tex.c \
-	intel_pixel.c \
 	intel_pixel_copy.c \
-	intel_pixel_read.c \
-	intel_pixel_draw.c \
 	intel_buffers.c \
 	intel_blit.c \
 	i915_tex.c \
@@ -68,6 +70,7 @@ DRIVER_DEFINES = -I../intel -I../intel/server -DI915 \
 include ../Makefile.template
 
 intel_decode.o: ../intel/intel_decode.c
+
 intel_tex_layout.o: ../intel/intel_tex_layout.c
 
 symlinks:
diff --git a/src/mesa/drivers/dri/i915/i830_context.c b/src/mesa/drivers/dri/i915/i830_context.c
index 240c57c9ad3..166a3bc8e21 100644
--- a/src/mesa/drivers/dri/i915/i830_context.c
+++ b/src/mesa/drivers/dri/i915/i830_context.c
@@ -52,7 +52,7 @@ static void
 i830InitDriverFunctions(struct dd_function_table *functions)
 {
    intelInitDriverFunctions(functions);
-   intelInitPixelFuncs(functions);
+//   intelInitPixelFuncs(functions);
    i830InitStateFuncs(functions);
    i830InitTextureFuncs(functions);
 }
diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c
index 01619590999..59da40229ab 100644
--- a/src/mesa/drivers/dri/i915/i915_context.c
+++ b/src/mesa/drivers/dri/i915/i915_context.c
@@ -94,7 +94,7 @@ static void
 i915InitDriverFunctions(struct dd_function_table *functions)
 {
    intelInitDriverFunctions(functions);
-   intelInitPixelFuncs(functions);
+//   intelInitPixelFuncs(functions);
    i915InitStateFunctions(functions);
    i915InitTextureFuncs(functions);
    i915InitFragProgFuncs(functions);