Mesa (r6xx-rewrite): R6xx: select proper shader format

Alex Deucher agd5f at kemper.freedesktop.org
Tue May 26 17:05:19 UTC 2009


Module: Mesa
Branch: r6xx-rewrite
Commit: 930b42693eb2e875d2447897dd1379d7bd273a95
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=930b42693eb2e875d2447897dd1379d7bd273a95

Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue May 26 11:36:55 2009 -0400

R6xx: select proper shader format

---

 src/mesa/drivers/dri/r600/r700_render.c   |    2 +-
 src/mesa/drivers/dri/r600/r700_vertprog.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/r600/r700_render.c b/src/mesa/drivers/dri/r600/r700_render.c
index 3d7eec3..464023e 100644
--- a/src/mesa/drivers/dri/r600/r700_render.c
+++ b/src/mesa/drivers/dri/r600/r700_render.c
@@ -250,7 +250,7 @@ static GLboolean r700RunRender(GLcontext * ctx,
 
     struct r700_fragment_program *fp = (struct r700_fragment_program *)
 	                                   (ctx->FragmentProgram._Current);
-    if (context->radeon.radeonScreen->chip_family <= CHIP_FAMILY_RV670)
+    if (context->radeon.radeonScreen->chip_family < CHIP_FAMILY_RV770)
     {
         fp->r700AsmCode.bR6xx = 1;
     }
diff --git a/src/mesa/drivers/dri/r600/r700_vertprog.c b/src/mesa/drivers/dri/r600/r700_vertprog.c
index 4d113e2..9325553 100644
--- a/src/mesa/drivers/dri/r600/r700_vertprog.c
+++ b/src/mesa/drivers/dri/r600/r700_vertprog.c
@@ -297,7 +297,7 @@ void r700SelectVertexShader(GLcontext *ctx)
     context_t *context = R700_CONTEXT(ctx);
     struct r700_vertex_program *vpc
              = (struct r700_vertex_program *)ctx->VertexProgram._Current;
-    if (context->radeon.radeonScreen->chip_family <= CHIP_FAMILY_RV670)
+    if (context->radeon.radeonScreen->chip_family < CHIP_FAMILY_RV770)
     {
         vpc->r700AsmCode.bR6xx = 1;
     }




More information about the mesa-commit mailing list