i965: Store 4x MSAA sample positions in a scalar value, not an array.

Storing a single value in an array is rather pointless.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
This commit is contained in:
Kenneth Graunke 2014-02-09 16:34:22 -08:00
parent 16f7510ad3
commit f4bc0ac83e
3 changed files with 4 additions and 4 deletions

View file

@ -32,7 +32,7 @@
* e 3
*/
static const uint32_t
brw_multisample_positions_4x[] = { 0xae2ae662 };
brw_multisample_positions_4x = 0xae2ae662;
/**
* Sample positions are based on a solution to the "8 queens" puzzle.

View file

@ -39,7 +39,7 @@ gen6_get_sample_position(struct gl_context *ctx,
result[0] = result[1] = 0.5f;
return;
case 4:
bits = brw_multisample_positions_4x[0] >> (8 * index);
bits = brw_multisample_positions_4x >> (8 * index);
break;
case 8:
bits = brw_multisample_positions_8x[index >> 2] >> (8 * (index & 3));
@ -74,7 +74,7 @@ gen6_emit_3dstate_multisample(struct brw_context *brw,
break;
case 4:
number_of_multisamples = MS_NUMSAMPLES_4;
sample_positions_3210 = brw_multisample_positions_4x[0];
sample_positions_3210 = brw_multisample_positions_4x;
break;
case 8:
number_of_multisamples = MS_NUMSAMPLES_8;

View file

@ -85,7 +85,7 @@ gen8_emit_3dstate_sample_pattern(struct brw_context *brw)
OUT_BATCH(brw_multisample_positions_8x[0]); /* sample positions 3210 */
/* 4x MSAA */
OUT_BATCH(brw_multisample_positions_4x[0]);
OUT_BATCH(brw_multisample_positions_4x);
/* 2x and 1x MSAA patterns
* XXX: need to program 2x.