diff options
| author | Marek Olšák <[email protected]> | 2020-05-02 09:19:18 -0400 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-05-07 20:13:41 +0000 |
| commit | 56e37374ddbc3b66bcfa4d0dadcb1fd53074c822 (patch) | |
| tree | dbd205b11d9425daff96561a3978771247ff6c4b /src/amd/vulkan | |
| parent | cf61f635ff6a38aad344ebe30551eaaac6fec038 (diff) | |
amd: assume HTILE is always rb/pipe_aligned, remove ac_surface.u.gfx9.htile
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Reviewed-by: Samuel Pitoiset <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4863>
Diffstat (limited to 'src/amd/vulkan')
| -rw-r--r-- | src/amd/vulkan/radv_device.c | 4 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_image.c | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 883d7d49efc..d4b78ef06df 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -6810,10 +6810,10 @@ radv_initialise_ds_surface(struct radv_device *device, iview->image->htile_offset; ds->db_htile_data_base = va >> 8; ds->db_htile_surface = S_028ABC_FULL_CACHE(1) | - S_028ABC_PIPE_ALIGNED(surf->u.gfx9.htile.pipe_aligned); + S_028ABC_PIPE_ALIGNED(1); if (device->physical_device->rad_info.chip_class == GFX9) { - ds->db_htile_surface |= S_028ABC_RB_ALIGNED(surf->u.gfx9.htile.rb_aligned); + ds->db_htile_surface |= S_028ABC_RB_ALIGNED(1); } } } else { diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 13877158924..12cf6fb6eb7 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -609,12 +609,13 @@ si_set_mutable_tex_desc_fields(struct radv_device *device, C_00A018_META_PIPE_ALIGNED; if (meta_va) { - struct gfx9_surf_meta_flags meta; + struct gfx9_surf_meta_flags meta = { + .rb_aligned = 1, + .pipe_aligned = 1, + }; if (image->dcc_offset) meta = plane->surface.u.gfx9.dcc; - else - meta = plane->surface.u.gfx9.htile; state[6] |= S_00A018_META_PIPE_ALIGNED(meta.pipe_aligned) | S_00A018_META_DATA_ADDRESS_LO(meta_va >> 8); @@ -637,12 +638,13 @@ si_set_mutable_tex_desc_fields(struct radv_device *device, C_008F24_META_PIPE_ALIGNED & C_008F24_META_RB_ALIGNED; if (meta_va) { - struct gfx9_surf_meta_flags meta; + struct gfx9_surf_meta_flags meta = { + .rb_aligned = 1, + .pipe_aligned = 1, + }; if (image->dcc_offset) meta = plane->surface.u.gfx9.dcc; - else - meta = plane->surface.u.gfx9.htile; state[5] |= S_008F24_META_DATA_ADDRESS(meta_va >> 40) | S_008F24_META_PIPE_ALIGNED(meta.pipe_aligned) | |