fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 15:48:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

zink: mark 2d-arrays as cube-compatible

Browse source 
OpenGL allows reinterpreting 2D array textures as cubemaps,
so we need to always set the cube-compatible flag for them.

This fixes a piglit test on Lavapipe.

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10913>
This commit is contained in:
Erik Faye-Lund 2021-05-21 10:38:32 +02:00 • committed by Marge Bot
parent 71494c4874
commit 1887ff2ebb
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt
View file

@ -88,7 +88,6 @@ spec@arb_texture_cube_map_array@arb_texture_cube_map_array-sampler-cube-array-sh
spec@arb_texture_float@fbo-blending-formats,Fail spec@arb_texture_float@fbo-blending-formats,Fail
spec@arb_texture_rg@multisample-fast-clear gl_arb_texture_rg-int,Fail spec@arb_texture_rg@multisample-fast-clear gl_arb_texture_rg-int,Fail
spec@arb_texture_view@rendering-formats,Fail spec@arb_texture_view@rendering-formats,Fail
spec@arb_texture_view@sampling-2d-array-as-cubemap-array,Fail
spec@egl 1.4@egl-copy-buffers,Fail spec@egl 1.4@egl-copy-buffers,Fail
spec@egl 1.4@eglterminate then unbind context,Fail spec@egl 1.4@eglterminate then unbind context,Fail
spec@egl_khr_gl_image@egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_component24,Fail spec@egl_khr_gl_image@egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_component24,Fail

3
src/gallium/drivers/zink/zink_resource.c
View file

@ -384,7 +384,8 @@ create_ici(struct zink_screen *screen, const struct pipe_resource *templ, unsign
debug_printf("ZINK: failed to validate image creation\n"); debug_printf("ZINK: failed to validate image creation\n");
if (templ->target == PIPE_TEXTURE_CUBE || if (templ->target == PIPE_TEXTURE_CUBE ||
templ->target == PIPE_TEXTURE_CUBE_ARRAY) { templ->target == PIPE_TEXTURE_CUBE_ARRAY ||
templ->target == PIPE_TEXTURE_2D_ARRAY) {
VkImageFormatProperties props; VkImageFormatProperties props;
if (vkGetPhysicalDeviceImageFormatProperties(screen->pdev, ici.format, if (vkGetPhysicalDeviceImageFormatProperties(screen->pdev, ici.format,
ici.imageType, ici.tiling, ici.imageType, ici.tiling,