From e6c8027ccb44de58a51956306dfe93146dcbf526 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Tue, 20 Sep 2011 16:20:32 -0700 Subject: [PATCH] i965: Use 4 bits to store nr_userclip in brw_clip.h. Since the i965 driver supports 8 clipping planes now, we need 4 bits to store the number of user clipping planes, not 3. In theory this isn't strictly necessary, since brw_clip.h is only used on pre-GEN6, and pre-GEN6 only advertises support for 6 clipping planes, but it seems wise to err on the safe side. In the process I removed the pad0 element of struct brw_clip_prog_key--it doesn't seem necessary because the compiler automatically inserts padding if needed. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_clip.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_clip.h b/src/mesa/drivers/dri/i965/brw_clip.h index 8647847c2a1..8fcf14e8efe 100644 --- a/src/mesa/drivers/dri/i965/brw_clip.h +++ b/src/mesa/drivers/dri/i965/brw_clip.h @@ -44,7 +44,7 @@ struct brw_clip_prog_key { GLbitfield64 attrs; GLuint primitive:4; - GLuint nr_userclip:3; + GLuint nr_userclip:4; GLuint do_flat_shading:1; GLuint pv_first:1; GLuint do_unfilled:1; @@ -55,7 +55,6 @@ struct brw_clip_prog_key { GLuint copy_bfc_cw:1; GLuint copy_bfc_ccw:1; GLuint clip_mode:3; - GLuint pad0:11; GLfloat offset_factor; GLfloat offset_units; -- 2.30.2