summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/i965/brw_sf.h
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/brw_sf.h
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/brw_sf.h')
-rw-r--r--src/mesa/drivers/dri/i965/brw_sf.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_sf.h b/src/mesa/drivers/dri/i965/brw_sf.h
index e8946511dd..385f1eea13 100644
--- a/src/mesa/drivers/dri/i965/brw_sf.h
+++ b/src/mesa/drivers/dri/i965/brw_sf.h
@@ -45,10 +45,10 @@
#define SF_UNFILLED_TRIS 3
struct brw_sf_prog_key {
+ GLuint attrs:32;
GLuint primitive:2;
GLuint do_twoside_color:1;
GLuint do_flat_shading:1;
- GLuint attrs:16;
GLuint frontface_ccw:1;
GLuint do_point_sprite:1;
GLuint pad:10;