From: Aapo Tahkola <aet@rasterburn.org>
Date: Fri, 27 Jan 2006 14:03:22 +0000 (+0000)
Subject: enable hw vertex programs by default
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0fcfa1c5b000f239cee1849a17f572ef5098cd31;p=mesa.git

enable hw vertex programs by default
---

diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index 3e18725f04a..31b643383a2 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -68,8 +68,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xmlpool.h"		/* for symbolic values of enum-type options */
 
 /* hw_tcl_on derives from future_hw_tcl_on when its safe to change it. */
-int future_hw_tcl_on=0;
-int hw_tcl_on=0;
+int future_hw_tcl_on=1;
+int hw_tcl_on=1;
 
 #define need_GL_ARB_multisample
 #define need_GL_ARB_texture_compression
diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index 6a7f126b9e6..1fa22f76497 100644
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -847,6 +847,7 @@ static GLboolean r300_run_tcl_render(GLcontext *ctx,
 {
 	r300ContextPtr rmesa = R300_CONTEXT(ctx);
 	struct r300_vertex_program *vp;
+	int i;
    
    	hw_tcl_on=future_hw_tcl_on;
    
@@ -855,6 +856,12 @@ static GLboolean r300_run_tcl_render(GLcontext *ctx,
 	if(hw_tcl_on == GL_FALSE)
 		return GL_TRUE;
 	
+	for (i = 0; i < ctx->Const.MaxTextureUnits; i++)
+		if (ctx->Texture.Unit[i]._ReallyEnabled & TEXTURE_RECT_BIT) {
+			hw_tcl_on = GL_FALSE;
+			return GL_TRUE;
+		}
+	
 	r300UpdateShaders(rmesa);
 
 	vp = (struct r300_vertex_program *)CURRENT_VERTEX_SHADER(ctx);