Mesa (master): r600: rv670 support 8 tex instructions just like other r6xx

[Alex Deucher]

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

Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Jan 27 12:16:50 2010 -0500

r600: rv670 support 8 tex instructions just like other r6xx

also clarify some other const values.

---

 src/mesa/drivers/dri/r600/r600_context.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/r600/r600_context.c b/src/mesa/drivers/dri/r600/r600_context.c
index 2ac0e7c..922291a 100644
--- a/src/mesa/drivers/dri/r600/r600_context.c
+++ b/src/mesa/drivers/dri/r600/r600_context.c
@@ -249,6 +249,9 @@ static void r600InitConstValues(GLcontext *ctx, radeonScreenPtr screen)
 	context_t *r600 = R700_CONTEXT(ctx);
 
 	ctx->Const.MaxTextureImageUnits = 16;
+	/* 8 per clause on r6xx, 16 on r7xx
+	 * but I think mesa only supports 8 at the moment
+	 */
 	ctx->Const.MaxTextureCoordUnits = 8;
 	ctx->Const.MaxTextureUnits =
 	    MIN2(ctx->Const.MaxTextureImageUnits,
@@ -284,9 +287,8 @@ static void r600InitConstValues(GLcontext *ctx, radeonScreenPtr screen)
 	ctx->Const.FragmentProgram.MaxNativeAttribs = 32;
 	ctx->Const.FragmentProgram.MaxNativeParameters = 256;
 	ctx->Const.FragmentProgram.MaxNativeAluInstructions = 8192;
-	/* 8 per clause on r6xx, 16 on rv670/r7xx */
-	if ((screen->chip_family == CHIP_FAMILY_RV670) ||
-	    (screen->chip_family >= CHIP_FAMILY_RV770))
+	/* 8 per clause on r6xx, 16 on r7xx */
+	if (screen->chip_family >= CHIP_FAMILY_RV770)
 		ctx->Const.FragmentProgram.MaxNativeTexInstructions = 16;
 	else
 		ctx->Const.FragmentProgram.MaxNativeTexInstructions = 8;