Mesa (master): r600c: fix some typos

Alex Deucher agd5f at kemper.freedesktop.org
Fri Sep 10 17:03:11 UTC 2010


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

Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Sep  9 21:16:55 2010 -0400

r600c: fix some typos

---

 src/mesa/drivers/dri/r600/evergreen_chip.c |    2 +-
 src/mesa/drivers/dri/r600/r600_blit.c      |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/r600/evergreen_chip.c b/src/mesa/drivers/dri/r600/evergreen_chip.c
index d58746d..e244213 100644
--- a/src/mesa/drivers/dri/r600/evergreen_chip.c
+++ b/src/mesa/drivers/dri/r600/evergreen_chip.c
@@ -118,7 +118,7 @@ static void evergreenSendTexState(GLcontext *ctx, struct radeon_state_atom *atom
 
                     if( (1<<i) & vp->r700AsmCode.unVetTexBits )                    
                     {   /* vs texture */                                     
-                        R600_OUT_BATCH((i + VERT_ATTRIB_MAX + EG_SQ_FETCH_RESOURCE_VS_OFFSET) * FETCH_RESOURCE_STRIDE);
+                        R600_OUT_BATCH((i + VERT_ATTRIB_MAX + EG_SQ_FETCH_RESOURCE_VS_OFFSET) * EG_FETCH_RESOURCE_STRIDE);
                     }
                     else
                     {
diff --git a/src/mesa/drivers/dri/r600/r600_blit.c b/src/mesa/drivers/dri/r600/r600_blit.c
index b98fd4b..3090c9f 100644
--- a/src/mesa/drivers/dri/r600/r600_blit.c
+++ b/src/mesa/drivers/dri/r600/r600_blit.c
@@ -554,9 +554,9 @@ set_vtx_resource(context_t *context)
     R600_OUT_BATCH(0);
     R600_OUT_BATCH(0);
     R600_OUT_BATCH(SQ_TEX_VTX_VALID_BUFFER << SQ_TEX_RESOURCE_WORD6_0__TYPE_shift);
-    R600_OUT_BATCH_RELOC(SQ_VTX_CONSTANT_WORD0_0,
+    R600_OUT_BATCH_RELOC(0,
                          bo,
-                         SQ_VTX_CONSTANT_WORD0_0,
+                         0,
                          RADEON_GEM_DOMAIN_GTT, 0, 0);
     END_BATCH();
     COMMIT_BATCH();




More information about the mesa-commit mailing list