Module: Mesa Branch: nvfx-nv30-fixes Commit: bc899ee1c4c7ba52402fe56ca67c04692ff39fb6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc899ee1c4c7ba52402fe56ca67c04692ff39fb6
Author: Luca Barbieri <[email protected]> Date: Mon Apr 12 22:50:52 2010 +0200 move some more code and try again --- src/gallium/drivers/nvfx/nvfx_state_emit.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/gallium/drivers/nvfx/nvfx_state_emit.c b/src/gallium/drivers/nvfx/nvfx_state_emit.c index ad57e4c..5d747a6 100644 --- a/src/gallium/drivers/nvfx/nvfx_state_emit.c +++ b/src/gallium/drivers/nvfx/nvfx_state_emit.c @@ -29,19 +29,6 @@ nvfx_state_validate_common(struct nvfx_context *nvfx) if(dirty & NVFX_NEW_SAMPLER) nvfx_fragtex_validate(nvfx); - if(nvfx->render_mode == HW) - { - if(dirty & (NVFX_NEW_VERTPROG | NVFX_NEW_VERTCONST | NVFX_NEW_UCP)) - { - if(!nvfx_vertprog_validate(nvfx)) - return FALSE; - } - } - else { - if(dirty & (NVFX_NEW_VERTPROG | NVFX_NEW_UCP)) - nvfx_vertprog_validate(nvfx); - } - if(dirty & NVFX_NEW_BLEND) sb_emit(chan, nvfx->blend->sb, nvfx->blend->sb_len); @@ -72,6 +59,19 @@ nvfx_state_validate_common(struct nvfx_context *nvfx) if(nvfx->render_mode == HW) { + if(dirty & (NVFX_NEW_VERTPROG | NVFX_NEW_VERTCONST | NVFX_NEW_UCP)) + { + if(!nvfx_vertprog_validate(nvfx)) + return FALSE; + } + } + else { + if(dirty & (NVFX_NEW_VERTPROG | NVFX_NEW_UCP)) + nvfx_vertprog_validate(nvfx); + } + + if(nvfx->render_mode == HW) + { if(dirty & (NVFX_NEW_ARRAYS)) { if(!nvfx_vbo_validate(nvfx)) _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
