mesa: Branch 'master'
Haihao Xiang
haihao at kemper.freedesktop.org
Thu Mar 22 03:04:41 UTC 2007
src/mesa/drivers/dri/i965/brw_program.c | 4 ++--
src/mesa/drivers/dri/i965/brw_wm_fp.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
diff-tree 01b7f2ab2e7a9291bf54475e816e88804ee7cd53 (from 88db19a48412cbe89196b1cc06e8ecf8ccae78b0)
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date: Thu Mar 22 11:01:51 2007 +0800
fix for bug#10339
StateFlags has been updated in _mesa_add_state_reference
diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c
index 1ae065b..5d98176 100644
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -117,7 +117,7 @@ static void brwProgramStringNotify( GLco
if (p == fp)
brw->state.dirty.brw |= BRW_NEW_FRAGMENT_PROGRAM;
p->id = brw->program_id++;
- p->param_state = brw_parameter_list_state_flags(p->program.Base.Parameters);
+ p->param_state = p->program.Base.Parameters->StateFlags;
}
else if (target == GL_VERTEX_PROGRAM_ARB) {
struct brw_context *brw = brw_context(ctx);
@@ -126,7 +126,7 @@ static void brwProgramStringNotify( GLco
if (p == vp)
brw->state.dirty.brw |= BRW_NEW_VERTEX_PROGRAM;
p->id = brw->program_id++;
- p->param_state = brw_parameter_list_state_flags(p->program.Base.Parameters);
+ p->param_state = p->program.Base.Parameters->StateFlags;
/* Also tell tnl about it:
*/
diff --git a/src/mesa/drivers/dri/i965/brw_wm_fp.c b/src/mesa/drivers/dri/i965/brw_wm_fp.c
index bb0aa35..ba2dbec 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_fp.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_fp.c
@@ -398,7 +398,7 @@ static struct prog_src_register search_o
/* Recalculate state dependency:
*/
- c->fp->param_state = brw_parameter_list_state_flags( paramList );
+ c->fp->param_state = paramList->StateFlags;
return src_reg(PROGRAM_STATE_VAR, idx);
}
More information about the mesa-commit
mailing list