From c157cfc6376f7469ab272b18868183e5ff9ac754 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 6 Oct 2008 17:34:51 -0700 Subject: i965: Add ARB_occlusion_query support. --- src/mesa/drivers/dri/i965/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/mesa/drivers/dri/i965/Makefile') diff --git a/src/mesa/drivers/dri/i965/Makefile b/src/mesa/drivers/dri/i965/Makefile index c2d555cd0c..7bc16a02c8 100644 --- a/src/mesa/drivers/dri/i965/Makefile +++ b/src/mesa/drivers/dri/i965/Makefile @@ -51,6 +51,7 @@ DRIVER_SOURCES = \ brw_metaops.c \ brw_misc_state.c \ brw_program.c \ + brw_queryobj.c \ brw_sf.c \ brw_sf_emit.c \ brw_sf_state.c \ -- cgit v1.2.3 From 91221483a633d6230a4f8d2500ed180428754215 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 9 Oct 2008 10:23:47 -0700 Subject: i965: Actually hook up the accelerated DrawPixels support. --- src/mesa/drivers/dri/i965/Makefile | 3 ++- src/mesa/drivers/dri/intel/intel_pixel.c | 2 +- src/mesa/drivers/dri/intel/intel_pixel_draw.c | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mesa/drivers/dri/i965/Makefile') diff --git a/src/mesa/drivers/dri/i965/Makefile b/src/mesa/drivers/dri/i965/Makefile index 7bc16a02c8..005460f354 100644 --- a/src/mesa/drivers/dri/i965/Makefile +++ b/src/mesa/drivers/dri/i965/Makefile @@ -18,8 +18,9 @@ DRIVER_SOURCES = \ intel_screen.c \ intel_span.c \ intel_pixel.c \ - intel_pixel_copy.c \ intel_pixel_bitmap.c \ + intel_pixel_copy.c \ + intel_pixel_draw.c \ intel_state.c \ intel_tex.c \ intel_tex_copy.c \ diff --git a/src/mesa/drivers/dri/intel/intel_pixel.c b/src/mesa/drivers/dri/intel/intel_pixel.c index f39fac13cf..b267ffd890 100644 --- a/src/mesa/drivers/dri/intel/intel_pixel.c +++ b/src/mesa/drivers/dri/intel/intel_pixel.c @@ -181,9 +181,9 @@ intelInitPixelFuncs(struct dd_function_table *functions) if (!getenv("INTEL_NO_BLIT")) { functions->Bitmap = intelBitmap; functions->CopyPixels = intelCopyPixels; + functions->DrawPixels = intelDrawPixels; #ifdef I915 functions->ReadPixels = intelReadPixels; - functions->DrawPixels = intelDrawPixels; #endif } } diff --git a/src/mesa/drivers/dri/intel/intel_pixel_draw.c b/src/mesa/drivers/dri/intel/intel_pixel_draw.c index be213e7b96..b60dad7460 100644 --- a/src/mesa/drivers/dri/intel/intel_pixel_draw.c +++ b/src/mesa/drivers/dri/intel/intel_pixel_draw.c @@ -51,7 +51,6 @@ #include "intel_regions.h" #include "intel_pixel.h" #include "intel_buffer_objects.h" -#include "intel_tris.h" static GLboolean -- cgit v1.2.3