diff options
| author | Eric Anholt <eric@anholt.net> | 2009-11-18 03:05:14 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-11-19 11:47:21 +0100 |
| commit | 15fa484f514726a29bbf24df33c0551844f878d0 (patch) | |
| tree | 7ab97af3625cccdc2720a7351ad5d39bae4a5477 | |
| parent | 92d35b91f132deda1fb27d2071a50e8187301fe5 (diff) | |
mesa: Remove gratuitous padding in prog_dst_register.
The padding was there to indicate the amount of space left from the
number of expected bytes in the struct minus allocated bits. But
uint bitfields get packed so that they don't cross uint boundaries, and we
ended up allocating an extra dword to hold the pad field!
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_fp.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/ffvertex_prog.c | 1 | ||||
| -rw-r--r-- | src/mesa/shader/prog_instruction.h | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm_fp.c b/src/mesa/drivers/dri/i965/brw_wm_fp.c index 7d031795883..3737faf26fb 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_fp.c +++ b/src/mesa/drivers/dri/i965/brw_wm_fp.c @@ -138,7 +138,6 @@ static struct prog_dst_register dst_reg(GLuint file, GLuint idx) reg.CondMask = COND_TR; reg.CondSwizzle = 0; reg.CondSrc = 0; - reg.pad = 0; return reg; } diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c index fe2416d8946..5cfa898031e 100644 --- a/src/mesa/main/ffvertex_prog.c +++ b/src/mesa/main/ffvertex_prog.c @@ -523,7 +523,6 @@ static void emit_dst( struct prog_dst_register *dst, dst->CondMask = COND_TR; /* always pass cond test */ dst->CondSwizzle = SWIZZLE_NOOP; dst->CondSrc = 0; - dst->pad = 0; /* Check that bitfield sizes aren't exceeded */ ASSERT(dst->Index == reg.idx); } diff --git a/src/mesa/shader/prog_instruction.h b/src/mesa/shader/prog_instruction.h index 1c687bc16cf..224350caac6 100644 --- a/src/mesa/shader/prog_instruction.h +++ b/src/mesa/shader/prog_instruction.h @@ -312,7 +312,6 @@ struct prog_dst_register */ GLuint CondSrc:1; /*@}*/ - GLuint pad:28; }; |