summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2008-05-05 10:45:30 -0700
committerKeith Packard <keithp@keithp.com>2008-05-05 10:45:30 -0700
commit367b1e35dc1dbeda65709b0ab4f7983d0c7a6cc2 (patch)
treeb66ddcd82b50f9fac6845122e955f11e62334569
parent81ec0545c93d57f72cff5099c6a34f04e9257a38 (diff)
Temporarily disable intel pixel ops on i915 for GEM
Instead of attempting to fix these for GEM, just disable until GEM is working.
-rw-r--r--src/mesa/drivers/dri/i915/Makefile9
-rw-r--r--src/mesa/drivers/dri/i915/i830_context.c2
-rw-r--r--src/mesa/drivers/dri/i915/i915_context.c2
3 files changed, 8 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i915/Makefile b/src/mesa/drivers/dri/i915/Makefile
index ed23410697..67f251a7fa 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 240c57c9ad..166a3bc8e2 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 0161959099..59da40229a 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);