OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore the UseTexEnvProgram logic.

Browse Source 
Was removed during glsl-compiler work.  Still need to go back and revisit this
because of the interaction with fragment shaders...
This commit is contained in:
Brian
2007-03-27 09:51:52 -06:00
parent 3b8ab88131
commit 3e45db6729
11 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mesa/main/state.c
View File

@@ -964,6 +964,9 @@ update_program(GLcontext *ctx)
if (shProg && shProg->LinkStatus) {
/* Use shader programs */
/* XXX this isn't quite right, since we may have either a vertex
* _or_ fragment shader (not always both).
*/
ctx->VertexProgram._Current = shProg->VertexProgram;
ctx->FragmentProgram._Current = shProg->FragmentProgram;
}
@@ -1000,6 +1003,13 @@ update_program(GLcontext *ctx)
ctx->FragmentProgram._Current = NULL;
}
}
ctx->FragmentProgram._Active = ctx->FragmentProgram._Enabled;
if (ctx->FragmentProgram._MaintainTexEnvProgram &&
!ctx->FragmentProgram._Enabled) {
if (ctx->FragmentProgram._UseTexEnvProgram)
ctx->FragmentProgram._Active = GL_TRUE;
}
}