diff options
Diffstat (limited to 'src/amd')
| -rw-r--r-- | src/amd/common/gfx9d.h | 6 | ||||
| -rw-r--r-- | src/amd/common/sid.h | 6 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_image.c | 14 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/amd/common/gfx9d.h b/src/amd/common/gfx9d.h index 5d3de5842a1..4aa6821ad64 100644 --- a/src/amd/common/gfx9d.h +++ b/src/amd/common/gfx9d.h @@ -1446,9 +1446,9 @@ #define S_008F20_DEPTH(x) (((unsigned)(x) & 0x1FFF) << 0) #define G_008F20_DEPTH(x) (((x) >> 0) & 0x1FFF) #define C_008F20_DEPTH 0xFFFFE000 -#define S_008F20_PITCH_GFX9(x) (((unsigned)(x) & 0xFFFF) << 13) -#define G_008F20_PITCH_GFX9(x) (((x) >> 13) & 0xFFFF) -#define C_008F20_PITCH_GFX9 0xE0001FFF +#define S_008F20_PITCH(x) (((unsigned)(x) & 0xFFFF) << 13) +#define G_008F20_PITCH(x) (((x) >> 13) & 0xFFFF) +#define C_008F20_PITCH 0xE0001FFF #define S_008F20_BC_SWIZZLE(x) (((unsigned)(x) & 0x07) << 29) #define G_008F20_BC_SWIZZLE(x) (((x) >> 29) & 0x07) #define C_008F20_BC_SWIZZLE 0x1FFFFFFF diff --git a/src/amd/common/sid.h b/src/amd/common/sid.h index 1e6d2595c3c..930e70e8ebd 100644 --- a/src/amd/common/sid.h +++ b/src/amd/common/sid.h @@ -2326,9 +2326,9 @@ #define S_008F20_DEPTH(x) (((unsigned)(x) & 0x1FFF) << 0) #define G_008F20_DEPTH(x) (((x) >> 0) & 0x1FFF) #define C_008F20_DEPTH 0xFFFFE000 -#define S_008F20_PITCH_GFX6(x) (((unsigned)(x) & 0x3FFF) << 13) -#define G_008F20_PITCH_GFX6(x) (((x) >> 13) & 0x3FFF) -#define C_008F20_PITCH_GFX6 0xF8001FFF +#define S_008F20_PITCH(x) (((unsigned)(x) & 0xFFFF) << 13) +#define G_008F20_PITCH(x) (((x) >> 13) & 0xFFFF) +#define C_008F20_PITCH 0xE0001FFF #define R_008F24_SQ_IMG_RSRC_WORD5 0x008F24 #define S_008F24_BASE_ARRAY(x) (((unsigned)(x) & 0x1FFF) << 0) #define G_008F24_BASE_ARRAY(x) (((x) >> 0) & 0x1FFF) diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index fbfabea3b6f..4f06d4f97f5 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -398,14 +398,14 @@ si_set_mutable_tex_desc_fields(struct radv_device *device, if (chip_class >= GFX9) { state[3] &= C_008F1C_SW_MODE; - state[4] &= C_008F20_PITCH_GFX9; + state[4] &= C_008F20_PITCH; if (is_stencil) { state[3] |= S_008F1C_SW_MODE(plane->surface.u.gfx9.stencil.swizzle_mode); - state[4] |= S_008F20_PITCH_GFX9(plane->surface.u.gfx9.stencil.epitch); + state[4] |= S_008F20_PITCH(plane->surface.u.gfx9.stencil.epitch); } else { state[3] |= S_008F1C_SW_MODE(plane->surface.u.gfx9.surf.swizzle_mode); - state[4] |= S_008F20_PITCH_GFX9(plane->surface.u.gfx9.surf.epitch); + state[4] |= S_008F20_PITCH(plane->surface.u.gfx9.surf.epitch); } state[5] &= C_008F24_META_DATA_ADDRESS & @@ -430,8 +430,8 @@ si_set_mutable_tex_desc_fields(struct radv_device *device, state[3] &= C_008F1C_TILING_INDEX; state[3] |= S_008F1C_TILING_INDEX(index); - state[4] &= C_008F20_PITCH_GFX6; - state[4] |= S_008F20_PITCH_GFX6(pitch - 1); + state[4] &= C_008F20_PITCH; + state[4] |= S_008F20_PITCH(pitch - 1); } } @@ -674,13 +674,13 @@ si_make_texture_descriptor(struct radv_device *device, if (device->physical_device->rad_info.chip_class >= GFX9) { fmask_state[3] |= S_008F1C_SW_MODE(image->planes[0].surface.u.gfx9.fmask.swizzle_mode); fmask_state[4] |= S_008F20_DEPTH(last_layer) | - S_008F20_PITCH_GFX9(image->planes[0].surface.u.gfx9.fmask.epitch); + S_008F20_PITCH(image->planes[0].surface.u.gfx9.fmask.epitch); fmask_state[5] |= S_008F24_META_PIPE_ALIGNED(image->planes[0].surface.u.gfx9.cmask.pipe_aligned) | S_008F24_META_RB_ALIGNED(image->planes[0].surface.u.gfx9.cmask.rb_aligned); } else { fmask_state[3] |= S_008F1C_TILING_INDEX(image->fmask.tile_mode_index); fmask_state[4] |= S_008F20_DEPTH(depth - 1) | - S_008F20_PITCH_GFX6(image->fmask.pitch_in_pixels - 1); + S_008F20_PITCH(image->fmask.pitch_in_pixels - 1); fmask_state[5] |= S_008F24_LAST_ARRAY(last_layer); } } else if (fmask_state) |