KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only vertex program fix, bypass tnl vertex program

This commit is contained in:
Zou Nan hai 2007-10-08 15:34:03 +08:00
parent 3d6c410990
commit ac985708f4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_context.c
View File

@ -79,7 +79,7 @@ static void brwUseProgram(GLcontext *ctx, GLuint program)
brw->attribs.FragmentProgram->Current = sh_prog->FragmentProgram;
ctx->FragmentProgram.Enabled = GL_TRUE;
} else
ctx->VertexProgram.Enabled = GL_FALSE;
ctx->FragmentProgram.Enabled = GL_FALSE;
}
}

2
src/mesa/main/texenvprogram.c
View File

@ -1239,7 +1239,7 @@ _mesa_UpdateTexEnvProgram( GLcontext *ctx )
/* If a conventional fragment program/shader isn't in effect... */
if (!ctx->FragmentProgram._Enabled &&
!ctx->Shader.CurrentProgram) {
(!ctx->Shader.CurrentProgram || !ctx->Shader.CurrentProgram->FragmentProgram)) {
make_state_key(ctx, &key);
hash = hash_key(&key);