From 9f456b3a3c9fcbb8d043c246332611afe82258f0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 26 Apr 2018 21:53:33 -0400 Subject: [PATCH] radeonsi: simplify arrays of sample locations MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/radeonsi/si_state_msaa.c | 105 +++++++------------ 1 file changed, 40 insertions(+), 65 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_state_msaa.c b/src/gallium/drivers/radeonsi/si_state_msaa.c index 19bed09df4b..2ad093ad485 100644 --- a/src/gallium/drivers/radeonsi/si_state_msaa.c +++ b/src/gallium/drivers/radeonsi/si_state_msaa.c @@ -26,56 +26,31 @@ /* For MSAA sample positions. */ #define FILL_SREG(s0x, s0y, s1x, s1y, s2x, s2y, s3x, s3y) \ - (((s0x) & 0xf) | (((unsigned)(s0y) & 0xf) << 4) | \ - (((unsigned)(s1x) & 0xf) << 8) | (((unsigned)(s1y) & 0xf) << 12) | \ - (((unsigned)(s2x) & 0xf) << 16) | (((unsigned)(s2y) & 0xf) << 20) | \ + ((((unsigned)(s0x) & 0xf) << 0) | (((unsigned)(s0y) & 0xf) << 4) | \ + (((unsigned)(s1x) & 0xf) << 8) | (((unsigned)(s1y) & 0xf) << 12) | \ + (((unsigned)(s2x) & 0xf) << 16) | (((unsigned)(s2y) & 0xf) << 20) | \ (((unsigned)(s3x) & 0xf) << 24) | (((unsigned)(s3y) & 0xf) << 28)) /* 2xMSAA * There are two locations (4, 4), (-4, -4). */ -static const uint32_t sample_locs_2x[4] = { - FILL_SREG(4, 4, -4, -4, 4, 4, -4, -4), - FILL_SREG(4, 4, -4, -4, 4, 4, -4, -4), - FILL_SREG(4, 4, -4, -4, 4, 4, -4, -4), - FILL_SREG(4, 4, -4, -4, 4, 4, -4, -4), -}; +static const uint32_t sample_locs_2x = + FILL_SREG(4, 4, -4, -4, 0, 0, 0, 0); /* S2 & S3 fields are not used by 2x MSAA */ + /* 4xMSAA * There are 4 locations: (-2, -6), (6, -2), (-6, 2), (2, 6). */ -static const uint32_t sample_locs_4x[4] = { - FILL_SREG(-2, -6, 6, -2, -6, 2, 2, 6), - FILL_SREG(-2, -6, 6, -2, -6, 2, 2, 6), - FILL_SREG(-2, -6, 6, -2, -6, 2, 2, 6), - FILL_SREG(-2, -6, 6, -2, -6, 2, 2, 6), -}; +static const uint32_t sample_locs_4x = + FILL_SREG(-2, -6, 6, -2, -6, 2, 2, 6); /* Cayman 8xMSAA */ static const uint32_t sample_locs_8x[] = { FILL_SREG( 1, -3, -1, 3, 5, 1, -3, -5), - FILL_SREG( 1, -3, -1, 3, 5, 1, -3, -5), - FILL_SREG( 1, -3, -1, 3, 5, 1, -3, -5), - FILL_SREG( 1, -3, -1, 3, 5, 1, -3, -5), - FILL_SREG(-5, 5, -7, -1, 3, 7, 7, -7), - FILL_SREG(-5, 5, -7, -1, 3, 7, 7, -7), - FILL_SREG(-5, 5, -7, -1, 3, 7, 7, -7), FILL_SREG(-5, 5, -7, -1, 3, 7, 7, -7), }; /* Cayman 16xMSAA */ static const uint32_t sample_locs_16x[] = { FILL_SREG( 1, 1, -1, -3, -3, 2, 4, -1), - FILL_SREG( 1, 1, -1, -3, -3, 2, 4, -1), - FILL_SREG( 1, 1, -1, -3, -3, 2, 4, -1), - FILL_SREG( 1, 1, -1, -3, -3, 2, 4, -1), - FILL_SREG(-5, -2, 2, 5, 5, 3, 3, -5), - FILL_SREG(-5, -2, 2, 5, 5, 3, 3, -5), - FILL_SREG(-5, -2, 2, 5, 5, 3, 3, -5), FILL_SREG(-5, -2, 2, 5, 5, 3, 3, -5), FILL_SREG(-2, 6, 0, -7, -4, -6, -6, 4), - FILL_SREG(-2, 6, 0, -7, -4, -6, -6, 4), - FILL_SREG(-2, 6, 0, -7, -4, -6, -6, 4), - FILL_SREG(-2, 6, 0, -7, -4, -6, -6, 4), - FILL_SREG(-8, 0, 7, -4, 6, 7, -7, -8), - FILL_SREG(-8, 0, 7, -4, 6, 7, -7, -8), - FILL_SREG(-8, 0, 7, -4, 6, 7, -7, -8), FILL_SREG(-8, 0, 7, -4, 6, 7, -7, -8), }; @@ -94,21 +69,21 @@ static void si_get_sample_position(struct pipe_context *ctx, unsigned sample_cou break; case 2: offset = 4 * (sample_index * 2); - val.idx = (sample_locs_2x[0] >> offset) & 0xf; + val.idx = (sample_locs_2x >> offset) & 0xf; out_value[0] = (float)(val.idx + 8) / 16.0f; - val.idx = (sample_locs_2x[0] >> (offset + 4)) & 0xf; + val.idx = (sample_locs_2x >> (offset + 4)) & 0xf; out_value[1] = (float)(val.idx + 8) / 16.0f; break; case 4: offset = 4 * (sample_index * 2); - val.idx = (sample_locs_4x[0] >> offset) & 0xf; + val.idx = (sample_locs_4x >> offset) & 0xf; out_value[0] = (float)(val.idx + 8) / 16.0f; - val.idx = (sample_locs_4x[0] >> (offset + 4)) & 0xf; + val.idx = (sample_locs_4x >> (offset + 4)) & 0xf; out_value[1] = (float)(val.idx + 8) / 16.0f; break; case 8: offset = 4 * (sample_index % 4 * 2); - index = (sample_index / 4) * 4; + index = sample_index / 4; val.idx = (sample_locs_8x[index] >> offset) & 0xf; out_value[0] = (float)(val.idx + 8) / 16.0f; val.idx = (sample_locs_8x[index] >> (offset + 4)) & 0xf; @@ -116,7 +91,7 @@ static void si_get_sample_position(struct pipe_context *ctx, unsigned sample_cou break; case 16: offset = 4 * (sample_index % 4 * 2); - index = (sample_index / 4) * 4; + index = sample_index / 4; val.idx = (sample_locs_16x[index] >> offset) & 0xf; out_value[0] = (float)(val.idx + 8) / 16.0f; val.idx = (sample_locs_16x[index] >> (offset + 4)) & 0xf; @@ -136,52 +111,52 @@ void si_emit_sample_locations(struct radeon_winsys_cs *cs, int nr_samples) radeon_set_context_reg(cs, R_028C28_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y1_0, 0); break; case 2: - radeon_set_context_reg(cs, R_028BF8_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y0_0, sample_locs_2x[0]); - radeon_set_context_reg(cs, R_028C08_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y0_0, sample_locs_2x[1]); - radeon_set_context_reg(cs, R_028C18_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y1_0, sample_locs_2x[2]); - radeon_set_context_reg(cs, R_028C28_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y1_0, sample_locs_2x[3]); + radeon_set_context_reg(cs, R_028BF8_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y0_0, sample_locs_2x); + radeon_set_context_reg(cs, R_028C08_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y0_0, sample_locs_2x); + radeon_set_context_reg(cs, R_028C18_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y1_0, sample_locs_2x); + radeon_set_context_reg(cs, R_028C28_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y1_0, sample_locs_2x); break; case 4: - radeon_set_context_reg(cs, R_028BF8_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y0_0, sample_locs_4x[0]); - radeon_set_context_reg(cs, R_028C08_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y0_0, sample_locs_4x[1]); - radeon_set_context_reg(cs, R_028C18_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y1_0, sample_locs_4x[2]); - radeon_set_context_reg(cs, R_028C28_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y1_0, sample_locs_4x[3]); + radeon_set_context_reg(cs, R_028BF8_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y0_0, sample_locs_4x); + radeon_set_context_reg(cs, R_028C08_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y0_0, sample_locs_4x); + radeon_set_context_reg(cs, R_028C18_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y1_0, sample_locs_4x); + radeon_set_context_reg(cs, R_028C28_PA_SC_AA_SAMPLE_LOCS_PIXEL_X1Y1_0, sample_locs_4x); break; case 8: radeon_set_context_reg_seq(cs, R_028BF8_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y0_0, 14); radeon_emit(cs, sample_locs_8x[0]); - radeon_emit(cs, sample_locs_8x[4]); + radeon_emit(cs, sample_locs_8x[1]); radeon_emit(cs, 0); radeon_emit(cs, 0); + radeon_emit(cs, sample_locs_8x[0]); radeon_emit(cs, sample_locs_8x[1]); - radeon_emit(cs, sample_locs_8x[5]); radeon_emit(cs, 0); radeon_emit(cs, 0); - radeon_emit(cs, sample_locs_8x[2]); - radeon_emit(cs, sample_locs_8x[6]); + radeon_emit(cs, sample_locs_8x[0]); + radeon_emit(cs, sample_locs_8x[1]); radeon_emit(cs, 0); radeon_emit(cs, 0); - radeon_emit(cs, sample_locs_8x[3]); - radeon_emit(cs, sample_locs_8x[7]); + radeon_emit(cs, sample_locs_8x[0]); + radeon_emit(cs, sample_locs_8x[1]); break; case 16: radeon_set_context_reg_seq(cs, R_028BF8_PA_SC_AA_SAMPLE_LOCS_PIXEL_X0Y0_0, 16); radeon_emit(cs, sample_locs_16x[0]); - radeon_emit(cs, sample_locs_16x[4]); - radeon_emit(cs, sample_locs_16x[8]); - radeon_emit(cs, sample_locs_16x[12]); radeon_emit(cs, sample_locs_16x[1]); - radeon_emit(cs, sample_locs_16x[5]); - radeon_emit(cs, sample_locs_16x[9]); - radeon_emit(cs, sample_locs_16x[13]); radeon_emit(cs, sample_locs_16x[2]); - radeon_emit(cs, sample_locs_16x[6]); - radeon_emit(cs, sample_locs_16x[10]); - radeon_emit(cs, sample_locs_16x[14]); radeon_emit(cs, sample_locs_16x[3]); - radeon_emit(cs, sample_locs_16x[7]); - radeon_emit(cs, sample_locs_16x[11]); - radeon_emit(cs, sample_locs_16x[15]); + radeon_emit(cs, sample_locs_16x[0]); + radeon_emit(cs, sample_locs_16x[1]); + radeon_emit(cs, sample_locs_16x[2]); + radeon_emit(cs, sample_locs_16x[3]); + radeon_emit(cs, sample_locs_16x[0]); + radeon_emit(cs, sample_locs_16x[1]); + radeon_emit(cs, sample_locs_16x[2]); + radeon_emit(cs, sample_locs_16x[3]); + radeon_emit(cs, sample_locs_16x[0]); + radeon_emit(cs, sample_locs_16x[1]); + radeon_emit(cs, sample_locs_16x[2]); + radeon_emit(cs, sample_locs_16x[3]); break; } } -- 2.30.2