diff options
| author | Brian <brian@nostromo.localnet.net> | 2007-03-27 09:51:52 -0600 |
|---|---|---|
| committer | Brian <brian@nostromo.localnet.net> | 2007-03-27 09:51:52 -0600 |
| commit | 3e45db67294faaf0a06c42bdd6dbdb96f87c8801 (patch) | |
| tree | b8dc873e8449e4f53e0acab6d410f8ad0b60e68c /src/mesa/swrast | |
| parent | 3b8ab881312f36a948913653ed3c471017f811f0 (diff) | |
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...
Diffstat (limited to 'src/mesa/swrast')
| -rw-r--r-- | src/mesa/swrast/s_aalinetemp.h | 2 | ||||
| -rw-r--r-- | src/mesa/swrast/s_pointtemp.h | 2 |
2 files changed, 2 insertions, 2 deletions
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)) { |