#include "tu_cs.h"
+static uint32_t
+tu6_plane_count(VkFormat format)
+{
+ switch (format) {
+ default:
+ return 1;
+ case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM:
+ return 2;
+ case VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM:
+ return 3;
+ }
+}
+
+static VkFormat
+tu6_plane_format(VkFormat format, uint32_t plane)
+{
+ switch (format) {
+ case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM:
+ /* note: with UBWC, and Y plane UBWC is different from R8_UNORM */
+ return plane ? VK_FORMAT_R8G8_UNORM : VK_FORMAT_R8_UNORM;
+ case VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM:
+ return VK_FORMAT_R8_UNORM;
+ default:
+ return format;
+ }
+}
+
+static uint32_t
+tu6_plane_index(VkImageAspectFlags aspect_mask)
+{
+ switch (aspect_mask) {
+ default:
+ return 0;
+ case VK_IMAGE_ASPECT_PLANE_1_BIT:
+ return 1;
+ case VK_IMAGE_ASPECT_PLANE_2_BIT:
+ return 2;
+ }
+}
+
VkResult
tu_image_create(VkDevice _device,
const VkImageCreateInfo *pCreateInfo,
const VkAllocationCallbacks *alloc,
VkImage *pImage,
- uint64_t modifier)
+ uint64_t modifier,
+ const VkSubresourceLayout *plane_layouts)
{
TU_FROM_HANDLE(tu_device, device, _device);
struct tu_image *image = NULL;
assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO);
- tu_assert(pCreateInfo->mipLevels > 0);
- tu_assert(pCreateInfo->arrayLayers > 0);
- tu_assert(pCreateInfo->samples > 0);
- tu_assert(pCreateInfo->extent.width > 0);
- tu_assert(pCreateInfo->extent.height > 0);
- tu_assert(pCreateInfo->extent.depth > 0);
+ assert(pCreateInfo->mipLevels > 0);
+ assert(pCreateInfo->arrayLayers > 0);
+ assert(pCreateInfo->samples > 0);
+ assert(pCreateInfo->extent.width > 0);
+ assert(pCreateInfo->extent.height > 0);
+ assert(pCreateInfo->extent.depth > 0);
image = vk_zalloc2(&device->alloc, alloc, sizeof(*image), 8,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
vk_find_struct_const(pCreateInfo->pNext,
EXTERNAL_MEMORY_IMAGE_CREATE_INFO) != NULL;
- image->layout.tile_mode = TILE6_3;
+ enum a6xx_tile_mode tile_mode = TILE6_3;
bool ubwc_enabled =
!(device->physical_device->instance->debug_flags & TU_DEBUG_NOUBWC);
- /* disable tiling when linear is requested and for compressed formats */
+ /* disable tiling when linear is requested, for YUYV/UYVY, and for mutable
+ * images. Mutable images can be reinterpreted as any other compatible
+ * format, including swapped formats which aren't supported with tiling.
+ * This means that we have to fall back to linear almost always. However
+ * depth and stencil formats cannot be reintepreted as another format, and
+ * cannot be linear with sysmem rendering, so don't fall back for those.
+ *
+ * TODO: Be smarter and use usage bits and VK_KHR_image_format_list to
+ * enable tiling and/or UBWC when possible.
+ */
if (pCreateInfo->tiling == VK_IMAGE_TILING_LINEAR ||
- modifier == DRM_FORMAT_MOD_LINEAR) {
- image->layout.tile_mode = TILE6_LINEAR;
+ modifier == DRM_FORMAT_MOD_LINEAR ||
+ vk_format_description(image->vk_format)->layout == UTIL_FORMAT_LAYOUT_SUBSAMPLED ||
+ (pCreateInfo->flags & VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT &&
+ !vk_format_is_depth_or_stencil(image->vk_format))) {
+ tile_mode = TILE6_LINEAR;
ubwc_enabled = false;
}
+ /* UBWC is supported for these formats, but NV12 has a special UBWC
+ * format for accessing the Y plane aspect, which isn't implemented
+ * For IYUV, the blob doesn't use UBWC, but it seems to work, but
+ * disable it since we don't know if a special UBWC format is needed
+ * like NV12
+ */
+ if (image->vk_format == VK_FORMAT_G8_B8R8_2PLANE_420_UNORM ||
+ image->vk_format == VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM)
+ ubwc_enabled = false;
+
/* don't use UBWC with compressed formats */
if (vk_format_is_compressed(image->vk_format))
ubwc_enabled = false;
if (image->usage & VK_IMAGE_USAGE_STORAGE_BIT)
ubwc_enabled = false;
- uint32_t ubwc_blockwidth, ubwc_blockheight;
- fdl6_get_ubwc_blockwidth(&image->layout,
- &ubwc_blockwidth, &ubwc_blockheight);
- if (!ubwc_blockwidth) {
- tu_finishme("UBWC for cpp=%d", image->layout.cpp);
- ubwc_enabled = false;
- }
-
/* expect UBWC enabled if we asked for it */
assert(modifier != DRM_FORMAT_MOD_QCOM_COMPRESSED || ubwc_enabled);
- image->layout.ubwc = ubwc_enabled;
+ for (uint32_t i = 0; i < tu6_plane_count(image->vk_format); i++) {
+ struct fdl_layout *layout = &image->layout[i];
+ VkFormat format = tu6_plane_format(image->vk_format, i);
+ uint32_t width0 = pCreateInfo->extent.width;
+ uint32_t height0 = pCreateInfo->extent.height;
+
+ if (i > 0) {
+ switch (image->vk_format) {
+ case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM:
+ case VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM:
+ /* half width/height on chroma planes */
+ width0 = (width0 + 1) >> 1;
+ height0 = (height0 + 1) >> 1;
+ break;
+ default:
+ break;
+ }
+ }
+
+ struct fdl_slice plane_layout;
+
+ if (plane_layouts) {
+ /* only expect simple 2D images for now */
+ if (pCreateInfo->mipLevels != 1 ||
+ pCreateInfo->arrayLayers != 1 ||
+ image->extent.depth != 1)
+ goto invalid_layout;
+
+ plane_layout.offset = plane_layouts[i].offset;
+ plane_layout.pitch = plane_layouts[i].rowPitch;
+ /* note: use plane_layouts[0].arrayPitch to support array formats */
+ }
+
+ layout->tile_mode = tile_mode;
+ layout->ubwc = ubwc_enabled;
+
+ if (!fdl6_layout(layout, vk_format_to_pipe_format(format),
+ image->samples,
+ width0, height0,
+ pCreateInfo->extent.depth,
+ pCreateInfo->mipLevels,
+ pCreateInfo->arrayLayers,
+ pCreateInfo->imageType == VK_IMAGE_TYPE_3D,
+ plane_layouts ? &plane_layout : NULL)) {
+ assert(plane_layouts); /* can only fail with explicit layout */
+ goto invalid_layout;
+ }
+
+ /* fdl6_layout can't take explicit offset without explicit pitch
+ * add offset manually for extra layouts for planes
+ */
+ if (!plane_layouts && i > 0) {
+ uint32_t offset = ALIGN_POT(image->total_size, 4096);
+ for (int i = 0; i < pCreateInfo->mipLevels; i++) {
+ layout->slices[i].offset += offset;
+ layout->ubwc_slices[i].offset += offset;
+ }
+ layout->size += offset;
+ }
- fdl6_layout(&image->layout, vk_format_to_pipe_format(image->vk_format),
- image->samples,
- pCreateInfo->extent.width,
- pCreateInfo->extent.height,
- pCreateInfo->extent.depth,
- pCreateInfo->mipLevels,
- pCreateInfo->arrayLayers,
- pCreateInfo->imageType == VK_IMAGE_TYPE_3D);
+ image->total_size = MAX2(image->total_size, layout->size);
+ }
*pImage = tu_image_to_handle(image);
return VK_SUCCESS;
+
+invalid_layout:
+ vk_free2(&device->alloc, alloc, image);
+ return vk_error(device->instance, VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT);
}
-enum a6xx_tex_fetchsize
-tu6_fetchsize(VkFormat format)
+static void
+compose_swizzle(unsigned char *swiz, const VkComponentMapping *mapping)
{
- switch (vk_format_get_blocksize(format)) {
- case 1: return TFETCH6_1_BYTE;
- case 2: return TFETCH6_2_BYTE;
- case 4: return TFETCH6_4_BYTE;
- case 8: return TFETCH6_8_BYTE;
- case 16: return TFETCH6_16_BYTE;
- default:
- unreachable("bad block size");
+ unsigned char src_swiz[4] = { swiz[0], swiz[1], swiz[2], swiz[3] };
+ VkComponentSwizzle vk_swiz[4] = {
+ mapping->r, mapping->g, mapping->b, mapping->a
+ };
+ for (int i = 0; i < 4; i++) {
+ switch (vk_swiz[i]) {
+ case VK_COMPONENT_SWIZZLE_IDENTITY:
+ swiz[i] = src_swiz[i];
+ break;
+ case VK_COMPONENT_SWIZZLE_R...VK_COMPONENT_SWIZZLE_A:
+ swiz[i] = src_swiz[vk_swiz[i] - VK_COMPONENT_SWIZZLE_R];
+ break;
+ case VK_COMPONENT_SWIZZLE_ZERO:
+ swiz[i] = A6XX_TEX_ZERO;
+ break;
+ case VK_COMPONENT_SWIZZLE_ONE:
+ swiz[i] = A6XX_TEX_ONE;
+ break;
+ default:
+ unreachable("unexpected swizzle");
+ }
}
}
static uint32_t
tu6_texswiz(const VkComponentMapping *comps,
+ const struct tu_sampler_ycbcr_conversion *conversion,
VkFormat format,
VkImageAspectFlagBits aspect_mask)
{
- unsigned char swiz[4] = {comps->r, comps->g, comps->b, comps->a};
- unsigned char vk_swizzle[] = {
- [VK_COMPONENT_SWIZZLE_ZERO] = A6XX_TEX_ZERO,
- [VK_COMPONENT_SWIZZLE_ONE] = A6XX_TEX_ONE,
- [VK_COMPONENT_SWIZZLE_R] = A6XX_TEX_X,
- [VK_COMPONENT_SWIZZLE_G] = A6XX_TEX_Y,
- [VK_COMPONENT_SWIZZLE_B] = A6XX_TEX_Z,
- [VK_COMPONENT_SWIZZLE_A] = A6XX_TEX_W,
+ unsigned char swiz[4] = {
+ A6XX_TEX_X, A6XX_TEX_Y, A6XX_TEX_Z, A6XX_TEX_W,
};
- const unsigned char *fmt_swiz = vk_format_description(format)->swizzle;
-
- for (unsigned i = 0; i < 4; i++) {
- swiz[i] = (swiz[i] == VK_COMPONENT_SWIZZLE_IDENTITY) ? i : vk_swizzle[swiz[i]];
- /* if format has 0/1 in channel, use that (needed for bc1_rgb) */
- if (swiz[i] < 4) {
- if (aspect_mask == VK_IMAGE_ASPECT_STENCIL_BIT &&
- format == VK_FORMAT_D24_UNORM_S8_UINT)
- swiz[i] = A6XX_TEX_Y;
- switch (fmt_swiz[swiz[i]]) {
- case PIPE_SWIZZLE_0: swiz[i] = A6XX_TEX_ZERO; break;
- case PIPE_SWIZZLE_1: swiz[i] = A6XX_TEX_ONE; break;
- }
+
+ switch (format) {
+ case VK_FORMAT_G8B8G8R8_422_UNORM:
+ case VK_FORMAT_B8G8R8G8_422_UNORM:
+ case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM:
+ case VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM:
+ swiz[0] = A6XX_TEX_Z;
+ swiz[1] = A6XX_TEX_X;
+ swiz[2] = A6XX_TEX_Y;
+ break;
+ case VK_FORMAT_BC1_RGB_UNORM_BLOCK:
+ case VK_FORMAT_BC1_RGB_SRGB_BLOCK:
+ /* same hardware format is used for BC1_RGB / BC1_RGBA */
+ swiz[3] = A6XX_TEX_ONE;
+ break;
+ case VK_FORMAT_D24_UNORM_S8_UINT:
+ /* for D24S8, stencil is in the 2nd channel of the hardware format */
+ if (aspect_mask == VK_IMAGE_ASPECT_STENCIL_BIT) {
+ swiz[0] = A6XX_TEX_Y;
+ swiz[1] = A6XX_TEX_ZERO;
}
+ default:
+ break;
}
+ compose_swizzle(swiz, comps);
+ if (conversion)
+ compose_swizzle(swiz, &conversion->components);
+
return A6XX_TEX_CONST_0_SWIZ_X(swiz[0]) |
A6XX_TEX_CONST_0_SWIZ_Y(swiz[1]) |
A6XX_TEX_CONST_0_SWIZ_Z(swiz[2]) |
A6XX_TEX_CONST_0_SWIZ_W(swiz[3]);
}
-static enum a6xx_tex_type
-tu6_tex_type(VkImageViewType type)
-{
- switch (type) {
- default:
- case VK_IMAGE_VIEW_TYPE_1D:
- case VK_IMAGE_VIEW_TYPE_1D_ARRAY:
- return A6XX_TEX_1D;
- case VK_IMAGE_VIEW_TYPE_2D:
- case VK_IMAGE_VIEW_TYPE_2D_ARRAY:
- return A6XX_TEX_2D;
- case VK_IMAGE_VIEW_TYPE_3D:
- return A6XX_TEX_3D;
- case VK_IMAGE_VIEW_TYPE_CUBE:
- case VK_IMAGE_VIEW_TYPE_CUBE_ARRAY:
- return A6XX_TEX_CUBE;
- }
-}
-
void
tu_cs_image_ref(struct tu_cs *cs, const struct tu_image_view *iview, uint32_t layer)
{
VkFormat format = pCreateInfo->format;
VkImageAspectFlagBits aspect_mask = pCreateInfo->subresourceRange.aspectMask;
+ const struct VkSamplerYcbcrConversionInfo *ycbcr_conversion =
+ vk_find_struct_const(pCreateInfo->pNext, SAMPLER_YCBCR_CONVERSION_INFO);
+ const struct tu_sampler_ycbcr_conversion *conversion = ycbcr_conversion ?
+ tu_sampler_ycbcr_conversion_from_handle(ycbcr_conversion->conversion) : NULL;
+
switch (image->type) {
case VK_IMAGE_TYPE_1D:
case VK_IMAGE_TYPE_2D:
memset(iview->descriptor, 0, sizeof(iview->descriptor));
- struct fdl_layout *layout = &image->layout;
+ struct fdl_layout *layout = &image->layout[tu6_plane_index(aspect_mask)];
- uint32_t width = u_minify(image->extent.width, range->baseMipLevel);
- uint32_t height = u_minify(image->extent.height, range->baseMipLevel);
- uint32_t depth = tu_get_layerCount(image, range);
- switch (pCreateInfo->viewType) {
- case VK_IMAGE_VIEW_TYPE_3D:
- depth = u_minify(image->extent.depth, range->baseMipLevel);
- break;
- case VK_IMAGE_VIEW_TYPE_CUBE:
- case VK_IMAGE_VIEW_TYPE_CUBE_ARRAY:
+ uint32_t width = u_minify(layout->width0, range->baseMipLevel);
+ uint32_t height = u_minify(layout->height0, range->baseMipLevel);
+ uint32_t storage_depth = tu_get_layerCount(image, range);
+ if (pCreateInfo->viewType == VK_IMAGE_VIEW_TYPE_3D) {
+ storage_depth = u_minify(image->extent.depth, range->baseMipLevel);
+ }
+
+ uint32_t depth = storage_depth;
+ if (pCreateInfo->viewType == VK_IMAGE_VIEW_TYPE_CUBE ||
+ pCreateInfo->viewType == VK_IMAGE_VIEW_TYPE_CUBE_ARRAY) {
+ /* Cubes are treated as 2D arrays for storage images, so only divide the
+ * depth by 6 for the texture descriptor.
+ */
depth /= 6;
- break;
- default:
- break;
- }
+ }
uint64_t base_addr = image->bo->iova + image->bo_offset +
fdl_surface_offset(layout, range->baseMipLevel, range->baseArrayLayer);
A6XX_TEX_CONST_0_FMT(fmt_tex) |
A6XX_TEX_CONST_0_SAMPLES(tu_msaa_samples(image->samples)) |
A6XX_TEX_CONST_0_SWAP(fmt.swap) |
- tu6_texswiz(&pCreateInfo->components, format, aspect_mask) |
+ tu6_texswiz(&pCreateInfo->components, conversion, format, aspect_mask) |
A6XX_TEX_CONST_0_MIPLVLS(tu_get_levelCount(image, range) - 1);
iview->descriptor[1] = A6XX_TEX_CONST_1_WIDTH(width) | A6XX_TEX_CONST_1_HEIGHT(height);
iview->descriptor[2] =
- A6XX_TEX_CONST_2_FETCHSIZE(tu6_fetchsize(format)) |
+ A6XX_TEX_CONST_2_PITCHALIGN(layout->pitchalign) |
A6XX_TEX_CONST_2_PITCH(pitch) |
- A6XX_TEX_CONST_2_TYPE(tu6_tex_type(pCreateInfo->viewType));
+ A6XX_TEX_CONST_2_TYPE(tu6_tex_type(pCreateInfo->viewType, false));
iview->descriptor[3] = A6XX_TEX_CONST_3_ARRAY_PITCH(layer_size);
iview->descriptor[4] = base_addr;
iview->descriptor[5] = (base_addr >> 32) | A6XX_TEX_CONST_5_DEPTH(depth);
+ if (format == VK_FORMAT_G8_B8R8_2PLANE_420_UNORM ||
+ format == VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM) {
+ /* chroma offset re-uses MIPLVLS bits */
+ assert(tu_get_levelCount(image, range) == 1);
+ if (conversion) {
+ if (conversion->chroma_offsets[0] == VK_CHROMA_LOCATION_MIDPOINT)
+ iview->descriptor[0] |= A6XX_TEX_CONST_0_CHROMA_MIDPOINT_X;
+ if (conversion->chroma_offsets[1] == VK_CHROMA_LOCATION_MIDPOINT)
+ iview->descriptor[0] |= A6XX_TEX_CONST_0_CHROMA_MIDPOINT_Y;
+ }
+
+ uint64_t base_addr[3];
+
+ iview->descriptor[3] |= A6XX_TEX_CONST_3_TILE_ALL;
+ if (ubwc_enabled) {
+ iview->descriptor[3] |= A6XX_TEX_CONST_3_FLAG;
+ /* no separate ubwc base, image must have the expected layout */
+ for (uint32_t i = 0; i < 3; i++) {
+ base_addr[i] = image->bo->iova + image->bo_offset +
+ fdl_ubwc_offset(&image->layout[i], range->baseMipLevel, range->baseArrayLayer);
+ }
+ } else {
+ for (uint32_t i = 0; i < 3; i++) {
+ base_addr[i] = image->bo->iova + image->bo_offset +
+ fdl_surface_offset(&image->layout[i], range->baseMipLevel, range->baseArrayLayer);
+ }
+ }
+
+ iview->descriptor[4] = base_addr[0];
+ iview->descriptor[5] |= base_addr[0] >> 32;
+ iview->descriptor[6] =
+ A6XX_TEX_CONST_6_PLANE_PITCH(image->layout[1].slices[range->baseMipLevel].pitch);
+ iview->descriptor[7] = base_addr[1];
+ iview->descriptor[8] = base_addr[1] >> 32;
+ iview->descriptor[9] = base_addr[2];
+ iview->descriptor[10] = base_addr[2] >> 32;
+
+ assert(pCreateInfo->viewType != VK_IMAGE_VIEW_TYPE_3D);
+ assert(!(image->usage & VK_IMAGE_USAGE_STORAGE_BIT));
+ return;
+ }
+
if (ubwc_enabled) {
uint32_t block_width, block_height;
- fdl6_get_ubwc_blockwidth(&image->layout,
- &block_width, &block_height);
+ fdl6_get_ubwc_blockwidth(layout, &block_width, &block_height);
iview->descriptor[3] |= A6XX_TEX_CONST_3_FLAG | A6XX_TEX_CONST_3_TILE_ALL;
iview->descriptor[7] = ubwc_addr;
if (pCreateInfo->viewType == VK_IMAGE_VIEW_TYPE_3D) {
iview->descriptor[3] |=
- A6XX_TEX_CONST_3_MIN_LAYERSZ(image->layout.slices[image->level_count - 1].size0);
+ A6XX_TEX_CONST_3_MIN_LAYERSZ(layout->slices[image->level_count - 1].size0);
}
iview->SP_PS_2D_SRC_INFO = A6XX_SP_PS_2D_SRC_INFO(
A6XX_IBO_1_HEIGHT(height);
iview->storage_descriptor[2] =
A6XX_IBO_2_PITCH(pitch) |
- A6XX_IBO_2_TYPE(tu6_tex_type(pCreateInfo->viewType));
+ A6XX_IBO_2_TYPE(tu6_tex_type(pCreateInfo->viewType, true));
iview->storage_descriptor[3] = A6XX_IBO_3_ARRAY_PITCH(layer_size);
iview->storage_descriptor[4] = base_addr;
- iview->storage_descriptor[5] = (base_addr >> 32) | A6XX_IBO_5_DEPTH(depth);
+ iview->storage_descriptor[5] = (base_addr >> 32) | A6XX_IBO_5_DEPTH(storage_depth);
if (ubwc_enabled) {
iview->storage_descriptor[3] |= A6XX_IBO_3_FLAG | A6XX_IBO_3_UNK27;
.flags = ubwc_enabled).value;
}
-unsigned
-tu_image_queue_family_mask(const struct tu_image *image,
- uint32_t family,
- uint32_t queue_family)
-{
- if (!image->exclusive)
- return image->queue_family_mask;
- if (family == VK_QUEUE_FAMILY_EXTERNAL)
- return (1u << TU_MAX_QUEUE_FAMILIES) - 1u;
- if (family == VK_QUEUE_FAMILY_IGNORED)
- return 1u << queue_family;
- return 1u << family;
-}
-
VkResult
tu_CreateImage(VkDevice device,
const VkImageCreateInfo *pCreateInfo,
#endif
uint64_t modifier = DRM_FORMAT_MOD_INVALID;
+ const VkSubresourceLayout *plane_layouts = NULL;
+
if (pCreateInfo->tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) {
const VkImageDrmFormatModifierListCreateInfoEXT *mod_info =
vk_find_struct_const(pCreateInfo->pNext,
IMAGE_DRM_FORMAT_MODIFIER_LIST_CREATE_INFO_EXT);
+ const VkImageDrmFormatModifierExplicitCreateInfoEXT *drm_explicit_info =
+ vk_find_struct_const(pCreateInfo->pNext,
+ IMAGE_DRM_FORMAT_MODIFIER_EXPLICIT_CREATE_INFO_EXT);
+
+ assert(mod_info || drm_explicit_info);
- modifier = DRM_FORMAT_MOD_LINEAR;
- for (unsigned i = 0; i < mod_info->drmFormatModifierCount; i++) {
- if (mod_info->pDrmFormatModifiers[i] == DRM_FORMAT_MOD_QCOM_COMPRESSED)
- modifier = DRM_FORMAT_MOD_QCOM_COMPRESSED;
+ if (mod_info) {
+ modifier = DRM_FORMAT_MOD_LINEAR;
+ for (unsigned i = 0; i < mod_info->drmFormatModifierCount; i++) {
+ if (mod_info->pDrmFormatModifiers[i] == DRM_FORMAT_MOD_QCOM_COMPRESSED)
+ modifier = DRM_FORMAT_MOD_QCOM_COMPRESSED;
+ }
+ } else {
+ modifier = drm_explicit_info->drmFormatModifier;
+ assert(modifier == DRM_FORMAT_MOD_LINEAR ||
+ modifier == DRM_FORMAT_MOD_QCOM_COMPRESSED);
+ plane_layouts = drm_explicit_info->pPlaneLayouts;
}
} else {
const struct wsi_image_create_info *wsi_info =
modifier = DRM_FORMAT_MOD_LINEAR;
}
- return tu_image_create(device, pCreateInfo, pAllocator, pImage, modifier);
+ return tu_image_create(device, pCreateInfo, pAllocator, pImage, modifier, plane_layouts);
}
void
{
TU_FROM_HANDLE(tu_image, image, _image);
- const struct fdl_slice *slice = image->layout.slices + pSubresource->mipLevel;
+ struct fdl_layout *layout =
+ &image->layout[tu6_plane_index(pSubresource->aspectMask)];
+ const struct fdl_slice *slice = layout->slices + pSubresource->mipLevel;
- pLayout->offset = fdl_surface_offset(&image->layout,
- pSubresource->mipLevel,
- pSubresource->arrayLayer);
+ pLayout->offset =
+ fdl_surface_offset(layout, pSubresource->mipLevel, pSubresource->arrayLayer);
pLayout->size = slice->size0;
- pLayout->rowPitch =
- slice->pitch * vk_format_get_blockheight(image->vk_format);
- pLayout->arrayPitch = image->layout.layer_size;
+ pLayout->rowPitch = slice->pitch;
+ pLayout->arrayPitch = fdl_layer_stride(layout, pSubresource->mipLevel);
pLayout->depthPitch = slice->size0;
- if (image->layout.ubwc_layer_size) {
+ if (fdl_ubwc_enabled(layout, pSubresource->mipLevel)) {
/* UBWC starts at offset 0 */
pLayout->offset = 0;
/* UBWC scanout won't match what the kernel wants if we have levels/layers */
/* TODO invent a modifier for tiled but not UBWC buffers */
- if (!image->layout.tile_mode)
+ if (!image->layout[0].tile_mode)
pProperties->drmFormatModifier = DRM_FORMAT_MOD_LINEAR;
- else if (image->layout.ubwc_layer_size)
+ else if (image->layout[0].ubwc_layer_size)
pProperties->drmFormatModifier = DRM_FORMAT_MOD_QCOM_COMPRESSED;
else
pProperties->drmFormatModifier = DRM_FORMAT_MOD_INVALID;
A6XX_TEX_CONST_0_SWAP(fmt.swap) |
A6XX_TEX_CONST_0_FMT(fmt.fmt) |
A6XX_TEX_CONST_0_MIPLVLS(0) |
- tu6_texswiz(&components, vfmt, VK_IMAGE_ASPECT_COLOR_BIT);
+ tu6_texswiz(&components, NULL, vfmt, VK_IMAGE_ASPECT_COLOR_BIT);
COND(vk_format_is_srgb(vfmt), A6XX_TEX_CONST_0_SRGB);
view->descriptor[1] =
A6XX_TEX_CONST_1_WIDTH(elements & MASK(15)) |
projects / mesa.git / blobdiff