projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
radeon/llvm: Add some comments and fix coding style
[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 ad06ef416a1615961673cdc7be46a902a3a1f95c..2266b48c948511536dd34afb2a1e1989ac08b73e 100644
(file)
--- a/
src/gallium/drivers/r300/r300_flush.c
+++ b/
src/gallium/drivers/r300/r300_flush.c
@@
-59,6
+59,7
@@
static void r300_flush_and_cleanup(struct r300_context *r300, unsigned flags)
if (!r300->screen->caps.has_tcl) {
r300->vs_state.dirty = FALSE;
r300->vs_constants.dirty = FALSE;
if (!r300->screen->caps.has_tcl) {
r300->vs_state.dirty = FALSE;
r300->vs_constants.dirty = FALSE;
+ r300->clip_state.dirty = FALSE;
}
}
}
}
@@
-72,6
+73,10
@@
void r300_flush(struct pipe_context *pipe,
if (r300->draw && !r300->draw_vbo_locked)
r300_draw_flush_vbuf(r300);
if (r300->draw && !r300->draw_vbo_locked)
r300_draw_flush_vbuf(r300);
+ if (r300->screen->info.drm_minor >= 12) {
+ flags |= RADEON_FLUSH_KEEP_TILING_FLAGS;
+ }
+
if (rfence) {
/* Create a fence, which is a dummy BO. */
*rfence = r300->rws->buffer_create(r300->rws, 1, 1,
if (rfence) {
/* Create a fence, which is a dummy BO. */
*rfence = r300->rws->buffer_create(r300->rws, 1, 1,
@@
-80,7
+85,7
@@
void r300_flush(struct pipe_context *pipe,
/* Add the fence as a dummy relocation. */
r300->rws->cs_add_reloc(r300->cs,
r300->rws->buffer_get_cs_handle(*rfence),
/* Add the fence as a dummy relocation. */
r300->rws->cs_add_reloc(r300->cs,
r300->rws->buffer_get_cs_handle(*rfence),
- RADEON_
DOMAIN_GTT
, RADEON_DOMAIN_GTT);
+ RADEON_
USAGE_READWRITE
, RADEON_DOMAIN_GTT);
}
if (r300->dirty_hw) {
}
if (r300->dirty_hw) {