Mesa (master): Remove ctx field from texenvprog_cache
Keith Whitwell
keithw at kemper.freedesktop.org
Wed Sep 24 17:37:27 UTC 2008
Module: Mesa
Branch: master
Commit: 93fef22d05d0fb6f011d48d2fde533555c1695a2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=93fef22d05d0fb6f011d48d2fde533555c1695a2
Author: Brian <brian.paul at tungstengraphics.com>
Date: Mon Oct 29 12:25:46 2007 -0600
Remove ctx field from texenvprog_cache
---
src/mesa/main/texenvprogram.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 817071d..d360fa3 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -413,9 +413,9 @@ static struct ureg get_tex_temp( struct texenv_fragment_program *p )
}
-static void release_temps( struct texenv_fragment_program *p )
+static void release_temps(GLcontext *ctx, struct texenv_fragment_program *p )
{
- GLuint max_temp = p->ctx->Const.FragmentProgram.MaxTemps;
+ GLuint max_temp = ctx->Const.FragmentProgram.MaxTemps;
/* KW: To support tex_env_crossbar, don't release the registers in
* temps_output.
@@ -1053,7 +1053,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
p.one = undef;
p.last_tex_stage = 0;
- release_temps(&p);
+ release_temps(ctx, &p);
if (key->enabled_units) {
/* First pass - to support texture_env_crossbar, first identify
@@ -1071,7 +1071,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
for (unit = 0 ; unit < ctx->Const.MaxTextureUnits; unit++)
if (key->enabled_units & (1<<unit)) {
p.src_previous = emit_texenv( &p, unit );
- release_temps(&p); /* release all temps */
+ release_temps(ctx, &p); /* release all temps */
}
}
More information about the mesa-commit
mailing list