Mesa (gallium-0.2): i965: Always check vertex program.
Brian Paul
brianp at kemper.freedesktop.org
Fri Nov 7 00:20:31 UTC 2008
Module: Mesa
Branch: gallium-0.2
Commit: df94fd17647937975df031dcaa1ac24b2d79ce1b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=df94fd17647937975df031dcaa1ac24b2d79ce1b
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date: Thu Nov 6 15:25:55 2008 +0800
i965: Always check vertex program.
Now i965 also uses the vertex program created by Mesa Core, but this vertex program
is not only depend on mesa state _NEW_PROGRAM, so always check the current vertex
program is updated or not. This fixes broken demo cubemap.
---
src/mesa/drivers/dri/i965/brw_state_upload.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c
index 16b0496..7a642bd 100644
--- a/src/mesa/drivers/dri/i965/brw_state_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_state_upload.c
@@ -45,7 +45,6 @@ const struct brw_tracked_state *atoms[] =
{
&brw_check_fallback,
- &brw_active_vertprog,
&brw_wm_input_sizes,
&brw_vs_prog,
&brw_gs_prog,
@@ -212,6 +211,10 @@ void brw_validate_state( struct brw_context *brw )
brw->state.dirty.brw |= BRW_NEW_FRAGMENT_PROGRAM;
}
+ if (brw->vertex_program != brw->attribs.VertexProgram->_Current) {
+ brw->vertex_program = brw->attribs.VertexProgram->_Current;
+ brw->state.dirty.brw |= BRW_NEW_VERTEX_PROGRAM;
+ }
if (state->mesa == 0 &&
state->cache == 0 &&
More information about the mesa-commit
mailing list