From cdfb1d925f388861751ce04a0000141013e1c704 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 10 Jul 2020 14:58:55 -0400 Subject: [PATCH] zink: add last few format maps for ARB_vertex_type_2_10_10_10_rev Reviewed-by: Erik Faye-Lund Part-of: --- docs/features.txt | 2 +- src/gallium/drivers/zink/zink_format.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/features.txt b/docs/features.txt index 2cb672bcf4f..462b9074ea3 100644 --- a/docs/features.txt +++ b/docs/features.txt @@ -108,7 +108,7 @@ GL 3.3, GLSL 3.30 --- all DONE: i965, nv50, nvc0, r600, radeonsi, llvmpipe, soft GL_ARB_texture_swizzle DONE (freedreno, swr, v3d, zink, panfrost) GL_ARB_timer_query DONE (freedreno, swr, zink) GL_ARB_instanced_arrays DONE (freedreno, swr, v3d, panfrost, zink) - GL_ARB_vertex_type_2_10_10_10_rev DONE (freedreno, swr, v3d, panfrost) + GL_ARB_vertex_type_2_10_10_10_rev DONE (freedreno, swr, v3d, panfrost, zink) GL 4.0, GLSL 4.00 --- all DONE: i965/gen7+, nvc0, r600, radeonsi, llvmpipe, virgl diff --git a/src/gallium/drivers/zink/zink_format.c b/src/gallium/drivers/zink/zink_format.c index 556409e0e6f..f161512e9da 100644 --- a/src/gallium/drivers/zink/zink_format.c +++ b/src/gallium/drivers/zink/zink_format.c @@ -91,8 +91,15 @@ static const VkFormat formats[PIPE_FORMAT_COUNT] = { [PIPE_FORMAT_B5G5R5A1_UNORM] = VK_FORMAT_B5G5R5A1_UNORM_PACK16, [PIPE_FORMAT_R11G11B10_FLOAT] = VK_FORMAT_B10G11R11_UFLOAT_PACK32, [PIPE_FORMAT_R9G9B9E5_FLOAT] = VK_FORMAT_E5B9G9R9_UFLOAT_PACK32, + /* ARB_vertex_type_2_10_10_10 */ [PIPE_FORMAT_R10G10B10A2_UNORM] = VK_FORMAT_A2B10G10R10_UNORM_PACK32, + [PIPE_FORMAT_R10G10B10A2_SNORM] = VK_FORMAT_A2B10G10R10_SNORM_PACK32, [PIPE_FORMAT_B10G10R10A2_UNORM] = VK_FORMAT_A2R10G10B10_UNORM_PACK32, + [PIPE_FORMAT_B10G10R10A2_SNORM] = VK_FORMAT_A2B10G10R10_SNORM_PACK32, + [PIPE_FORMAT_R10G10B10A2_USCALED] = VK_FORMAT_A2B10G10R10_USCALED_PACK32, + [PIPE_FORMAT_R10G10B10A2_SSCALED] = VK_FORMAT_A2B10G10R10_SSCALED_PACK32, + [PIPE_FORMAT_B10G10R10A2_USCALED] = VK_FORMAT_A2R10G10B10_USCALED_PACK32, + [PIPE_FORMAT_B10G10R10A2_SSCALED] = VK_FORMAT_A2B10G10R10_SSCALED_PACK32, [PIPE_FORMAT_R10G10B10A2_UINT] = VK_FORMAT_A2B10G10R10_UINT_PACK32, [PIPE_FORMAT_B10G10R10A2_UINT] = VK_FORMAT_A2R10G10B10_UINT_PACK32,