r600g: remove unused CB registers from register lists

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/src/gallium/drivers/r600/evergreen_hw_context.c b/src/gallium/drivers/r600/evergreen_hw_context.c
index fb6fb32..0c5dcba 100644 (file)
--- a/src/gallium/drivers/r600/evergreen_hw_context.c
+++ b/src/gallium/drivers/r600/evergreen_hw_context.c
@@ -128,46 +128,6 @@ static const struct r600_reg evergreen_context_reg_list[] = {
        {R_028B88_PA_SU_POLY_OFFSET_BACK_SCALE, 0, 0},
        {R_028B8C_PA_SU_POLY_OFFSET_BACK_OFFSET, 0, 0},
        {R_028C08_PA_SU_VTX_CNTL, 0, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028C8C_CB_COLOR0_CLEAR_WORD0},
-       {R_028C90_CB_COLOR0_CLEAR_WORD1},
-       {R_028C94_CB_COLOR0_CLEAR_WORD2},
-       {R_028C98_CB_COLOR0_CLEAR_WORD3},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028CC8_CB_COLOR1_CLEAR_WORD0},
-       {R_028CCC_CB_COLOR1_CLEAR_WORD1},
-       {R_028CD0_CB_COLOR1_CLEAR_WORD2},
-       {R_028CD4_CB_COLOR1_CLEAR_WORD3},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028D04_CB_COLOR2_CLEAR_WORD0},
-       {R_028D08_CB_COLOR2_CLEAR_WORD1},
-       {R_028D0C_CB_COLOR2_CLEAR_WORD2},
-       {R_028D10_CB_COLOR2_CLEAR_WORD3},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028D40_CB_COLOR3_CLEAR_WORD0},
-       {R_028D44_CB_COLOR3_CLEAR_WORD1},
-       {R_028D48_CB_COLOR3_CLEAR_WORD2},
-       {R_028D4C_CB_COLOR3_CLEAR_WORD3},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028D7C_CB_COLOR4_CLEAR_WORD0},
-       {R_028D80_CB_COLOR4_CLEAR_WORD1},
-       {R_028D84_CB_COLOR4_CLEAR_WORD2},
-       {R_028D88_CB_COLOR4_CLEAR_WORD3},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028DB8_CB_COLOR5_CLEAR_WORD0},
-       {R_028DBC_CB_COLOR5_CLEAR_WORD1},
-       {R_028DC0_CB_COLOR5_CLEAR_WORD2},
-       {R_028DC4_CB_COLOR5_CLEAR_WORD3},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028DF4_CB_COLOR6_CLEAR_WORD0},
-       {R_028DF8_CB_COLOR6_CLEAR_WORD1},
-       {R_028DFC_CB_COLOR6_CLEAR_WORD2},
-       {R_028E00_CB_COLOR6_CLEAR_WORD3},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028E30_CB_COLOR7_CLEAR_WORD0},
-       {R_028E34_CB_COLOR7_CLEAR_WORD1},
-       {R_028E38_CB_COLOR7_CLEAR_WORD2},
-       {R_028E3C_CB_COLOR7_CLEAR_WORD3},
 };
 
 static const struct r600_reg cayman_context_reg_list[] = {
@@ -274,46 +234,6 @@ static const struct r600_reg cayman_context_reg_list[] = {
        {R_028B88_PA_SU_POLY_OFFSET_BACK_SCALE, 0, 0},
        {R_028B8C_PA_SU_POLY_OFFSET_BACK_OFFSET, 0, 0},
        {CM_R_028BE4_PA_SU_VTX_CNTL, 0, 0},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028C8C_CB_COLOR0_CLEAR_WORD0},
-       {R_028C90_CB_COLOR0_CLEAR_WORD1},
-       {R_028C94_CB_COLOR0_CLEAR_WORD2},
-       {R_028C98_CB_COLOR0_CLEAR_WORD3},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028CC8_CB_COLOR1_CLEAR_WORD0},
-       {R_028CCC_CB_COLOR1_CLEAR_WORD1},
-       {R_028CD0_CB_COLOR1_CLEAR_WORD2},
-       {R_028CD4_CB_COLOR1_CLEAR_WORD3},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028D04_CB_COLOR2_CLEAR_WORD0},
-       {R_028D08_CB_COLOR2_CLEAR_WORD1},
-       {R_028D0C_CB_COLOR2_CLEAR_WORD2},
-       {R_028D10_CB_COLOR2_CLEAR_WORD3},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028D40_CB_COLOR3_CLEAR_WORD0},
-       {R_028D44_CB_COLOR3_CLEAR_WORD1},
-       {R_028D48_CB_COLOR3_CLEAR_WORD2},
-       {R_028D4C_CB_COLOR3_CLEAR_WORD3},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028D7C_CB_COLOR4_CLEAR_WORD0},
-       {R_028D80_CB_COLOR4_CLEAR_WORD1},
-       {R_028D84_CB_COLOR4_CLEAR_WORD2},
-       {R_028D88_CB_COLOR4_CLEAR_WORD3},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028DB8_CB_COLOR5_CLEAR_WORD0},
-       {R_028DBC_CB_COLOR5_CLEAR_WORD1},
-       {R_028DC0_CB_COLOR5_CLEAR_WORD2},
-       {R_028DC4_CB_COLOR5_CLEAR_WORD3},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028DF4_CB_COLOR6_CLEAR_WORD0},
-       {R_028DF8_CB_COLOR6_CLEAR_WORD1},
-       {R_028DFC_CB_COLOR6_CLEAR_WORD2},
-       {R_028E00_CB_COLOR6_CLEAR_WORD3},
-       {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028E30_CB_COLOR7_CLEAR_WORD0},
-       {R_028E34_CB_COLOR7_CLEAR_WORD1},
-       {R_028E38_CB_COLOR7_CLEAR_WORD2},
-       {R_028E3C_CB_COLOR7_CLEAR_WORD3},
 };
 
 static int evergreen_loop_const_init(struct r600_context *ctx, uint32_t offset)

diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c
index c94bd65..f7f8e0e 100644 (file)
--- a/src/gallium/drivers/r600/r600_hw_context.c
+++ b/src/gallium/drivers/r600/r600_hw_context.c
@@ -232,13 +232,6 @@ static const struct r600_reg r600_config_reg_list[] = {
 static const struct r600_reg r600_context_reg_list[] = {
        {R_028A4C_PA_SC_MODE_CNTL, 0, 0},
        {GROUP_FORCE_NEW_BLOCK, 0, 0},
-       {R_028120_CB_CLEAR_RED, 0, 0},
-       {R_028124_CB_CLEAR_GREEN, 0, 0},
-       {R_028128_CB_CLEAR_BLUE, 0, 0},
-       {R_02812C_CB_CLEAR_ALPHA, 0, 0},
-       {R_028424_CB_FOG_RED, 0, 0},
-       {R_028428_CB_FOG_GREEN, 0, 0},
-       {R_02842C_CB_FOG_BLUE, 0, 0},
        {R_028780_CB_BLEND0_CONTROL, REG_FLAG_NOT_R600, 0},
        {R_028784_CB_BLEND1_CONTROL, REG_FLAG_NOT_R600, 0},
        {R_028788_CB_BLEND2_CONTROL, REG_FLAG_NOT_R600, 0},