Skip to content

A
angle
Commit 324b3915 by Mohan Maiya Committed by Commit Bot
Options

Vulkan: Fix compute shader bug affecting 10_10_10_2 formats

When the source format is 10_10_10_2, valueBits needs to be "2" if the component is "3" i.e, the alpha channel. It was incorrectly set to "10" for all components Bug: angleproject:3866 Change-Id: If206c63d704a7a485681e483e12ae9ab611b0d99 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1775105Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Mohan Maiya <m.maiya@samsung.com>
parent c43852aa
Showing with 13 additions and 13 deletions
scripts/code_generation_hashes/Vulkan_internal_shader_programs.json
...@@ -118,25 +118,25 @@ ...@@ -118,25 +118,25 @@
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000F.inc": "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000F.inc":
"0d9058cddfe4033353c476a4a9c5410b", "0d9058cddfe4033353c476a4a9c5410b",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000010.inc": "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000010.inc":
"8e29b7687d4752eb41c267c4d62c1d41", "11139111ebc5610e9f90f8900260b6c1",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000011.inc": "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000011.inc":
"ae374d0e26e182ca25f4002925454631", "ac8c255a9c59f2f197c00c615255fcd8",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000012.inc": "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000012.inc":
"8340dddcbf714716c28711bca016cad1", "1166c798f406767182b1f0245bfa967b",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000013.inc": "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000013.inc":
"1cb8861edb6b324864b78f32f1719ffb", "bae7085d6d6915eb27e380b3caa93da6",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000014.inc": "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000014.inc":
"8ee317a18bd3f79b7fe635bcb89e52b6", "8dbe3e2af70babae7603a34ec9340451",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000015.inc": "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000015.inc":
"24fb781d071f64699d4fa734ebdfa480", "bce92a380a3ae9eae0268c147fdfd1ca",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000016.inc": "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000016.inc":
"f2eef94770b52a037c4a9e566b9fd400", "38eee786134a82a8f3ecd3e9f9cb4fc0",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000017.inc": "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000017.inc":
"f7826707a990f77ef2e1a93e81dd288b", "c9a4c3100ce405279425855655f1ef50",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000018.inc": "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000018.inc":
"1c841aec948204bf4b10c59137c796f0", "ccbcd91094e7e9308573b3033f674e2c",
"src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000019.inc": "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000019.inc":
"71b194f9c63f473b474ba581bd8c114a", "628e93148792a85a1fa0c688e1686a1d",
"src/libANGLE/renderer/vulkan/shaders/gen/FullScreenQuad.vert.00000000.inc": "src/libANGLE/renderer/vulkan/shaders/gen/FullScreenQuad.vert.00000000.inc":
"235ca7c3979ce29a49c320d000ee7409", "235ca7c3979ce29a49c320d000ee7409",
"src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000000.inc": "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000000.inc":
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
"src/libANGLE/renderer/vulkan/shaders/src/ConvertIndex.comp": "src/libANGLE/renderer/vulkan/shaders/src/ConvertIndex.comp":
"ca35df77d258baa0636529d1f0f446a9", "ca35df77d258baa0636529d1f0f446a9",
"src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp": "src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp":
"371c0380486a34aa0e0f76bd1bc94b9e", "d6abd323d011689cef5db83162214be2",
"src/libANGLE/renderer/vulkan/shaders/src/FullScreenQuad.vert": "src/libANGLE/renderer/vulkan/shaders/src/FullScreenQuad.vert":
"805ec8b2f87d4bd4242dc5b1c58ba3b4", "805ec8b2f87d4bd4242dc5b1c58ba3b4",
"src/libANGLE/renderer/vulkan/shaders/src/ImageClear.frag": "src/libANGLE/renderer/vulkan/shaders/src/ImageClear.frag":
......
src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp
...@@ -214,8 +214,8 @@ SrcType loadSourceComponent(uint cd) ...@@ -214,8 +214,8 @@ SrcType loadSourceComponent(uint cd)
// A2B10G10R10's components are not byte-aligned, hardcoding values for efficiency. // A2B10G10R10's components are not byte-aligned, hardcoding values for efficiency.
#if A2BGR10SintToSint || A2BGR10UintToUint || A2BGR10SnormToFloat || A2BGR10SintToFloat || \ #if A2BGR10SintToSint || A2BGR10UintToUint || A2BGR10SnormToFloat || A2BGR10SintToFloat || \
A2BGR10UintToFloat A2BGR10UintToFloat
uint valueBits = 10; uint valueBits = component == 3 ? 2 : 10;
uint shiftBits = valueBits * component; uint shiftBits = 10 * component;
uint valueMask = component == 3 ? 0x03 : 0x3FF; uint valueMask = component == 3 ? 0x03 : 0x3FF;
#else #else
uint shiftBits = getShiftBits(offset, Bs); uint shiftBits = getShiftBits(offset, Bs);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment