diff options
Diffstat (limited to 'src/amd')
| -rw-r--r-- | src/amd/common/ac_surface.c | 6 | ||||
| -rw-r--r-- | src/amd/common/ac_surface.h | 16 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_image.c | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c index 6a335111314..f5f88c1e791 100644 --- a/src/amd/common/ac_surface.c +++ b/src/amd/common/ac_surface.c @@ -1286,8 +1286,8 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib, surf->u.gfx9.cmask.rb_aligned = cin.cMaskFlags.rbAligned; surf->u.gfx9.cmask.pipe_aligned = cin.cMaskFlags.pipeAligned; - surf->u.gfx9.cmask_size = cout.cmaskBytes; - surf->u.gfx9.cmask_alignment = cout.baseAlign; + surf->cmask_size = cout.cmaskBytes; + surf->cmask_alignment = cout.baseAlign; } } @@ -1428,7 +1428,7 @@ static int gfx9_compute_surface(ADDR_HANDLE addrlib, surf->htile_slice_size = 0; surf->u.gfx9.surf_offset = 0; surf->u.gfx9.stencil_offset = 0; - surf->u.gfx9.cmask_size = 0; + surf->cmask_size = 0; /* Calculate texture layout information. */ r = gfx9_compute_miptree(addrlib, config, surf, compressed, diff --git a/src/amd/common/ac_surface.h b/src/amd/common/ac_surface.h index 864b5bad529..01f1cc8dbac 100644 --- a/src/amd/common/ac_surface.h +++ b/src/amd/common/ac_surface.h @@ -150,9 +150,6 @@ struct gfx9_surf_layout { uint16_t dcc_pitch_max; /* (mip chain pitch - 1) */ uint64_t stencil_offset; /* separate stencil */ - uint64_t cmask_size; - - uint32_t cmask_alignment; }; struct radeon_surf { @@ -196,17 +193,20 @@ struct radeon_surf { uint64_t surf_size; uint64_t fmask_size; + uint32_t surf_alignment; + uint32_t fmask_alignment; + /* DCC and HTILE are very small. */ uint32_t dcc_size; - uint32_t htile_size; + uint32_t dcc_alignment; + uint32_t htile_size; uint32_t htile_slice_size; - - uint32_t surf_alignment; - uint32_t fmask_alignment; - uint32_t dcc_alignment; uint32_t htile_alignment; + uint32_t cmask_size; + uint32_t cmask_alignment; + union { /* R600-VI return values. * diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 24f974ac496..826f898d281 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -772,8 +772,8 @@ radv_image_get_cmask_info(struct radv_device *device, unsigned cl_width, cl_height; if (device->physical_device->rad_info.chip_class >= GFX9) { - out->alignment = image->surface.u.gfx9.cmask_alignment; - out->size = image->surface.u.gfx9.cmask_size; + out->alignment = image->surface.cmask_alignment; + out->size = image->surface.cmask_size; return; } |