From 3e45db67294faaf0a06c42bdd6dbdb96f87c8801 Mon Sep 17 00:00:00 2001 From: Brian Date: Tue, 27 Mar 2007 09:51:52 -0600 Subject: Restore the UseTexEnvProgram logic. Was removed during glsl-compiler work. Still need to go back and revisit this because of the interaction with fragment shaders... --- src/mesa/swrast/s_aalinetemp.h | 2 +- src/mesa/swrast/s_pointtemp.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mesa/swrast') diff --git a/src/mesa/swrast/s_aalinetemp.h b/src/mesa/swrast/s_aalinetemp.h index 4d33b7dff7..dd741630a1 100644 --- a/src/mesa/swrast/s_aalinetemp.h +++ b/src/mesa/swrast/s_aalinetemp.h @@ -87,7 +87,7 @@ NAME(plot)(GLcontext *ctx, struct LineInfo *line, int ix, int iy) if (swrast->_FragmentAttribs & (1 << attr)) { GLfloat (*attribArray)[4] = line->span.array->attribs[attr]; GLfloat invQ; - if (ctx->FragmentProgram._Current) { + if (ctx->FragmentProgram._Active) { invQ = 1.0F; } else { diff --git a/src/mesa/swrast/s_pointtemp.h b/src/mesa/swrast/s_pointtemp.h index cc6f999b91..1956eeba50 100644 --- a/src/mesa/swrast/s_pointtemp.h +++ b/src/mesa/swrast/s_pointtemp.h @@ -121,7 +121,7 @@ NAME ( GLcontext *ctx, const SWvertex *vert ) #endif #if FLAGS & TEXTURE span->arrayMask |= (SPAN_TEXTURE | SPAN_LAMBDA); - if (ctx->FragmentProgram._Current) { + if (ctx->FragmentProgram._Active) { /* Don't divide texture s,t,r by q (use TXP to do that) */ for (attr = swrast->_MinFragmentAttrib; attr < swrast->_MaxFragmentAttrib; attr++) { if (swrast->_FragmentAttribs & (1 << attr)) { -- cgit v1.2.3