diff options
| author | Marek Olšák <maraeo@gmail.com> | 2012-09-09 06:08:39 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2012-09-13 20:18:44 +0200 |
| commit | fd2e34d557c07fba5a6e344e915f73dcfb66d0b4 (patch) | |
| tree | c560ea82c4f443fc617446507c1ebc2fa35f4e33 /src/gallium/drivers/r600/evergreend.h | |
| parent | 6a5a4d59ce63aa1fa14d3dd6c50169c532424b6d (diff) | |
| download | external_mesa3d-fd2e34d557c07fba5a6e344e915f73dcfb66d0b4.zip external_mesa3d-fd2e34d557c07fba5a6e344e915f73dcfb66d0b4.tar.gz external_mesa3d-fd2e34d557c07fba5a6e344e915f73dcfb66d0b4.tar.bz2 | |
r600g: simplify flushing
Based on the patch called "simplify and fix flushing and synchronization"
by Jerome Glisse.
Rebased, removed unneded code, simplified more and cleaned up.
Also, SH_ACTION_ENA is not set when changing shaders (hw doesn't seem
to need it). It's only used to flush constant buffers.
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Diffstat (limited to 'src/gallium/drivers/r600/evergreend.h')
| -rw-r--r-- | src/gallium/drivers/r600/evergreend.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gallium/drivers/r600/evergreend.h b/src/gallium/drivers/r600/evergreend.h index e4d72f5..18e1eb7 100644 --- a/src/gallium/drivers/r600/evergreend.h +++ b/src/gallium/drivers/r600/evergreend.h @@ -46,7 +46,8 @@ #define EVENT_TYPE_PS_PARTIAL_FLUSH 0x10 #define EVENT_TYPE_ZPASS_DONE 0x15 #define EVENT_TYPE_CACHE_FLUSH_AND_INV_EVENT 0x16 -#define EVENT_TYPE_SO_VGTSTREAMOUT_FLUSH 0x1f +#define EVENT_TYPE_SO_VGTSTREAMOUT_FLUSH 0x1f +#define EVENT_TYPE_FLUSH_AND_INV_DB_META 0x2c #define EVENT_TYPE(x) ((x) << 0) #define EVENT_INDEX(x) ((x) << 8) @@ -2186,16 +2187,12 @@ #define C_0085F0_DB_DEST_BASE_ENA 0xFFFFBFFF #define S_0085F0_CB8_DEST_BASE_ENA(x) (((x) & 0x1) << 15) #define G_0085F0_CB8_DEST_BASE_ENA(x) (((x) >> 15) & 0x1) - #define S_0085F0_CB9_DEST_BASE_ENA(x) (((x) & 0x1) << 16) #define G_0085F0_CB9_DEST_BASE_ENA(x) (((x) >> 16) & 0x1) - #define S_0085F0_CB10_DEST_BASE_ENA(x) (((x) & 0x1) << 17) #define G_0085F0_CB10_DEST_BASE_ENA(x) (((x) >> 17) & 0x1) - #define S_0085F0_CB11_DEST_BASE_ENA(x) (((x) & 0x1) << 18) #define G_0085F0_CB11_DEST_BASE_ENA(x) (((x) >> 18) & 0x1) - #define S_0085F0_TC_ACTION_ENA(x) (((x) & 0x1) << 23) #define G_0085F0_TC_ACTION_ENA(x) (((x) >> 23) & 0x1) #define C_0085F0_TC_ACTION_ENA 0xFF7FFFFF |