[Mesa-dev] [PATCH 3/6] r600g: implement ARB_seamless_cube_map for r600-r700

[Marek Olšák]

---
 src/gallium/drivers/r600/r600_state.c |    9 +++++++--
 src/gallium/drivers/r600/r600d.h      |    3 +++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_state.c 
b/src/gallium/drivers/r600/r600_state.c
index 1c27f88..6a7a658 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -357,6 +357,13 @@ static void *r600_create_rs_state(struct pipe_context *ctx,
        r600_pipe_state_add_reg(rstate, R_028C18_PA_CL_GB_HORZ_DISC_ADJ, 
0x3F800000, 0xFFFFFFFF, NULL);
        r600_pipe_state_add_reg(rstate, R_028DFC_PA_SU_POLY_OFFSET_CLAMP, 
0x00000000, 0xFFFFFFFF, NULL);
        r600_pipe_state_add_reg(rstate, R_02820C_PA_SC_CLIPRECT_RULE, 
clip_rule, 0xFFFFFFFF, NULL);
+       r600_pipe_state_add_reg(rstate, R_009508_TA_CNTL_AUX,
+                               (state->seamless_cube_map ? 0 : 
S_009508_DISABLE_CUBE_WRAP(1)) |
+                               S_009508_Reserved(1) |
+                               S_009508_SYNC_GRADIENT(1) |
+                               S_009508_SYNC_WALKER(1) |
+                               S_009508_SYNC_ALIGNER(1),
+                               0xFFFFFFFF, NULL);
 
        return rstate;
 }
@@ -1199,14 +1206,12 @@ void r600_init_config(struct r600_pipe_context *rctx)
 
        if (family >= CHIP_RV770) {
                r600_pipe_state_add_reg(rstate, 
R_008D8C_SQ_DYN_GPR_CNTL_PS_FLUSH_REQ, 0x00004000, 0xFFFFFFFF, NULL);
-               r600_pipe_state_add_reg(rstate, R_009508_TA_CNTL_AUX, 
0x07000002, 0xFFFFFFFF, NULL);
                r600_pipe_state_add_reg(rstate, R_009830_DB_DEBUG, 0x00000000, 
0xFFFFFFFF, NULL);
                r600_pipe_state_add_reg(rstate, R_009838_DB_WATERMARKS, 
0x00420204, 0xFFFFFFFF, NULL);
                r600_pipe_state_add_reg(rstate, R_0286C8_SPI_THREAD_GROUPING, 
0x00000000, 0xFFFFFFFF, NULL);
                r600_pipe_state_add_reg(rstate, R_028A4C_PA_SC_MODE_CNTL, 
0x00514002, 0xFFFFFFFF, NULL);
        } else {
                r600_pipe_state_add_reg(rstate, 
R_008D8C_SQ_DYN_GPR_CNTL_PS_FLUSH_REQ, 0x00000000, 0xFFFFFFFF, NULL);
-               r600_pipe_state_add_reg(rstate, R_009508_TA_CNTL_AUX, 
0x07000003, 0xFFFFFFFF, NULL);
                r600_pipe_state_add_reg(rstate, R_009830_DB_DEBUG, 0x82000000, 
0xFFFFFFFF, NULL);
                r600_pipe_state_add_reg(rstate, R_009838_DB_WATERMARKS, 
0x01020204, 0xFFFFFFFF, NULL);
                r600_pipe_state_add_reg(rstate, R_0286C8_SPI_THREAD_GROUPING, 
0x00000001, 0xFFFFFFFF, NULL);
diff --git a/src/gallium/drivers/r600/r600d.h b/src/gallium/drivers/r600/r600d.h
index 8296b52..c1ff722 100644
--- a/src/gallium/drivers/r600/r600d.h
+++ b/src/gallium/drivers/r600/r600d.h
@@ -2547,6 +2547,9 @@
 #define   S_009508_DISABLE_CUBE_WRAP(x)                (((x) & 0x1) << 0)
 #define   G_009508_DISABLE_CUBE_WRAP(x)                (((x) >> 0) & 0x1)
 #define   C_009508_DISABLE_CUBE_WRAP                   0xFFFFFFFE
+#define   S_009508_Reserved(x)                        (((x) & 0x1) << 1)
+#define   G_009508_Reserved(x)                        (((x) >> 1) & 0x1)
+#define   C_009508_Reserved                           (~(1 << 1))
 #define   S_009508_SYNC_GRADIENT(x)                    (((x) & 0x1) << 24)
 #define   G_009508_SYNC_GRADIENT(x)                    (((x) >> 24) & 0x1)
 #define   C_009508_SYNC_GRADIENT                       0xFEFFFFFF
-- 
1.7.4.1

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev