wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d: Use VK_COMPONENT_SWIZZLE_IDENTITY in vkd3d_set_view_swizzle_for_format().

Browse Source 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-05-29 12:50:33 +02:00 committed by Alexandre Julliard
parent a5808cfdd7
commit 265ce37014
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/vkd3d/resource.c
View File

@ -999,6 +999,11 @@ static bool vkd3d_create_buffer_view(struct d3d12_device *device,
static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components,
const struct vkd3d_format *format, bool allowed_swizzle) const struct vkd3d_format *format, bool allowed_swizzle)
{ {
components->r = VK_COMPONENT_SWIZZLE_IDENTITY;
components->g = VK_COMPONENT_SWIZZLE_IDENTITY;
components->b = VK_COMPONENT_SWIZZLE_IDENTITY;
components->a = VK_COMPONENT_SWIZZLE_IDENTITY;
if (format->vk_aspect_mask == VK_IMAGE_ASPECT_STENCIL_BIT) if (format->vk_aspect_mask == VK_IMAGE_ASPECT_STENCIL_BIT)
{ {
if (allowed_swizzle) if (allowed_swizzle)
@ -1007,7 +1012,6 @@ static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components,
components->g = VK_COMPONENT_SWIZZLE_R; components->g = VK_COMPONENT_SWIZZLE_R;
components->b = VK_COMPONENT_SWIZZLE_ZERO; components->b = VK_COMPONENT_SWIZZLE_ZERO;
components->a = VK_COMPONENT_SWIZZLE_ZERO; components->a = VK_COMPONENT_SWIZZLE_ZERO;
return;
} }
else else
{ {
@ -1024,18 +1028,12 @@ static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components,
components->g = VK_COMPONENT_SWIZZLE_ZERO; components->g = VK_COMPONENT_SWIZZLE_ZERO;
components->b = VK_COMPONENT_SWIZZLE_ZERO; components->b = VK_COMPONENT_SWIZZLE_ZERO;
components->a = VK_COMPONENT_SWIZZLE_R; components->a = VK_COMPONENT_SWIZZLE_R;
return;
} }
else else
{ {
FIXME("Alpha swizzle is not supported.\n"); FIXME("Alpha swizzle is not supported.\n");
} }
} }
components->r = VK_COMPONENT_SWIZZLE_R;
components->g = VK_COMPONENT_SWIZZLE_G;
components->b = VK_COMPONENT_SWIZZLE_B;
components->a = VK_COMPONENT_SWIZZLE_A;
} }
static VkResult vkd3d_create_texture_view(struct d3d12_device *device, static VkResult vkd3d_create_texture_view(struct d3d12_device *device,