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

mesa: fix generation of fixed function state when no vp exists

Browse Source
This commit is contained in:
Alan Hourihane
2008-11-13 13:16:03 +00:00
parent c30eb2c104
commit e4c9aeed8b
1 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -206,18 +206,12 @@ update_program(GLcontext *ctx)
_mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL);
if (shProg && shProg->LinkStatus) {
if (shProg && shProg->LinkStatus && shProg->FragmentProgram) {
/* Use shader programs */
/* XXX this isn't quite right, since we may have either a vertex
* _or_ fragment shader (not always both).
*/
_mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,
shProg->VertexProgram);
_mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
shProg->FragmentProgram);
}
else {
if (ctx->FragmentProgram._Enabled) {
else if (ctx->FragmentProgram._Enabled) {
/* use user-defined vertex program */
_mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
ctx->FragmentProgram.Current);
@@ -239,7 +233,12 @@ update_program(GLcontext *ctx)
* _mesa_get_fixed_func_vertex_program() needs to know active
* fragprog inputs.
*/
if (ctx->VertexProgram._Enabled) {
if (shProg && shProg->LinkStatus && shProg->VertexProgram) {
/* Use shader programs */
_mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,
shProg->VertexProgram);
}
else if (ctx->VertexProgram._Enabled) {
/* use user-defined vertex program */
_mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current,
ctx->VertexProgram.Current);
@@ -256,7 +255,6 @@ update_program(GLcontext *ctx)
/* no vertex program */
_mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current, NULL);
}
}
/* XXX: get rid of _Active flag.
*/