if (device->physical_device->rad_info.chip_class >= GFX10) {
width = G_00A004_WIDTH_LO(md->metadata[3]) +
(G_00A008_WIDTH_HI(md->metadata[4]) << 2) + 1;
- height = S_00A008_HEIGHT(md->metadata[4]) + 1;
+ height = G_00A008_HEIGHT(md->metadata[4]) + 1;
} else {
width = G_008F18_WIDTH(md->metadata[4]) + 1;
height = G_008F18_HEIGHT(md->metadata[4]) + 1;
return VK_SUCCESS;
}
-static int
-radv_init_surface(struct radv_device *device,
- const struct radv_image *image,
- struct radeon_surf *surface,
- unsigned plane_id,
- const VkImageCreateInfo *pCreateInfo,
- VkFormat image_format)
+static uint32_t
+radv_get_surface_flags(struct radv_device *device,
+ const struct radv_image *image,
+ unsigned plane_id,
+ const VkImageCreateInfo *pCreateInfo,
+ VkFormat image_format)
{
+ uint32_t flags;
unsigned array_mode = radv_choose_tiling(device, pCreateInfo, image_format);
VkFormat format = vk_format_get_plane_format(image_format, plane_id);
const struct vk_format_description *desc = vk_format_description(format);
is_depth = vk_format_has_depth(desc);
is_stencil = vk_format_has_stencil(desc);
- surface->blk_w = vk_format_get_blockwidth(format);
- surface->blk_h = vk_format_get_blockheight(format);
- surface->bpe = vk_format_get_blocksize(vk_format_depth_only(format));
- /* align byte per element on dword */
- if (surface->bpe == 3) {
- surface->bpe = 4;
- }
-
- surface->flags = RADEON_SURF_SET(array_mode, MODE);
+ flags = RADEON_SURF_SET(array_mode, MODE);
switch (pCreateInfo->imageType){
case VK_IMAGE_TYPE_1D:
if (pCreateInfo->arrayLayers > 1)
- surface->flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_1D_ARRAY, TYPE);
+ flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_1D_ARRAY, TYPE);
else
- surface->flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_1D, TYPE);
+ flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_1D, TYPE);
break;
case VK_IMAGE_TYPE_2D:
if (pCreateInfo->arrayLayers > 1)
- surface->flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_2D_ARRAY, TYPE);
+ flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_2D_ARRAY, TYPE);
else
- surface->flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_2D, TYPE);
+ flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_2D, TYPE);
break;
case VK_IMAGE_TYPE_3D:
- surface->flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_3D, TYPE);
+ flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_3D, TYPE);
break;
default:
unreachable("unhandled image type");
}
/* Required for clearing/initializing a specific layer on GFX8. */
- surface->flags |= RADEON_SURF_CONTIGUOUS_DCC_LAYERS;
+ flags |= RADEON_SURF_CONTIGUOUS_DCC_LAYERS;
if (is_depth) {
- surface->flags |= RADEON_SURF_ZBUFFER;
+ flags |= RADEON_SURF_ZBUFFER;
if (!radv_use_htile_for_image(device, image) ||
(device->instance->debug_flags & RADV_DEBUG_NO_HIZ))
- surface->flags |= RADEON_SURF_NO_HTILE;
+ flags |= RADEON_SURF_NO_HTILE;
if (radv_use_tc_compat_htile_for_image(device, pCreateInfo, image_format))
- surface->flags |= RADEON_SURF_TC_COMPATIBLE_HTILE;
+ flags |= RADEON_SURF_TC_COMPATIBLE_HTILE;
}
if (is_stencil)
- surface->flags |= RADEON_SURF_SBUFFER;
+ flags |= RADEON_SURF_SBUFFER;
if (device->physical_device->rad_info.chip_class >= GFX9 &&
pCreateInfo->imageType == VK_IMAGE_TYPE_3D &&
vk_format_get_blocksizebits(image_format) == 128 &&
vk_format_is_compressed(image_format))
- surface->flags |= RADEON_SURF_NO_RENDER_TARGET;
+ flags |= RADEON_SURF_NO_RENDER_TARGET;
if (!radv_use_dcc_for_image(device, image, pCreateInfo, image_format))
- surface->flags |= RADEON_SURF_DISABLE_DCC;
+ flags |= RADEON_SURF_DISABLE_DCC;
if (!radv_use_fmask_for_image(device, image))
- surface->flags |= RADEON_SURF_NO_FMASK;
+ flags |= RADEON_SURF_NO_FMASK;
- return 0;
+ return flags;
}
static inline unsigned
}
}
+
+static void
+radv_image_reset_layout(struct radv_image *image)
+{
+ image->size = 0;
+ image->alignment = 1;
+
+ image->tc_compatible_cmask = image->tc_compatible_htile = 0;
+ image->fce_pred_offset = image->dcc_pred_offset = 0;
+ image->clear_value_offset = image->tc_compat_zrange_offset = 0;
+
+ for (unsigned i = 0; i < image->plane_count; ++i) {
+ VkFormat format = vk_format_get_plane_format(image->vk_format, i);
+
+ uint32_t flags = image->planes[i].surface.flags;
+ memset(image->planes + i, 0, sizeof(image->planes[i]));
+
+ image->planes[i].surface.flags = flags;
+ image->planes[i].surface.blk_w = vk_format_get_blockwidth(format);
+ image->planes[i].surface.blk_h = vk_format_get_blockheight(format);
+ image->planes[i].surface.bpe = vk_format_get_blocksize(vk_format_depth_only(format));
+
+ /* align byte per element on dword */
+ if (image->planes[i].surface.bpe == 3) {
+ image->planes[i].surface.bpe = 4;
+ }
+ }
+}
+
VkResult
radv_image_create_layout(struct radv_device *device,
struct radv_image_create_info create_info,
struct radv_image *image)
{
- /* Check that we did not initialize things earlier */
- assert(!image->planes[0].surface.surf_size);
-
/* Clear the pCreateInfo pointer so we catch issues in the delayed case when we test in the
* common internal case. */
create_info.vk_info = NULL;
if (result != VK_SUCCESS)
return result;
- image->size = 0;
- image->alignment = 1;
+ radv_image_reset_layout(image);
+
for (unsigned plane = 0; plane < image->plane_count; ++plane) {
struct ac_surf_info info = image_info;
}
for (unsigned plane = 0; plane < image->plane_count; ++plane) {
- radv_init_surface(device, image, &image->planes[plane].surface, plane, pCreateInfo, format);
+ image->planes[plane].surface.flags =
+ radv_get_surface_flags(device, image, plane, pCreateInfo, format);
}
bool delay_layout = external_info &&
bool in_render_loop,
unsigned queue_mask)
{
- return layout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+ return layout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL &&
+ queue_mask == (1u << RADV_QUEUE_GENERAL);
}
bool radv_layout_dcc_compressed(const struct radv_device *device,
projects / mesa.git / blobdiff