summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/radeonsi/si_compute.c
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2014-12-29 14:02:46 +0100
committerMarek Olšák <marek.olsak@amd.com>2015-01-07 12:06:43 +0100
commit2bfe9d4538693ebad3c0330a92e432c6c4c5afd3 (patch)
treedae68831c85a172f189fe135914e7ba220706d3d /src/gallium/drivers/radeonsi/si_compute.c
parentd217819e7872e1017260f525caff38e6e49e714d (diff)
downloadexternal_mesa3d-2bfe9d4538693ebad3c0330a92e432c6c4c5afd3.zip
external_mesa3d-2bfe9d4538693ebad3c0330a92e432c6c4c5afd3.tar.gz
external_mesa3d-2bfe9d4538693ebad3c0330a92e432c6c4c5afd3.tar.bz2
radeonsi: rename flush flags, split the TC flag into L1 and L2
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_compute.c')
-rw-r--r--src/gallium/drivers/radeonsi/si_compute.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index bf935dc..4b335bb 100644
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -206,11 +206,12 @@ static void si_launch_grid(
radeon_emit(cs, 0x80000000);
radeon_emit(cs, 0x80000000);
- sctx->b.flags |= R600_CONTEXT_INV_TEX_CACHE |
- R600_CONTEXT_INV_SHADER_CACHE |
- R600_CONTEXT_INV_CONST_CACHE |
- R600_CONTEXT_FLUSH_WITH_INV_L2 |
- R600_CONTEXT_FLAG_COMPUTE;
+ sctx->b.flags |= SI_CONTEXT_INV_TC_L1 |
+ SI_CONTEXT_INV_TC_L2 |
+ SI_CONTEXT_INV_ICACHE |
+ SI_CONTEXT_INV_KCACHE |
+ SI_CONTEXT_FLUSH_WITH_INV_L2 |
+ SI_CONTEXT_FLAG_COMPUTE;
si_emit_cache_flush(&sctx->b, NULL);
pm4->compute_pkt = true;
@@ -401,11 +402,12 @@ static void si_launch_grid(
si_pm4_free_state(sctx, pm4, ~0);
- sctx->b.flags |= R600_CONTEXT_CS_PARTIAL_FLUSH |
- R600_CONTEXT_INV_TEX_CACHE |
- R600_CONTEXT_INV_SHADER_CACHE |
- R600_CONTEXT_INV_CONST_CACHE |
- R600_CONTEXT_FLAG_COMPUTE;
+ sctx->b.flags |= SI_CONTEXT_CS_PARTIAL_FLUSH |
+ SI_CONTEXT_INV_TC_L1 |
+ SI_CONTEXT_INV_TC_L2 |
+ SI_CONTEXT_INV_ICACHE |
+ SI_CONTEXT_INV_KCACHE |
+ SI_CONTEXT_FLAG_COMPUTE;
si_emit_cache_flush(&sctx->b, NULL);
}