From: Aapo Tahkola <aet@rasterburn.org>
Date: Fri, 27 Jan 2006 12:23:26 +0000 (+0000)
Subject: Work around problems with t_vp_build.c
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e804370014cbf362de063a56aef0b78f4412b200;p=mesa.git

Work around problems with t_vp_build.c
---

diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index 0478f862242..3e18725f04a 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -122,7 +122,7 @@ const struct dri_extension card_extensions[] = {
 };
 
 extern struct tnl_pipeline_stage _r300_render_stage;
-extern struct tnl_pipeline_stage _r300_tcl_stage;
+extern const struct tnl_pipeline_stage _r300_tcl_stage;
 extern const struct tnl_pipeline_stage _r300_texrect_stage;
 
 static const struct tnl_pipeline_stage *r300_pipeline[] = {
@@ -308,7 +308,8 @@ GLboolean r300CreateContext(const __GLcontextModes * glVisual,
 	/* currently bogus data */
 	ctx->Const.VertexProgram.MaxNativeInstructions=VSF_MAX_FRAGMENT_LENGTH;
 	ctx->Const.VertexProgram.MaxNativeAttribs=16; /* r420 */
-	ctx->Const.VertexProgram.MaxNativeTemps=VSF_MAX_FRAGMENT_TEMPS;
+	ctx->Const.VertexProgram.MaxTemps=32;
+	ctx->Const.VertexProgram.MaxNativeTemps=/*VSF_MAX_FRAGMENT_TEMPS*/32;
 	ctx->Const.VertexProgram.MaxNativeParameters=256; /* r420 */
 	ctx->Const.VertexProgram.MaxNativeAddressRegs=1;