From: Aapo Tahkola <aet@rasterburn.org>
Date: Wed, 2 Nov 2005 14:12:52 +0000 (+0000)
Subject: Use ctx->VertexProgram._Current .
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eda460035e3733b42280905ce162c9b003120e1b;p=mesa.git

Use ctx->VertexProgram._Current .
---

diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index 2ceee563d16..c35fd1e634b 100644
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -580,7 +580,7 @@ struct r300_vertex_shader_state {
 	
 extern int hw_tcl_on;
 
-#define CURRENT_VERTEX_SHADER(ctx) (ctx->VertexProgram._Enabled ? ctx->VertexProgram.Current : ctx->_TnlProgram)
+#define CURRENT_VERTEX_SHADER(ctx) (ctx->VertexProgram._Current)
 
 //#define TMU_ENABLED(ctx, unit) (hw_tcl_on ? ctx->Texture.Unit[unit]._ReallyEnabled && (OutputsWritten & (1<<(VERT_RESULT_TEX0+(unit)))) : 
 //	(r300->state.render_inputs & (_TNL_BIT_TEX0<<(unit))))