Mesa (draw-vbuf-interface): r300-gallium: Consolidate state updates.
Corbin Simpson
csimpson at kemper.freedesktop.org
Wed Feb 18 09:04:47 UTC 2009
Module: Mesa
Branch: draw-vbuf-interface
Commit: ecb177e198298bbf38fce75223c558d584446dee
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ecb177e198298bbf38fce75223c558d584446dee
Author: Corbin Simpson <MostAwesomeDude at gmail.com>
Date: Tue Feb 17 21:30:55 2009 -0800
r300-gallium: Consolidate state updates.
---
src/gallium/drivers/r300/r300_emit.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c
index a281929..0c86a9c 100644
--- a/src/gallium/drivers/r300/r300_emit.c
+++ b/src/gallium/drivers/r300/r300_emit.c
@@ -230,18 +230,23 @@ void r300_emit_dirty_state(struct r300_context* r300)
return;
}
+ r300_update_derived_state(r300);
+
/* XXX check size */
if (r300->dirty_state & R300_NEW_BLEND) {
r300_emit_blend_state(r300, r300->blend_state);
+ r300->dirty_state &= ~R300_NEW_BLEND;
}
if (r300->dirty_state & R300_NEW_BLEND_COLOR) {
r300_emit_blend_color_state(r300, r300->blend_color_state);
+ r300->dirty_state &= ~R300_NEW_BLEND_COLOR;
}
if (r300->dirty_state & R300_NEW_DSA) {
r300_emit_dsa_state(r300, r300->dsa_state);
+ r300->dirty_state &= ~R300_NEW_DSA;
}
if (r300->dirty_state & R300_NEW_FRAGMENT_SHADER) {
@@ -252,15 +257,16 @@ void r300_emit_dirty_state(struct r300_context* r300)
r300_emit_fragment_shader(r300,
(struct r300_fragment_shader*)r300->fs);
}
+ r300->dirty_state &= ~R300_NEW_FRAGMENT_SHADER;
}
if (r300->dirty_state & R300_NEW_RASTERIZER) {
r300_emit_rs_state(r300, r300->rs_state);
+ r300->dirty_state &= ~R300_NEW_RASTERIZER;
}
if (r300->dirty_state & R300_NEW_SCISSOR) {
r300_emit_scissor_state(r300, r300->scissor_state);
+ r300->dirty_state &= ~R300_NEW_SCISSOR;
}
-
- r300->dirty_state = 0;
}
More information about the mesa-commit
mailing list