diff options
| author | Zou Nan hai <nanhai.zou@intel.com> | 2007-10-26 15:39:50 +0800 |
|---|---|---|
| committer | Zou Nan hai <nanhai.zou@intel.com> | 2007-10-26 15:39:50 +0800 |
| commit | 6ef27b88e6f767cd476676b33cb7c4ea6922234e (patch) | |
| tree | 463d6a70b986cb62b3516ef6fd8e691f680f30ea /src/mesa/drivers/dri/i965/brw_clip.h | |
| parent | ff042bfdeeeb0a3d658d5ab1dbdcac7b67aac0f8 (diff) | |
| parent | de803f538c16096c9e241cfdddc092ac2aa2504e (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_clip.h')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_clip.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_clip.h b/src/mesa/drivers/dri/i965/brw_clip.h index 49b2770a51..2a65697325 100644 --- a/src/mesa/drivers/dri/i965/brw_clip.h +++ b/src/mesa/drivers/dri/i965/brw_clip.h @@ -42,7 +42,7 @@ * up polygon offset and flatshading at this point: */ struct brw_clip_prog_key { - GLuint attrs:16; + GLuint attrs:32; GLuint primitive:4; GLuint nr_userclip:3; GLuint do_flat_shading:1; @@ -51,7 +51,7 @@ struct brw_clip_prog_key { GLuint fill_ccw:2; /* includes cull information */ GLuint offset_cw:1; GLuint offset_ccw:1; - GLuint pad0:1; + GLuint pad0:17; GLuint copy_bfc_cw:1; GLuint copy_bfc_ccw:1; |