Module: Mesa Branch: main Commit: 700bc2dae01650c501021ea00ba2ba0207bd94c9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=700bc2dae01650c501021ea00ba2ba0207bd94c9
Author: Samuel Pitoiset <[email protected]> Date: Thu Jan 19 08:45:27 2023 +0100 radv: rename ac_surf_nbc_view::max_mip to num_levels For readability. Signed-off-by: Samuel Pitoiset <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20761> --- src/amd/common/ac_surface.c | 2 +- src/amd/common/ac_surface.h | 2 +- src/amd/vulkan/radv_device.c | 2 +- src/amd/vulkan/radv_image.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c index 966e0e6b593..1819f9e0453 100644 --- a/src/amd/common/ac_surface.c +++ b/src/amd/common/ac_surface.c @@ -3094,7 +3094,7 @@ ac_surface_compute_nbc_view(struct ac_addrlib *addrlib, const struct radeon_info out->tile_swizzle = output.pipeBankXor; out->width = output.unalignedWidth; out->height = output.unalignedHeight; - out->max_mip = output.numMipLevels; + out->num_levels = output.numMipLevels; out->level = output.mipId; out->valid = true; } else { diff --git a/src/amd/common/ac_surface.h b/src/amd/common/ac_surface.h index 48a8c4c6628..61dde250c38 100644 --- a/src/amd/common/ac_surface.h +++ b/src/amd/common/ac_surface.h @@ -421,7 +421,7 @@ struct ac_surf_nbc_view { uint32_t width; uint32_t height; uint32_t level; - uint32_t max_mip; /* Used for max_mip in the resource descriptor */ + uint32_t num_levels; /* Used for max_mip in the resource descriptor */ uint8_t tile_swizzle; uint64_t base_address_offset; }; diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index bc522011d1e..dd2bb5d4aed 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -7142,7 +7142,7 @@ radv_initialise_color_surface(struct radv_device *device, struct radv_color_buff if (iview->nbc_view.valid) { base_level = iview->nbc_view.level; - max_mip = iview->nbc_view.max_mip - 1; + max_mip = iview->nbc_view.num_levels - 1; } cb->cb_color_view |= S_028C6C_MIP_LEVEL_GFX10(base_level); diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 57f639fa192..c8f49889395 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -1048,7 +1048,7 @@ gfx10_make_texture_descriptor(struct radv_device *device, struct radv_image *ima unsigned max_mip = image->info.samples > 1 ? util_logbase2(image->info.samples) : image->info.levels - 1; if (nbc_view && nbc_view->valid) - max_mip = nbc_view->max_mip - 1; + max_mip = nbc_view->num_levels - 1; unsigned min_lod_clamped = radv_float_to_ufixed(CLAMP(min_lod, 0, 15), 8); if (device->physical_device->rad_info.gfx_level >= GFX11) {
