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

Revert "mesa: Convert fixed function fragment program generator to GLSL IR." 

This reverts commit 7cb87dffce.
There were regressions (Bug #35244) and more review has been requested.
This commit is contained in:
Eric Anholt 2011-03-12 15:00:55 -08:00
parent 07c420a3c6
commit 098f9c5325
4 changed files with 775 additions and 660 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1419
src/mesa/main/ff_fragment_shader.cpp
View File

File diff suppressed because it is too large Load Diff

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

@ -277,21 +277,17 @@ update_program(struct gl_context *ctx)
fsProg->FragmentProgram);
}
else if (ctx->FragmentProgram._Enabled) {
/* use user-defined fragment program */
/* use user-defined vertex program */
_mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
ctx->FragmentProgram.Current);
}
else if (ctx->FragmentProgram._MaintainTexEnvProgram) {
/* Use fragment program generated from fixed-function state.
*/
struct gl_shader_program *f = _mesa_get_fixed_func_fragment_program(ctx);
#if 0
_mesa_reference_shader_program(ctx,
&ctx->Shader.CurrentFragmentProgram, f);
#endif
_mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
f->FragmentProgram);
_mesa_get_fixed_func_fragment_program(ctx));
_mesa_reference_fragprog(ctx, &ctx->FragmentProgram._TexEnvProgram,
ctx->FragmentProgram._Current);
}
else {
/* no fragment program */

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

@ -29,7 +29,7 @@
struct gl_context;
extern struct gl_shader_program *
extern struct gl_fragment_program *
_mesa_get_fixed_func_fragment_program(struct gl_context *ctx);
#endif

2
src/mesa/program/program.c
View File

@ -140,7 +140,7 @@ _mesa_free_program_data(struct gl_context *ctx)
#endif
#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program
_mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, NULL);
_mesa_delete_shader_cache(ctx, ctx->FragmentProgram.Cache);
_mesa_delete_program_cache(ctx, ctx->FragmentProgram.Cache);
#endif
#if FEATURE_ARB_geometry_shader4
_mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current, NULL);