Mesa (master): r600g: fix evergreen draw-buffers

Dave Airlie airlied at kemper.freedesktop.org
Fri Oct 1 04:25:12 UTC 2010


Module: Mesa
Branch: master
Commit: b67aa5311fa5d4130cf150c9004946fb30a15fae
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b67aa5311fa5d4130cf150c9004946fb30a15fae

Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Oct  1 14:24:14 2010 +1000

r600g: fix evergreen draw-buffers

just a typo in the register headers.

---

 src/gallium/drivers/r600/evergreend.h              |    2 +-
 src/gallium/winsys/r600/drm/evergreen_hw_context.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r600/evergreend.h b/src/gallium/drivers/r600/evergreend.h
index 3cb9e63..e265348 100644
--- a/src/gallium/drivers/r600/evergreend.h
+++ b/src/gallium/drivers/r600/evergreend.h
@@ -1740,7 +1740,7 @@
 #define R_028CA8_CB_COLOR1_VIEW                      0x00028CA8
 #define R_028CAC_CB_COLOR1_INFO                      0x00028CAC
 #define R_028CB0_CB_COLOR1_ATTRIB                    0x00028CB0
-#define R_028CB8_CB_COLOR1_DIM                       0x00028CB8
+#define R_028CB4_CB_COLOR1_DIM                       0x00028CB4
 #define R_028CD8_CB_COLOR2_BASE                      0x00028CD8
 #define R_028CDC_CB_COLOR2_PITCH                     0x00028CDC
 #define R_028CE0_CB_COLOR2_SLICE                     0x00028CE0
diff --git a/src/gallium/winsys/r600/drm/evergreen_hw_context.c b/src/gallium/winsys/r600/drm/evergreen_hw_context.c
index 88db69c..557751e 100644
--- a/src/gallium/winsys/r600/drm/evergreen_hw_context.c
+++ b/src/gallium/winsys/r600/drm/evergreen_hw_context.c
@@ -342,7 +342,7 @@ static const struct r600_reg evergreen_context_reg_list[] = {
 	{PKT3_SET_CONTEXT_REG, EVERGREEN_CONTEXT_REG_OFFSET, R_028CA8_CB_COLOR1_VIEW, 0, 0},
 	{PKT3_SET_CONTEXT_REG, EVERGREEN_CONTEXT_REG_OFFSET, R_028CAC_CB_COLOR1_INFO, 1, 0},
 	{PKT3_SET_CONTEXT_REG, EVERGREEN_CONTEXT_REG_OFFSET, R_028CB0_CB_COLOR1_ATTRIB, 1, 0},
-	{PKT3_SET_CONTEXT_REG, EVERGREEN_CONTEXT_REG_OFFSET, R_028CB8_CB_COLOR1_DIM, 0, 0},
+	{PKT3_SET_CONTEXT_REG, EVERGREEN_CONTEXT_REG_OFFSET, R_028CB4_CB_COLOR1_DIM, 0, 0},
 	{PKT3_SET_CONTEXT_REG, EVERGREEN_CONTEXT_REG_OFFSET, GROUP_FORCE_NEW_BLOCK, 0, 0},
 	{PKT3_SET_CONTEXT_REG, EVERGREEN_CONTEXT_REG_OFFSET, R_028CD8_CB_COLOR2_BASE, 1, 0},
 	{PKT3_SET_CONTEXT_REG, EVERGREEN_CONTEXT_REG_OFFSET, R_028CDC_CB_COLOR2_PITCH, 0, 0},




More information about the mesa-commit mailing list