Mesa (master): r300: Cleanup reported native program limits

Nicolai Hähnle nh at kemper.freedesktop.org
Thu Aug 27 16:20:29 UTC 2009


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

Author: Nicolai Hähnle <nhaehnle at gmail.com>
Date:   Thu Aug 27 17:51:12 2009 +0200

r300: Cleanup reported native program limits

The fragment program native limits are actually higher on R4xx
as reported by Alex Deucher, but using those requires some
bit-twiddling changes to program handling.

Signed-off-by: Nicolai Hähnle <nhaehnle at gmail.com>

---

 src/mesa/drivers/dri/r300/r300_context.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index 0bf002c..2ea1b82 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -363,13 +363,10 @@ static void r300InitConstValues(GLcontext *ctx, radeonScreenPtr screen)
 
 	/* currently bogus data */
 	if (r300->options.hw_tcl_enabled) {
-		ctx->Const.VertexProgram.MaxInstructions = VSF_MAX_FRAGMENT_LENGTH / 4;
-		ctx->Const.VertexProgram.MaxNativeInstructions =
-		  VSF_MAX_FRAGMENT_LENGTH / 4;
+		ctx->Const.VertexProgram.MaxNativeInstructions = VSF_MAX_FRAGMENT_LENGTH / 4;
+		ctx->Const.VertexProgram.MaxNativeAluInstructions = VSF_MAX_FRAGMENT_LENGTH / 4;
 		ctx->Const.VertexProgram.MaxNativeAttribs = 16;	/* r420 */
-		ctx->Const.VertexProgram.MaxTemps = 32;
-		ctx->Const.VertexProgram.MaxNativeTemps =
-		  /*VSF_MAX_FRAGMENT_TEMPS */ 32;
+		ctx->Const.VertexProgram.MaxNativeTemps = 32;
 		ctx->Const.VertexProgram.MaxNativeParameters = 256;	/* r420 */
 		ctx->Const.VertexProgram.MaxNativeAddressRegs = 1;
 	}




More information about the mesa-commit mailing list