KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zink: fix surface creation for cube slices 

if first==last layer, this should be a 2D slice of the cube

else if this isn't all the layers, this should be an array of slices

fixes a bunch of spec@arb_shader_image_size@builtin cases

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9080>
This commit is contained in:
Mike Blumenkrantz 2021-02-16 22:20:08 -05:00 committed by Marge Bot
parent 44f76d5fc7
commit 0a6b8685aa
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gallium/drivers/zink/zink_surface.c
View File

@ -107,10 +107,16 @@ zink_create_surface(struct pipe_context *pctx,
ivci.subresourceRange.levelCount = 1;
ivci.subresourceRange.baseArrayLayer = templ->u.tex.first_layer;
ivci.subresourceRange.layerCount = 1 + templ->u.tex.last_layer - templ->u.tex.first_layer;
if (pres->target == PIPE_TEXTURE_CUBE ||
pres->target == PIPE_TEXTURE_CUBE_ARRAY)
ivci.subresourceRange.layerCount *= 6;
if (ivci.viewType == VK_IMAGE_VIEW_TYPE_CUBE || ivci.viewType == VK_IMAGE_VIEW_TYPE_CUBE_ARRAY) {
if (templ->u.tex.first_layer == templ->u.tex.last_layer)
ivci.viewType = VK_IMAGE_VIEW_TYPE_2D;
else if (ivci.viewType == VK_IMAGE_VIEW_TYPE_CUBE_ARRAY &&
templ->u.tex.first_layer % 6 == 0 &&
ivci.subresourceRange.layerCount % 6 == 0)
ivci.viewType = VK_IMAGE_VIEW_TYPE_CUBE;
else if (templ->u.tex.first_layer || ivci.subresourceRange.layerCount != res->base.array_size)
ivci.viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY;
}
if (vkCreateImageView(screen->dev, &ivci, NULL,
&surface->image_view) != VK_SUCCESS) {