projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r300/compiler: kill off RC_WRAP_CLAMP
[mesa.git]
/
src
/
gallium
/
drivers
/
r300
/
r300_flush.c
diff --git
a/src/gallium/drivers/r300/r300_flush.c
b/src/gallium/drivers/r300/r300_flush.c
index 15e612d8a6bd34ff97492cde002b7f12dd86056d..5e61f528b64a68543c66c29b64b176d0ea200ff5 100644
(file)
--- a/
src/gallium/drivers/r300/r300_flush.c
+++ b/
src/gallium/drivers/r300/r300_flush.c
@@
-29,7
+29,6
@@
#include "r300_cs.h"
#include "r300_emit.h"
#include "r300_flush.h"
#include "r300_cs.h"
#include "r300_emit.h"
#include "r300_flush.h"
-#include "r300_state_invariant.h"
static void r300_flush(struct pipe_context* pipe,
unsigned flags,
static void r300_flush(struct pipe_context* pipe,
unsigned flags,
@@
-53,7
+52,6
@@
static void r300_flush(struct pipe_context* pipe,
if (r300->dirty_hw) {
FLUSH_CS;
if (r300->dirty_hw) {
FLUSH_CS;
- r300->dirty_state = R300_NEW_KITCHEN_SINK;
r300->dirty_hw = 0;
/* New kitchen sink, baby. */
r300->dirty_hw = 0;
/* New kitchen sink, baby. */
@@
-62,6
+60,12
@@
static void r300_flush(struct pipe_context* pipe,
atom->dirty = TRUE;
}
}
atom->dirty = TRUE;
}
}
+
+ /* Unmark HWTCL state for SWTCL. */
+ if (!r300->screen->caps.has_tcl) {
+ r300->vs_state.dirty = FALSE;
+ r300->vs_constants.dirty = FALSE;
+ }
}
/* reset flushed query */
}
/* reset flushed query */