From e0576ec148c0f6269edb5813595273470dab0d28 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Sun, 26 Sep 2021 08:19:21 -0700 Subject: [PATCH] d3d12: Support BGRA 555 and 565 formats Reviewed-by: Bill Kristiansen Part-of: --- .gitlab-ci/windows/quick_gl.txt | 5 ++--- src/gallium/drivers/d3d12/d3d12_format.c | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/windows/quick_gl.txt b/.gitlab-ci/windows/quick_gl.txt index 7b73007fc1b..dcef84e8abd 100644 --- a/.gitlab-ci/windows/quick_gl.txt +++ b/.gitlab-ci/windows/quick_gl.txt @@ -3848,7 +3848,6 @@ spec/ext_direct_state_access/named-buffers 15/flushmappednamedbufferrangeext: sk spec/ext_direct_state_access/named-buffers 15/mapnamedbufferext: skip spec/ext_direct_state_access/named-buffers 15/mapnamedbufferrangeext: skip spec/ext_direct_state_access/named-buffers 15/namedcopybuffersubdataext: skip -spec/ext_direct_state_access/renderbuffer/getnamedrenderbufferparameterivext: fail spec/ext_disjoint_timer_query/simple: skip spec/ext_draw_instanced/ext_draw_instanced-drawarrays: skip spec/ext_external_objects/memory-object-api-errors: skip @@ -4747,8 +4746,8 @@ wgl/wgl-sanity: skip summary: name: results ---- -------- - pass: 13305 - fail: 533 + pass: 13306 + fail: 532 crash: 67 skip: 4126 timeout: 0 diff --git a/src/gallium/drivers/d3d12/d3d12_format.c b/src/gallium/drivers/d3d12/d3d12_format.c index 49d738289e5..1a871029f52 100644 --- a/src/gallium/drivers/d3d12/d3d12_format.c +++ b/src/gallium/drivers/d3d12/d3d12_format.c @@ -108,6 +108,10 @@ static const DXGI_FORMAT formats[PIPE_FORMAT_COUNT] = { [PIPE_FORMAT_R10G10B10A2_UINT] = DXGI_FORMAT_R10G10B10A2_UINT, [PIPE_FORMAT_R10G10B10A2_UNORM] = DXGI_FORMAT_R10G10B10A2_UNORM, + [PIPE_FORMAT_B5G6R5_UNORM] = DXGI_FORMAT_B5G6R5_UNORM, + [PIPE_FORMAT_B5G5R5A1_UNORM] = DXGI_FORMAT_B5G5R5A1_UNORM, + [PIPE_FORMAT_B5G5R5X1_UNORM] = DXGI_FORMAT_B5G5R5A1_UNORM, + [PIPE_FORMAT_DXT1_RGB] = DXGI_FORMAT_BC1_UNORM, [PIPE_FORMAT_DXT1_RGBA] = DXGI_FORMAT_BC1_UNORM, [PIPE_FORMAT_DXT3_RGBA] = DXGI_FORMAT_BC2_UNORM,