diff options
| author | Kenneth Graunke <[email protected]> | 2014-02-09 16:34:22 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2014-02-10 08:18:29 -0800 |
| commit | f4bc0ac83eee968b7a0f18fa8e1ecdc1ba2ddf9e (patch) | |
| tree | fc8a683094549bd4775146e27e08c4338eb22e0e | |
| parent | 16f7510ad30070b7bd4eff494f7937f6ee257547 (diff) | |
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 <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Chris Forbes <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_multisample_state.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen6_multisample_state.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen8_multisample_state.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_multisample_state.h b/src/mesa/drivers/dri/i965/brw_multisample_state.h index 79566f0bb23..2e0250004da 100644 --- a/src/mesa/drivers/dri/i965/brw_multisample_state.h +++ b/src/mesa/drivers/dri/i965/brw_multisample_state.h @@ -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. diff --git a/src/mesa/drivers/dri/i965/gen6_multisample_state.c b/src/mesa/drivers/dri/i965/gen6_multisample_state.c index fd3dd0e5363..cdc9ef8f075 100644 --- a/src/mesa/drivers/dri/i965/gen6_multisample_state.c +++ b/src/mesa/drivers/dri/i965/gen6_multisample_state.c @@ -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; diff --git a/src/mesa/drivers/dri/i965/gen8_multisample_state.c b/src/mesa/drivers/dri/i965/gen8_multisample_state.c index ad273e4d424..e137efe0d30 100644 --- a/src/mesa/drivers/dri/i965/gen8_multisample_state.c +++ b/src/mesa/drivers/dri/i965/gen8_multisample_state.c @@ -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. |