diff options
| author | Brian Paul <brianp@vmware.com> | 2009-06-16 18:25:52 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-06-16 18:25:52 -0600 |
| commit | 8d482227915552c414e13743652e6794c4313ae2 (patch) | |
| tree | 27bb35b40ec242836320180370d7fd5fa3820f41 /src/mesa/drivers/dri/i965/brw_wm.h | |
| parent | 4ef1f8e3b52a06fcf58f78c9c36738531b91dbac (diff) | |
| parent | 6b917d0b1787280f976c2f0d1ead0e5d7587a3e9 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/main/api_validate.c
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_wm.h')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm.h b/src/mesa/drivers/dri/i965/brw_wm.h index ab0ab8bdbf..ba497432c6 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.h +++ b/src/mesa/drivers/dri/i965/brw_wm.h @@ -66,7 +66,7 @@ struct brw_wm_prog_key { GLuint linear_color:1; /**< linear interpolation vs perspective interp */ GLuint runtime_check_aads_emit:1; - GLuint projtex_mask:16; + GLbitfield proj_attrib_mask; /**< one bit per fragment program attribute */ GLuint shadowtex_mask:16; GLuint yuvtex_mask:16; GLuint yuvtex_swap_mask:16; /* UV swaped */ |