Module: Mesa Branch: staging/21.2 Commit: c4ca2fc7eb46b2ddeeaa3b923d45fd21d1109e32 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c4ca2fc7eb46b2ddeeaa3b923d45fd21d1109e32
Author: Ella-0 <[email protected]> Date: Sat Sep 25 15:51:16 2021 +0000 v3d: add R10G10B10X2_UNORM to format table Fixes following piglit fails: spec@ext_framebuffer_object@fbo-blending-formats spec@ext_framebuffer_object@fbo-blending-formats@GL_RGB10 Cc: mesa-stable Reviewed-by: Jose Maria Casanova Crespo <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13051> (cherry picked from commit e043b97704f52d96ce33a688d2d2869b4aa7fad2) --- .pick_status.json | 2 +- src/broadcom/ci/piglit-v3d-rpi4-fails.txt | 2 -- src/gallium/drivers/v3d/v3dx_format_table.c | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index ac914293bf7..3352b66cf49 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -589,7 +589,7 @@ "description": "v3d: add R10G10B10X2_UNORM to format table", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/broadcom/ci/piglit-v3d-rpi4-fails.txt b/src/broadcom/ci/piglit-v3d-rpi4-fails.txt index e613955739b..e3342e7c510 100644 --- a/src/broadcom/ci/piglit-v3d-rpi4-fails.txt +++ b/src/broadcom/ci/piglit-v3d-rpi4-fails.txt @@ -204,8 +204,6 @@ spec@ext_framebuffer_multisample@blit-mismatched-formats,Fail spec@ext_framebuffer_multisample@interpolation 2 centroid-edges,Fail spec@ext_framebuffer_multisample@interpolation 4 centroid-edges,Fail spec@ext_framebuffer_object@fbo-blending-format-quirks,Fail -spec@ext_framebuffer_object@fbo-blending-formats,Fail -spec@ext_framebuffer_object@fbo-blending-formats@GL_RGB10,Fail spec@ext_framebuffer_object@getteximage-formats init-by-clear-and-render,Fail spec@ext_framebuffer_object@getteximage-formats init-by-rendering,Fail spec@ext_gpu_shader4@execution@texelfetch@fs-texelfetch-isampler1darray,Fail diff --git a/src/gallium/drivers/v3d/v3dx_format_table.c b/src/gallium/drivers/v3d/v3dx_format_table.c index d2dab338393..89b44491879 100644 --- a/src/gallium/drivers/v3d/v3dx_format_table.c +++ b/src/gallium/drivers/v3d/v3dx_format_table.c @@ -70,6 +70,7 @@ static const struct v3d_format format_table[] = { FORMAT(R8G8B8A8_SNORM, NO, RGBA8_SNORM, SWIZ_XYZW, 16, 0), FORMAT(R8G8B8X8_SNORM, NO, RGBA8_SNORM, SWIZ_XYZ1, 16, 0), FORMAT(R10G10B10A2_UNORM, RGB10_A2, RGB10_A2, SWIZ_XYZW, 16, 0), + FORMAT(R10G10B10X2_UNORM, RGB10_A2, RGB10_A2, SWIZ_XYZ1, 16, 0), FORMAT(R10G10B10A2_UINT, RGB10_A2UI, RGB10_A2UI, SWIZ_XYZW, 16, 0), FORMAT(A4B4G4R4_UNORM, ABGR4444, RGBA4, SWIZ_XYZW, 16, 0),
