summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/i965/Makefile
diff options
context:
space:
mode:
authorZou Nan hai <nanhai.zou@intel.com>2007-10-26 15:39:50 +0800
committerZou Nan hai <nanhai.zou@intel.com>2007-10-26 15:39:50 +0800
commit6ef27b88e6f767cd476676b33cb7c4ea6922234e (patch)
tree463d6a70b986cb62b3516ef6fd8e691f680f30ea /src/mesa/drivers/dri/i965/Makefile
parentff042bfdeeeb0a3d658d5ab1dbdcac7b67aac0f8 (diff)
parentde803f538c16096c9e241cfdddc092ac2aa2504e (diff)
Merge branch '965-glsl'
Conflicts: src/mesa/drivers/dri/i965/brw_sf.h src/mesa/drivers/dri/i965/intel_context.c
Diffstat (limited to 'src/mesa/drivers/dri/i965/Makefile')
-rw-r--r--src/mesa/drivers/dri/i965/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/Makefile b/src/mesa/drivers/dri/i965/Makefile
index 7e07bc9c1a..4028f1903a 100644
--- a/src/mesa/drivers/dri/i965/Makefile
+++ b/src/mesa/drivers/dri/i965/Makefile
@@ -69,6 +69,7 @@ DRIVER_SOURCES = \
brw_wm_emit.c \
brw_wm_fp.c \
brw_wm_iz.c \
+ brw_wm_glsl.c \
brw_wm_pass0.c \
brw_wm_pass1.c \
brw_wm_pass2.c \