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

anv/blit2d: Copy with stencil sources when needed

Browse source 
In the next patch, ISL will unconditionally perform verification of a
surface's tiling and usage. Since it will require that w-tiled images
be stencil buffers, create a stencil surface to copy from a
w-tiled/stencil surface.

Signed-off-by: Nanley Chery <nanley.g.chery@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Nanley Chery 2016-06-27 15:24:36 -07:00
parent 1ef80b26d7
commit e179fee049
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/intel/vulkan/anv_meta_blit2d.c
View file

@ -105,7 +105,9 @@ create_iview(struct anv_cmd_buffer *cmd_buffer,
const VkImageCreateInfo image_info = {
.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
.imageType = VK_IMAGE_TYPE_2D,
.format = vk_format_for_size(surf->bs),
/* W-tiled images must be stencil-formatted. */
.format = surf->tiling == ISL_TILING_W ?
VK_FORMAT_S8_UINT : vk_format_for_size(surf->bs),
.extent = {
.width = width,
.height = height,
@ -140,7 +142,7 @@ create_iview(struct anv_cmd_buffer *cmd_buffer,
.viewType = VK_IMAGE_VIEW_TYPE_2D,
.format = image_info.format,
.subresourceRange = {
.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
.aspectMask = anv_image_from_handle(*img)->aspects,
.baseMipLevel = 0,
.levelCount = 1,
.baseArrayLayer = 0,
@ -177,7 +179,16 @@ blit2d_bind_src(struct anv_cmd_buffer *cmd_buffer,
rect->src_x, rect->src_y,
&offset, &rect->src_x, &rect->src_y);
create_iview(cmd_buffer, src, offset, VK_IMAGE_USAGE_SAMPLED_BIT,
VkImageUsageFlags usage = VK_IMAGE_USAGE_SAMPLED_BIT;
/* W-tiled images must be stencil-formatted. Outside of meta,
* a stencil image has this usage bit set. Adding it here
* ensures the ISL surface is created correctly.
*/
if (src->tiling == ISL_TILING_W)
usage |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
create_iview(cmd_buffer, src, offset, usage,
rect->src_x + rect->width, rect->src_y + rect->height,
&tmp->image, &tmp->iview);