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

Undo some changes to _mesa_UpdateTexEnvProgram(). Fixes broken i915 texturing.

Browse Source
This commit is contained in:
Brian
2007-02-24 15:51:41 -07:00
parent 292a80466d
commit efcfdbd4d1
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1239,10 +1239,12 @@ _mesa_UpdateTexEnvProgram( GLcontext *ctx )
ASSERT(ctx->FragmentProgram._MaintainTexEnvProgram); ASSERT(ctx->FragmentProgram._MaintainTexEnvProgram);
/* If a conventional fragment program/shader isn't in effect... */ /* If a conventional fragment program/shader isn't in effect... */
if (!ctx->FragmentProgram._Current) { if (!ctx->FragmentProgram._Enabled &&
!ctx->Shader.CurrentProgram) {
make_state_key(ctx, &key); make_state_key(ctx, &key);
hash = hash_key(&key); hash = hash_key(&key);
ctx->FragmentProgram._Current =
ctx->FragmentProgram._TexEnvProgram = ctx->FragmentProgram._TexEnvProgram =
search_cache(&ctx->Texture.env_fp_cache, hash, &key, sizeof(key)); search_cache(&ctx->Texture.env_fp_cache, hash, &key, sizeof(key));
@@ -1251,7 +1253,9 @@ _mesa_UpdateTexEnvProgram( GLcontext *ctx )
_mesa_printf("Building new texenv proggy for key %x\n", hash); _mesa_printf("Building new texenv proggy for key %x\n", hash);
/* create new tex env program */ /* create new tex env program */
ctx->FragmentProgram._TexEnvProgram = (struct gl_fragment_program *) ctx->FragmentProgram._Current =
ctx->FragmentProgram._TexEnvProgram =
(struct gl_fragment_program *)
ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0); ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);
create_new_program(ctx, &key, ctx->FragmentProgram._TexEnvProgram); create_new_program(ctx, &key, ctx->FragmentProgram._TexEnvProgram);
@@ -1263,8 +1267,10 @@ _mesa_UpdateTexEnvProgram( GLcontext *ctx )
if (0) if (0)
_mesa_printf("Found existing texenv program for key %x\n", hash); _mesa_printf("Found existing texenv program for key %x\n", hash);
} }
ctx->FragmentProgram._Current = ctx->FragmentProgram._TexEnvProgram;
} }
else {
ctx->FragmentProgram._Current = ctx->FragmentProgram.Current;
}
/* Tell the driver about the change. Could define a new target for /* Tell the driver about the change. Could define a new target for
* this? * this?