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

ac/surface: Fix some warnings.

Browse source 
../mesa/src/amd/common/ac_surface.c:2324:48: warning: implicit conversion from enumeration type 'AddrResourceType' (aka 'enum _AddrResourceType') to different enumeration type 'enum gfx9_resource_type' [-Wenum-conversion]
   surf->u.gfx9.resource_type = AddrSurfInfoIn.resourceType;
                              ~ ~~~~~~~~~~~~~~~^~~~~~~~~~~~
../mesa/src/amd/common/ac_surface.c:3046:38: warning: implicit conversion from enumeration type 'const enum gfx9_resource_type' to different enumeration type 'AddrResourceType' (aka 'enum _AddrResourceType') [-Wenum-conversion]
   input.resourceType = surf->u.gfx9.resource_type;
                      ~ ~~~~~~~~~~~~~^~~~~~~~~~~~~
../mesa/src/amd/common/ac_surface.c:3069:38: warning: implicit conversion from enumeration type 'const enum gfx9_resource_type' to different enumeration type 'AddrResourceType' (aka 'enum _AddrResourceType') [-Wenum-conversion]
   input.resourceType = surf->u.gfx9.resource_type;

The enums are compatible so lets just add some casts.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18694>
This commit is contained in:
Bas Nieuwenhuizen 2022-09-20 02:37:39 +02:00 • committed by Marge Bot
parent 196d29a506
commit 266fe31666
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2321,7 +2321,7 @@ static int gfx9_compute_surface(struct ac_addrlib *addrlib, const struct radeon_
AddrSurfInfoIn.swizzleMode = ac_modifier_gfx9_swizzle_mode(surf->modifier);
}
surf->u.gfx9.resource_type = AddrSurfInfoIn.resourceType;
surf->u.gfx9.resource_type = (enum gfx9_resource_type)AddrSurfInfoIn.resourceType;
surf->has_stencil = !!(surf->flags & RADEON_SURF_SBUFFER);
surf->num_meta_levels = 0;
@ -3043,7 +3043,7 @@ ac_surface_addr_from_coord(struct ac_addrlib *addrlib, const struct radeon_info
input.numSamples = surf_info->samples;
input.numFrags = surf_info->samples;
input.swizzleMode = surf->u.gfx9.swizzle_mode;
input.resourceType = surf->u.gfx9.resource_type;
input.resourceType = (AddrResourceType)surf->u.gfx9.resource_type;
input.pipeBankXor = surf->tile_swizzle;
input.bpp = surf->bpe * 8;
input.x = x;
@ -3066,7 +3066,7 @@ ac_surface_compute_nbc_view(struct ac_addrlib *addrlib, const struct radeon_info
ADDR2_COMPUTE_NONBLOCKCOMPRESSEDVIEW_INPUT input = {0};
input.size = sizeof(ADDR2_COMPUTE_NONBLOCKCOMPRESSEDVIEW_INPUT);
input.swizzleMode = surf->u.gfx9.swizzle_mode;
input.resourceType = surf->u.gfx9.resource_type;
input.resourceType = (AddrResourceType)surf->u.gfx9.resource_type;
switch (surf->bpe) {
case 8:
input.format = ADDR_FMT_BC1;