fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 02:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ac/surface: remove remaining occurrences of HiS on GFX12

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40213>
This commit is contained in:
Samuel Pitoiset 2026-02-26 11:47:34 +01:00 • committed by Marge Bot
parent f109bfc3f1
commit fc7d2eda2c
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/amd/common/ac_surface.c
View file

@ -3301,10 +3301,10 @@ static unsigned gfx12_select_swizzle_mode(struct ac_addrlib *addrlib,
return ADDR3_LINEAR; return ADDR3_LINEAR;
} }
static bool gfx12_compute_hiz_his_info(struct ac_addrlib *addrlib, const struct radeon_info *info, static bool gfx12_compute_hiz_info(struct ac_addrlib *addrlib, const struct radeon_info *info,
const struct ac_surf_config *config, const struct ac_surf_config *config,
struct radeon_surf *surf, struct gfx12_hiz_his_layout *hizs, struct radeon_surf *surf, struct gfx12_hiz_layout *hiz,
const ADDR3_COMPUTE_SURFACE_INFO_INPUT *surf_in) const ADDR3_COMPUTE_SURFACE_INFO_INPUT *surf_in)
{ {
assert(surf_in->flags.depth != surf_in->flags.stencil); assert(surf_in->flags.depth != surf_in->flags.stencil);
@ -3336,11 +3336,11 @@ static bool gfx12_compute_hiz_his_info(struct ac_addrlib *addrlib, const struct
if (ret != ADDR_OK) if (ret != ADDR_OK)
return false; return false;
hizs->size = out.surfSize; hiz->size = out.surfSize;
hizs->width_in_tiles = in.width; hiz->width_in_tiles = in.width;
hizs->height_in_tiles = in.height; hiz->height_in_tiles = in.height;
hizs->swizzle_mode = in.swizzleMode; hiz->swizzle_mode = in.swizzleMode;
hizs->alignment_log2 = out.baseAlign; hiz->alignment_log2 = out.baseAlign;
return true; return true;
} }
@ -3441,7 +3441,7 @@ static bool gfx12_compute_miptree(struct ac_addrlib *addrlib, const struct radeo
if (in->flags.depth) { if (in->flags.depth) {
assert(in->swizzleMode != ADDR3_LINEAR); assert(in->swizzleMode != ADDR3_LINEAR);
return gfx12_compute_hiz_his_info(addrlib, info, config, surf, &surf->u.gfx9.zs.hiz, in); return gfx12_compute_hiz_info(addrlib, info, config, surf, &surf->u.gfx9.zs.hiz, in);
} }
/* Compute tile swizzle for the color surface. All swizzle modes >= 4K support it. */ /* Compute tile swizzle for the color surface. All swizzle modes >= 4K support it. */

4
src/amd/common/ac_surface.h
View file

@ -219,7 +219,7 @@ struct gfx9_meta_equation {
} u; } u;
}; };
struct gfx12_hiz_his_layout { struct gfx12_hiz_layout {
uint64_t offset; uint64_t offset;
uint32_t size; uint32_t size;
uint16_t width_in_tiles; uint16_t width_in_tiles;
@ -307,7 +307,7 @@ struct gfx9_surf_layout {
uint16_t stencil_epitch; /* gfx9 only, not on gfx10 */ uint16_t stencil_epitch; /* gfx9 only, not on gfx10 */
uint8_t stencil_swizzle_mode; uint8_t stencil_swizzle_mode;
struct gfx12_hiz_his_layout hiz; struct gfx12_hiz_layout hiz;
/* For HTILE VRS. (only Gfx103-Gfx11) */ /* For HTILE VRS. (only Gfx103-Gfx11) */
struct gfx9_meta_equation htile_equation; struct gfx9_meta_equation htile_equation;