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 ed23410697892f59517f3a5a66d5c5eca39cce70..67f251a7faaaf8d9fc8d152276449b8dcf5c1df2 100644 (file)
--- 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 240c57c9ad32e3e567087c64db5d188d2eaddc26..166a3bc8e21ab5c4298a18e6dce305a807ae5ac5 100644 (file)
--- 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 01619590999289171bab44569fd681c76b565482..59da40229abffa4406c81b03eacf1115e06a72d8 100644 (file)
--- 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);