fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 09:28:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "mesa: Track a computed _CurrentFragmentProgram for current gl_shader_program"

Browse source 
This reverts commit b4452c3baa.
This commit is contained in:
Eric Anholt 2011-03-12 15:00:49 -08:00
parent 403be11111
commit 07c420a3c6
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/main/mtypes.h
View file

@ -2191,7 +2191,6 @@ struct gl_shader_state
struct gl_shader_program *CurrentVertexProgram;
struct gl_shader_program *CurrentGeometryProgram;
struct gl_shader_program *CurrentFragmentProgram;
struct gl_shader_program *_CurrentFragmentProgram;
/**
* Program used by glUniform calls.

13
src/mesa/main/state.c
View file

@ -43,7 +43,6 @@
#include "pixel.h"
#include "program/program.h"
#include "program/prog_parameter.h"
#include "shaderobj.h"
#include "state.h"
#include "stencil.h"
#include "texenvprogram.h"
@ -250,7 +249,7 @@ update_program(struct gl_context *ctx)
{
const struct gl_shader_program *vsProg = ctx->Shader.CurrentVertexProgram;
const struct gl_shader_program *gsProg = ctx->Shader.CurrentGeometryProgram;
struct gl_shader_program *fsProg = ctx->Shader.CurrentFragmentProgram;
const struct gl_shader_program *fsProg = ctx->Shader.CurrentFragmentProgram;
const struct gl_vertex_program *prevVP = ctx->VertexProgram._Current;
const struct gl_fragment_program *prevFP = ctx->FragmentProgram._Current;
const struct gl_geometry_program *prevGP = ctx->GeometryProgram._Current;
@ -276,22 +275,20 @@ update_program(struct gl_context *ctx)
/* Use shader programs */
_mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
fsProg->FragmentProgram);
_mesa_reference_shader_program(ctx, &ctx->Shader._CurrentFragmentProgram,
fsProg);
}
else if (ctx->FragmentProgram._Enabled) {
/* use user-defined fragment program */
_mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
ctx->FragmentProgram.Current);
_mesa_reference_shader_program(ctx, &ctx->Shader._CurrentFragmentProgram,
NULL);
}
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);
&ctx->Shader.CurrentFragmentProgram, f);
#endif
_mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,
f->FragmentProgram);
@ -299,8 +296,6 @@ update_program(struct gl_context *ctx)
else {
/* no fragment program */
_mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL);
_mesa_reference_shader_program(ctx, &ctx->Shader._CurrentFragmentProgram,
NULL);
}
if (gsProg && gsProg->LinkStatus && gsProg->GeometryProgram) {