From 34faa3db1f6023a50119a910579d596ef71e0aef Mon Sep 17 00:00:00 2001 From: Robic Sun Date: Sat, 8 Feb 2025 15:17:10 +0800 Subject: [PATCH] Fix issue that stride setting is incorrect when rotation is true When rotateXY is true, stride should increase or decrease on the Y axis. Bug: angleproject:395131251 Change-Id: I0f5363c9952ccdf0a036499a9f918853eff7cd10 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6242496 Reviewed-by: Shahbaz Youssefi Commit-Queue: Shahbaz Youssefi Reviewed-by: Charlie Lao Auto-Submit: Robic Sun --- .../Vulkan_internal_shader_programs.json | 10 +- src/libANGLE/renderer/vulkan/UtilsVk.cpp | 1 + src/libANGLE/renderer/vulkan/UtilsVk.h | 5 +- ...itResolveStencilNoExport.comp.00000000.inc | 196 ++++++++++------- ...itResolveStencilNoExport.comp.00000001.inc | 202 ++++++++++-------- ...itResolveStencilNoExport.comp.00000002.inc | 179 +++++++++------- ...itResolveStencilNoExport.comp.00000003.inc | 183 +++++++++------- .../src/BlitResolveStencilNoExport.comp | 31 ++- .../angle_end2end_tests_expectations.txt | 3 - .../deqp_khr_gles3_test_expectations.txt | 3 - .../gl_tests/BlitFramebufferANGLETest.cpp | 173 +++++++++------ 11 files changed, 581 insertions(+), 405 deletions(-) diff --git a/scripts/code_generation_hashes/Vulkan_internal_shader_programs.json b/scripts/code_generation_hashes/Vulkan_internal_shader_programs.json index d3ce654f53b..56b0f1fe9f1 100644 --- a/scripts/code_generation_hashes/Vulkan_internal_shader_programs.json +++ b/scripts/code_generation_hashes/Vulkan_internal_shader_programs.json @@ -56,13 +56,13 @@ "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000017.inc": "6f1e10dcb19a12e5e86e98ceab2c6e45", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000000.inc": - "3b131ef841a7d119035aefc8487826bb", + "f0e825d5d33e9198899694f8c2d1035c", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000001.inc": - "f60edde525e823378168c890873f4be7", + "4841be9eb05c7eb8908fe69862704b03", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000002.inc": - "d770e8274bcbce8f6d03fd13ce27b9bc", + "ab90ab270c56053991a2a19f5d48318c", "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000003.inc": - "de59d829ddb735d36238cc25e0022cd6", + "ff4ea152b556fa86e4249bb123afef61", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000000.inc": "82426086e0b5aea32d0f756a1f6e5342", "src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000001.inc": @@ -298,7 +298,7 @@ "src/libANGLE/renderer/vulkan/shaders/src/BlitResolve.inc": "77073cb6a80a472c5a23165f6cb41847", "src/libANGLE/renderer/vulkan/shaders/src/BlitResolveStencilNoExport.comp": - "163151792f2ffed48258abd66a1bc10c", + "53dbdb3379bd11bb1ae6b58f0a505787", "src/libANGLE/renderer/vulkan/shaders/src/BlitResolveStencilNoExport.comp.json": "8a3e9ff34eba0386edb98048547a272b", "src/libANGLE/renderer/vulkan/shaders/src/ConvertIndex.comp": diff --git a/src/libANGLE/renderer/vulkan/UtilsVk.cpp b/src/libANGLE/renderer/vulkan/UtilsVk.cpp index 38544c8e6e6..94f8ba73754 100644 --- a/src/libANGLE/renderer/vulkan/UtilsVk.cpp +++ b/src/libANGLE/renderer/vulkan/UtilsVk.cpp @@ -3193,6 +3193,7 @@ angle::Result UtilsVk::stencilBlitResolveNoShaderExport(ContextVk *contextVk, shaderParams.invSrcExtent[1] = 1.0f / params.srcExtents[1]; shaderParams.srcLayer = params.srcLayer; shaderParams.srcWidth = params.srcExtents[0]; + shaderParams.srcHeight = params.srcExtents[1]; shaderParams.dstPitch = bufferRowLengthInUints; shaderParams.blitArea[0] = params.blitArea.x; shaderParams.blitArea[1] = params.blitArea.y; diff --git a/src/libANGLE/renderer/vulkan/UtilsVk.h b/src/libANGLE/renderer/vulkan/UtilsVk.h index 47a1a981b99..c06f13403a7 100644 --- a/src/libANGLE/renderer/vulkan/UtilsVk.h +++ b/src/libANGLE/renderer/vulkan/UtilsVk.h @@ -490,11 +490,12 @@ class UtilsVk : angle::NonCopyable float invSrcExtent[2] = {}; int32_t srcLayer = 0; int32_t srcWidth = 0; - int32_t blitArea[4] = {}; - int32_t dstPitch = 0; + int32_t srcHeight = 0; uint32_t flipX = 0; uint32_t flipY = 0; uint32_t rotateXY = 0; + int32_t blitArea[4] = {}; + int32_t dstPitch = 0; }; struct ExportStencilShaderParams diff --git a/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000000.inc b/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000000.inc index 03d219611c2..cfcbc40a413 100644 --- a/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000000.inc +++ b/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000000.inc @@ -10,83 +10,96 @@ #pragma once constexpr uint8_t kBlitResolveStencilNoExport_comp_00000000[] = { - 0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x02,0xff,0x6d,0x96,0xdb,0x6f,0x94,0x45, - 0x18,0xc6,0xbf,0xdd,0x6d,0x77,0xcb,0x6a,0x5b,0xaa,0x2d,0x60,0x0b,0x94,0x5a,0x83, - 0x87,0x25,0x88,0x09,0x27,0x03,0x2b,0x85,0x08,0x62,0x4b,0x44,0xc0,0x6e,0x34,0xa8, - 0xad,0xc6,0x0b,0xb8,0xe8,0x21,0x29,0xb1,0xb6,0x41,0x6d,0x69,0x45,0xc4,0xa2,0x41, - 0x40,0x03,0x91,0x18,0x12,0x13,0xa9,0x4d,0xd0,0x6a,0x8c,0x05,0x8c,0x37,0x9e,0x2e, - 0x10,0xc4,0x2b,0xfc,0x47,0x3c,0xc7,0xe8,0xfb,0xcc,0xfe,0xc6,0xbc,0x6e,0xfc,0x92, - 0xc9,0xec,0x3c,0xef,0xf9,0x34,0xb3,0x99,0x74,0x7b,0x2e,0x49,0x52,0x49,0x3e,0xa9, - 0x49,0x7e,0x4a,0xca,0x5f,0x43,0x92,0x36,0x24,0x49,0x6e,0x4a,0xb2,0x61,0x7f,0x68, - 0xc7,0x9e,0x1d,0x2b,0x87,0x0e,0x3c,0xb7,0x72,0xf5,0x9a,0x55,0xa2,0xd7,0x25,0x99, - 0xc0,0x27,0x5a,0xbd,0xf1,0x54,0xdb,0x5e,0x65,0xab,0xef,0x99,0xfd,0xfd,0xc2,0x6b, - 0x6d,0xcd,0x37,0xbc,0x2a,0xe8,0x4a,0x4c,0x73,0x79,0x05,0x5d,0x86,0xd6,0x06,0xdd, - 0x49,0xb2,0xd8,0xd6,0x76,0x93,0x5e,0x82,0xdd,0x76,0xf6,0x88,0xa5,0xc0,0x6a,0x1c, - 0x96,0x06,0x9b,0xef,0xb0,0x0c,0xd8,0x22,0x87,0x55,0x81,0x79,0x1b,0xd5,0x60,0xcb, - 0x1c,0x96,0x05,0x5b,0xe5,0xb0,0x1c,0xd8,0x6a,0x87,0xd5,0x80,0xad,0x77,0xd8,0x3c, - 0xb0,0x8d,0x21,0xae,0xcc,0xbf,0xfe,0x29,0xc6,0x23,0xb6,0xdf,0x4e,0x3c,0xf1,0xdc, - 0xe6,0x72,0x30,0x55,0x41,0x9f,0x82,0x1e,0xe5,0xcf,0xe3,0x5b,0x15,0xf6,0xa6,0x2b, - 0x72,0x24,0x7b,0xd3,0xc4,0x2e,0xfe,0x99,0x0a,0x7d,0x33,0xe8,0x8b,0xe7,0x4b,0xe4, - 0xfc,0x36,0x5b,0xb7,0x9a,0x95,0x74,0xa0,0x67,0x82,0xbc,0x7e,0x37,0x19,0x4f,0x96, - 0xdc,0xc8,0xc7,0x85,0x76,0xce,0xe1,0x43,0xa4,0xe7,0xa1,0x27,0xd0,0xa5,0x2f,0x8f, - 0x0f,0xcb,0xec,0x7c,0x33,0xb2,0xc2,0x37,0x70,0xae,0x05,0x2b,0x20,0x5f,0x87,0xbc, - 0xf8,0xeb,0xa1,0xe5,0x1d,0xfd,0x16,0x62,0x8e,0xe7,0x26,0x78,0x16,0x98,0x95,0x66, - 0xec,0xcb,0x76,0x8b,0xed,0xcd,0xf8,0xa6,0xf3,0x62,0x97,0xaf,0xa5,0x66,0x59,0xb5, - 0x68,0x71,0x2b,0xcb,0x8a,0x7c,0x79,0xb7,0xe4,0xcb,0x52,0xea,0xb9,0x04,0xdf,0x75, - 0x6e,0x05,0x2b,0xb8,0xdc,0x54,0xc3,0xdf,0x06,0x4d,0xfa,0x1a,0xcd,0x8b,0xe5,0xf8, - 0x71,0xa7,0xed,0xcb,0xf1,0x2b,0xca,0xad,0x25,0x06,0xc9,0xad,0x43,0xae,0x05,0x7a, - 0x33,0xfd,0x63,0xdf,0xa6,0x15,0xa6,0x5d,0x78,0x11,0x6c,0xa3,0xd3,0xd1,0x41,0xde, - 0xe2,0x79,0x2b,0x7d,0x2a,0x9d,0xdb,0xd0,0x99,0x77,0xf4,0x5d,0xf4,0x6c,0x3c,0xef, - 0xad,0x88,0x65,0x9f,0xad,0xbf,0xed,0x8b,0xe7,0x21,0x97,0x77,0xf9,0x34,0xec,0xea, - 0xf4,0x22,0xb2,0xd9,0xd0,0x3f,0xf3,0x92,0xc3,0xd8,0x4a,0x25,0xff,0xfd,0x52,0x4e, - 0xe6,0x55,0x7e,0x1f,0x26,0x9f,0x3a,0x1f,0x01,0x6b,0xb6,0xec,0x1c,0x85,0xef,0x75, - 0xb0,0xa3,0xf0,0xe9,0x3c,0x05,0xd6,0x62,0x35,0x7f,0x03,0x1d,0xd1,0xcf,0xe3,0xae, - 0xe6,0xa7,0xf0,0xc3,0xf7,0xcb,0x69,0xc5,0x15,0xea,0x98,0x09,0x33,0x94,0x0f,0xfd, - 0x50,0x9e,0x95,0xf3,0xd8,0xfc,0x10,0x1d,0xd3,0xd8,0xd4,0x79,0xa6,0xa2,0x66,0x17, - 0x88,0x57,0xfc,0x9f,0x43,0xf3,0x7d,0x7a,0x91,0xfc,0xae,0x30,0x2e,0xf5,0xfb,0x25, - 0xb0,0x8b,0xf4,0xec,0x5a,0xab,0x65,0x1a,0xdf,0x12,0x66,0xe4,0x37,0x43,0xd4,0x3f, - 0xbf,0xda,0xe9,0x32,0xf8,0x9f,0xf6,0x5b,0x33,0xf1,0x05,0x74,0xed,0x9b,0x8d,0xab, - 0x9e,0x3b,0xae,0x96,0x99,0x29,0x62,0xb7,0x01,0x7c,0xd2,0x78,0xf2,0x61,0x96,0xcb, - 0x98,0xe6,0xe6,0x20,0xbe,0x37,0x82,0x47,0x3d,0x0b,0xd0,0xd3,0xe4,0xf4,0x2c,0x04, - 0x8f,0x32,0x8b,0xc0,0x1e,0x35,0x99,0x1c,0xf7,0x44,0x23,0xb8,0xf4,0xb4,0x71,0xbf, - 0xb4,0x32,0x07,0x45,0x66,0xae,0x1d,0x7c,0xa7,0x49,0x49,0xee,0x0e,0xb0,0x76,0x72, - 0xa6,0xb8,0x3f,0x35,0x79,0xcd,0xc5,0x5d,0xd0,0xa5,0xfb,0x8c,0xc9,0x6b,0x4e,0xee, - 0x06,0x57,0x4e,0x0a,0xe4,0xe4,0x0f,0xa3,0x09,0xbf,0x27,0xe4,0xbb,0x9c,0x17,0xfd, - 0xfe,0xdd,0xf6,0xcb,0x9c,0x0b,0xce,0xe6,0xbd,0xce,0x66,0xec,0xc3,0x31,0xe2,0xb8, - 0x0f,0x7b,0xe2,0x19,0xe0,0xde,0x58,0x03,0xae,0xb8,0xd6,0x71,0xa7,0xb7,0x32,0xa7, - 0x45,0x78,0xee,0x07,0x7f,0x85,0x99,0xdc,0x80,0x9c,0xf0,0x71,0xb0,0x4d,0xe0,0x45, - 0xa7,0x6b,0x33,0xba,0x3a,0x9c,0xae,0x2d,0xe0,0x13,0xc8,0x3d,0x88,0xec,0x16,0xe4, - 0xb6,0x85,0x3b,0xba,0x2c,0xb7,0xd5,0xd5,0x68,0x3b,0xf8,0x8c,0xf1,0x28,0x57,0x0f, - 0x83,0xd5,0x91,0xaf,0x2e,0x97,0x2f,0xd1,0x3a,0x6d,0x75,0x91,0x9f,0xce,0x70,0x07, - 0x54,0x87,0x59,0x7e,0x04,0x9b,0xfa,0x5e,0x66,0xbe,0x77,0x82,0xef,0xb6,0xea,0xcb, - 0xa7,0xaf,0xc0,0x22,0x9f,0x72,0x1d,0x75,0x69,0xff,0xd9,0xb2,0x29,0xbe,0xef,0xe1, - 0x29,0x20,0xd3,0xe9,0x62,0xd8,0x4d,0x0c,0xbb,0x5c,0x0c,0x7b,0xc0,0x63,0x0c,0x8f, - 0x81,0xc5,0x18,0x4a,0x2e,0x06,0xd1,0xba,0x6d,0x95,0xb0,0xdb,0xed,0x62,0x78,0x1c, - 0xdb,0x29,0x17,0xc3,0x13,0xe0,0x31,0x86,0x6f,0xc1,0x22,0x9f,0x62,0x88,0xba,0x4a, - 0x2e,0x86,0xab,0xf0,0x74,0x21,0xd3,0xed,0x62,0x78,0x92,0x18,0xf6,0xba,0x18,0x9e, - 0x02,0x8f,0x31,0x3c,0x0d,0x16,0x63,0xe8,0x75,0x31,0x88,0xd6,0x63,0xab,0x17,0xbb, - 0x3d,0xf4,0xa9,0xec,0x3e,0x8b,0xed,0xab,0xee,0xae,0x94,0x8f,0x91,0xb7,0xd7,0xf9, - 0xf8,0x23,0x7c,0x25,0xe4,0x7a,0xc2,0x7d,0x95,0x0d,0xb3,0xba,0x9f,0x5e,0xd8,0x47, - 0xcf,0x4a,0x47,0x1f,0x3a,0xfa,0x9c,0x8e,0xeb,0xe8,0x91,0xde,0x2b,0xb6,0x06,0xa1, - 0x29,0xa6,0x1f,0xf0,0x5f,0xb4,0x1b,0x8e,0x26,0xfd,0xd7,0xe8,0x5f,0xd1,0x3e,0x80, - 0x36,0x4b,0xec,0x07,0xa0,0xeb,0xbd,0xf8,0xc5,0xe2,0x1d,0x80,0x1e,0xe3,0x17,0xbd, - 0x3f,0xcc,0x5a,0xd9,0x9f,0x7e,0x57,0xc3,0xe7,0xf1,0x49,0xdf,0x97,0xe8,0x7b,0x01, - 0x7c,0x98,0x5c,0x8e,0x3a,0x5d,0xa2,0x8d,0xd8,0x1a,0x45,0xd7,0x08,0x75,0xd2,0x7b, - 0xf4,0x12,0x75,0x1a,0xa2,0x4e,0xd9,0xd0,0x17,0x65,0x7c,0x80,0xfe,0x18,0x03,0x9b, - 0xc3,0xd6,0x38,0xb6,0xc6,0xc8,0x59,0xd4,0x3b,0x4a,0xec,0xe2,0x39,0x84,0x4f,0xfd, - 0xf0,0x8f,0xe0,0xd7,0xa4,0xf3,0xeb,0x50,0x98,0xe5,0x24,0x60,0x92,0x9f,0xc0,0x07, - 0xbd,0x53,0xaf,0xf1,0xce,0xe9,0xac,0x37,0xed,0x18,0xef,0x59,0xc9,0x7c,0xd0,0x5b, - 0xf6,0x26,0x3c,0xc7,0xdc,0x9d,0xf1,0x16,0xb1,0x1c,0x77,0x77,0xc6,0x09,0xf0,0x78, - 0xff,0x9c,0x24,0x77,0x27,0x42,0xcf,0xe7,0xc2,0xdb,0xf7,0x36,0xfa,0x4e,0x72,0xd7, - 0x0e,0x93,0x6b,0xd5,0xf7,0x1d,0xe8,0xfa,0xbe,0x03,0x3b,0x03,0x7e,0x9a,0xf7,0x43, - 0x39,0x7b,0x97,0x7a,0x6a,0x66,0xbf,0x86,0xef,0x2c,0xbc,0xa2,0x7d,0x03,0xf6,0x1e, - 0x3d,0x73,0x96,0xdc,0xc5,0xd8,0x27,0x5d,0x4f,0xdd,0x80,0x67,0x14,0xfe,0x09,0x57, - 0x8b,0x73,0xf4,0xed,0x38,0xbd,0xf0,0x3e,0xb5,0x38,0xe7,0xe6,0xf7,0x0a,0xf8,0x75, - 0x37,0x1b,0x83,0xd8,0x19,0xe4,0x4e,0xcf,0xd2,0x93,0xd7,0xfe,0xa7,0xf7,0x07,0x5c, - 0x7f,0x7c,0x44,0x4e,0x2f,0xb8,0xfe,0xf8,0x18,0xfc,0x20,0x73,0x3d,0x0b,0x16,0xdf, - 0xd2,0x4f,0x78,0x03,0x67,0xb1,0x25,0xec,0x33,0xf0,0x86,0xa0,0x3b,0x1b,0xfe,0x0b, - 0xcc,0xf1,0x7f,0xa1,0x03,0xfa,0x03,0xd6,0x1f,0x73,0xc4,0xee,0xdf,0x28,0xed,0x7f, - 0xd9,0xa4,0xaf,0xb7,0xf5,0x0f,0x1b,0x39,0x83,0xf3,0x68,0x0d,0x00,0x00 + 0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x02,0xff,0x6d,0x96,0x6d,0x4c,0x95,0x65, + 0x18,0xc7,0x9f,0x73,0x0e,0x9c,0x83,0x47,0x01,0x49,0x50,0x5e,0x7c,0x89,0x70,0x5a, + 0x1d,0x66,0xb6,0x25,0xd9,0x94,0x44,0x97,0xa6,0xe0,0x32,0x35,0x58,0xcd,0x0a,0x6a, + 0x7d,0x81,0x2d,0x65,0xcb,0x0f,0x02,0x4e,0xe3,0x6d,0xab,0x2c,0x58,0xc1,0x66,0x51, + 0xc9,0x4c,0x0d,0x2d,0xd3,0x2c,0x5b,0xcc,0x0f,0x30,0x97,0x99,0x5b,0x5b,0x12,0x9b, + 0x65,0x5b,0xcb,0x97,0xbe,0xb5,0xf5,0xcd,0x22,0x94,0x5e,0xae,0xeb,0x7e,0x7e,0xb7, + 0xbb,0x76,0xd6,0xd9,0xee,0x3d,0xcf,0xfd,0xbf,0x5e,0xff,0xd7,0x7d,0xdd,0xd7,0x79, + 0x62,0xd1,0xb2,0x44,0x10,0x44,0x82,0x64,0x90,0x15,0x14,0x47,0x02,0xf7,0xcb,0x0b, + 0xa2,0x81,0xbe,0x4e,0x0f,0xe2,0xee,0xf9,0xe8,0xc6,0xad,0x1b,0x97,0xbc,0xb4,0xf3, + 0x85,0x25,0x0f,0x2c,0x5b,0xaa,0xf2,0x9c,0x20,0xe6,0xf4,0x54,0x96,0x2b,0x3a,0x99, + 0xf2,0xcc,0x90,0xf5,0xe2,0x73,0x8d,0xdb,0x15,0xcf,0x96,0x35,0x53,0xf0,0x0c,0xe7, + 0x2b,0x10,0xcf,0xe1,0x72,0xbe,0x04,0xcd,0x76,0xbe,0x83,0x60,0xae,0xac,0xf5,0x62, + 0x3d,0x2f,0x0c,0x1b,0x94,0xf1,0xf4,0x58,0x04,0x2c,0xcb,0x60,0x51,0xb0,0x99,0x06, + 0x8b,0x81,0x15,0x1a,0x2c,0x03,0xcc,0xc6,0xc8,0x04,0xbb,0xd3,0x60,0x71,0xb0,0x85, + 0x06,0x4b,0x80,0xdd,0x6d,0xb0,0x2c,0xb0,0x72,0x83,0x4d,0x03,0x5b,0x6a,0xb0,0x24, + 0x58,0x95,0xe3,0x1a,0xbb,0x9d,0xb3,0xf2,0x3e,0x24,0xcf,0xbb,0xe0,0xe8,0xf7,0xa5, + 0xa6,0x2e,0x43,0x69,0xf2,0x21,0xe4,0xde,0xfe,0x22,0xf9,0x66,0x10,0x6f,0x2c,0xad, + 0x6e,0x1a,0x6f,0x8c,0x7a,0xa8,0xfe,0x78,0x9a,0xbf,0x71,0xfc,0xf9,0xfd,0x35,0xce, + 0xa1,0x48,0xd6,0x2c,0x89,0x12,0x75,0xf2,0x98,0xb3,0xd7,0xf7,0x02,0xd1,0x89,0x53, + 0x2f,0xcd,0x71,0x8e,0xec,0x13,0xe4,0xe0,0xe5,0x49,0xe4,0x01,0xf2,0xe9,0xd4,0x20, + 0xe6,0xf0,0x8c,0x60,0x06,0xb6,0x8a,0xaf,0x60,0x9f,0x0d,0x96,0xc2,0x3e,0x07,0x7b, + 0xd5,0xcf,0x45,0x96,0x34,0xf2,0x3b,0xe0,0xec,0xf7,0x05,0xe8,0xcc,0x96,0x28,0xc5, + 0xc4,0xd7,0xd8,0x25,0xf2,0x2c,0x26,0x37,0xdd,0xcf,0x35,0xf5,0x9a,0x2f,0x51,0xf5, + 0x2c,0x4a,0xcc,0x8a,0x9b,0x95,0x34,0xcb,0xdb,0x69,0x3e,0xf3,0x39,0xe7,0x79,0xe4, + 0xaf,0xfb,0x05,0x60,0x29,0x53,0x9f,0x69,0xe8,0x97,0xf2,0xae,0x3e,0xf2,0x25,0x93, + 0x45,0xe4,0xb2,0x58,0x9e,0x8b,0xc8,0xcd,0xdb,0x55,0xc0,0x43,0xed,0x1e,0xc4,0xae, + 0x04,0xb9,0xf2,0x58,0x19,0x96,0x65,0x55,0xb9,0x9c,0xb5,0xe2,0x95,0x60,0x2b,0x8d, + 0x8f,0x2a,0x6a,0xe7,0xf7,0x6b,0x4d,0xee,0xeb,0xf0,0x99,0x34,0xf2,0xcd,0xf4,0xb7, + 0xdf,0x6f,0xa3,0xb7,0xfd,0x5e,0x2f,0xf0,0xbf,0xf2,0xf3,0xfb,0x3d,0xa6,0xf6,0x9a, + 0x53,0x87,0x39,0xab,0x57,0xf0,0x1f,0x37,0xf6,0xfb,0xb9,0x67,0x45,0x22,0x39,0x48, + 0x6c,0xc6,0xca,0xed,0x5f,0xc4,0xf8,0xf8,0x80,0xf7,0x83,0xd4,0x57,0xf7,0x87,0xc0, + 0x8a,0xa5,0x5a,0x47,0xd0,0xfb,0x10,0xec,0x08,0x7a,0xba,0x1f,0x02,0x2b,0x91,0x3e, + 0x38,0x86,0x0f,0x9f,0xc7,0x71,0xd3,0x07,0x9f,0x92,0x87,0xed,0xa1,0xd3,0xca,0xd3, + 0x9d,0x6b,0xcc,0xdd,0xab,0xa4,0xeb,0x91,0xf0,0xfe,0x5c,0x24,0xe6,0xf7,0xf8,0x18, + 0x23,0xa6,0xee,0xc7,0xd3,0xce,0xf0,0x12,0xb6,0xaa,0xff,0x0b,0x32,0xdb,0xbb,0x57, + 0xa9,0x6f,0xb9,0x68,0xeb,0x1d,0xb8,0x06,0x76,0x95,0x3e,0xae,0x90,0x6a,0x45,0xc9, + 0x2d,0xe0,0xde,0xfc,0x25,0x88,0xd6,0x70,0x42,0x76,0xd7,0xc1,0x6f,0xc9,0xbb,0xde, + 0x93,0x5f,0x91,0xeb,0x73,0xb5,0x68,0xe5,0x32,0x0b,0xb3,0xb9,0x47,0x95,0xc4,0xcd, + 0x03,0xef,0x12,0x9d,0xa4,0xbb,0xdf,0x21,0xa6,0x77,0x69,0x37,0xb9,0xe7,0x83,0x7b, + 0x3f,0xb3,0xf1,0x53,0x60,0xfc,0xcc,0x01,0xf7,0x36,0x85,0x60,0x8f,0x8b,0x4d,0x82, + 0xd9,0x91,0x0f,0xae,0x7e,0x4a,0x99,0x39,0x0b,0xb8,0x17,0x95,0xdc,0xc3,0x32,0xf0, + 0x4d,0x62,0x95,0x60,0xde,0x96,0xb1,0xa2,0xf0,0xfe,0x5c,0xec,0x17,0x33,0x77,0x17, + 0xe2,0x7b,0x40,0xec,0xf5,0xde,0xdc,0x03,0xae,0x35,0x49,0x51,0x93,0x9b,0x22,0x53, + 0xfc,0x5e,0x57,0xef,0xb0,0x2e,0xfa,0x3e,0x29,0xcf,0xeb,0xec,0x53,0x26,0xe6,0x7d, + 0x26,0xa6,0xef,0xc3,0x97,0xe1,0x71,0x3f,0xf1,0x54,0x67,0x07,0xb3,0x64,0x19,0xb8, + 0xf2,0xd2,0xfb,0xb9,0x1c,0x5e,0x15,0xf0,0x52,0x9d,0x87,0xc0,0xbb,0xb9,0xa3,0x2b, + 0xb0,0x53,0xbc,0x1d,0x6c,0x15,0x78,0xa5,0xf1,0xb5,0x1a,0x5f,0x55,0xc6,0xd7,0x1a, + 0xf0,0x4e,0xec,0x1e,0xc1,0x76,0x0d,0x76,0xeb,0xdc,0xdc,0x0e,0xed,0xd6,0x9a,0x33, + 0x5a,0x0f,0xfe,0xb1,0xe8,0x68,0xad,0x36,0x80,0xe5,0x50,0xaf,0x1a,0x53,0x2f,0x95, + 0x55,0xcb,0xaa,0xa1,0x3e,0xd5,0x6e,0x26,0x64,0xba,0xbb,0xfd,0x18,0x31,0xf5,0xb7, + 0x97,0xfb,0xbe,0x09,0x7c,0x8b,0x9c,0xbe,0xe6,0xf4,0x1b,0x98,0xd7,0xd3,0x5a,0x7b, + 0x5f,0xfa,0xfc,0x43,0xaa,0x59,0xe2,0xf6,0xa1,0x4e,0x0a,0x9b,0x6a,0xc3,0x61,0x0b, + 0x1c,0x36,0x1b,0x0e,0x5b,0xc1,0x3d,0x87,0x27,0xc0,0x3c,0x87,0x3a,0xc3,0x41,0x65, + 0xb5,0xb2,0xea,0x88,0x5b,0x6b,0x38,0x3c,0x49,0xec,0x88,0xe1,0xf0,0x14,0xb8,0xe7, + 0xf0,0x3b,0x98,0xd7,0x53,0x0e,0xde,0x57,0x9d,0xe1,0x30,0x89,0x4e,0x0d,0x36,0xb5, + 0x86,0xc3,0xd3,0x70,0xd8,0x66,0x38,0x3c,0x03,0xee,0x39,0x3c,0x0b,0xe6,0x39,0x34, + 0x18,0x0e,0x2a,0xab,0x97,0xd5,0x40,0xdc,0x7a,0xfa,0x54,0xe3,0x3e,0x4f,0xec,0x49, + 0x33,0x2b,0x35,0x47,0xaf,0xdb,0x60,0x72,0xfc,0x07,0xbd,0x3a,0xec,0xea,0x89,0xd5, + 0x94,0x16,0xab,0x51,0x56,0x33,0xf6,0xfa,0x7e,0x4c,0x6a,0x11,0x77,0xbd,0x1e,0xd6, + 0x7a,0x3b,0x7d,0xad,0x71,0x9a,0xd0,0x6b,0x36,0x7a,0x3b,0xe9,0xab,0xff,0xd3,0x6b, + 0x22,0x1f,0xd5,0x9b,0x15,0x09,0x7d,0x36,0xd2,0xdb,0xcd,0x46,0x36,0x23,0x12,0x62, + 0x8d,0xf8,0x6b,0xc6,0xcf,0x2e,0xfc,0xec,0x32,0xbc,0xa6,0xe0,0xa6,0xbe,0x8b,0xc4, + 0xae,0x0d,0x59,0xd2,0xcd,0xc2,0xb0,0xa6,0x2a,0x2b,0x34,0xb2,0xb8,0xe3,0x1b,0xc6, + 0x50,0xd9,0x77,0x41,0x28,0x3b,0xc5,0x79,0xec,0x45,0xae,0xff,0x69,0x7f,0x4a,0x5d, + 0x5a,0x91,0xfb,0x3a,0xa9,0xbc,0x45,0x56,0x2b,0xf9,0xb4,0x98,0xbe,0x6a,0x27,0x27, + 0xfd,0x8d,0xe0,0xaf,0x13,0xbc,0x83,0x9a,0x77,0x1b,0x5f,0x9d,0x6e,0xf6,0x06,0x0e, + 0x53,0x5f,0x5d,0xf4,0x8e,0xfe,0x67,0xbe,0x4a,0xef,0xec,0xa1,0x77,0x34,0xef,0xd7, + 0xc0,0x77,0xd0,0xb3,0xfb,0xc0,0x86,0x89,0xf5,0x3a,0xb1,0xf6,0x51,0x33,0xef,0xb7, + 0x1b,0xee,0xaa,0xf3,0x06,0x39,0xb5,0xa0,0xdf,0x45,0x5e,0xbd,0x26,0x2f,0xd5,0xe9, + 0x91,0xd5,0x8b,0x7d,0x8f,0xe1,0xf8,0x26,0x1c,0x23,0x86,0xe3,0x5b,0xe0,0x9e,0x63, + 0xbf,0xf1,0xa5,0xb2,0x3e,0x59,0xfd,0xf8,0xea,0x33,0x1c,0xdf,0x86,0xe3,0x7e,0xc3, + 0xf1,0x1d,0x70,0xcf,0x71,0x00,0xcc,0x73,0x7c,0x97,0x58,0x03,0x70,0xf4,0x7e,0xfb, + 0x0d,0xc7,0xf7,0xc8,0xa9,0x07,0xfd,0x3e,0x74,0x3d,0x9f,0x5e,0xa3,0xfb,0x3e,0x35, + 0xe9,0xc6,0xae,0x1f,0x0e,0x83,0x86,0x83,0xea,0x1c,0x90,0x35,0x88,0xfd,0x01,0xf2, + 0xd5,0x6f,0x89,0xc3,0x7c,0x8b,0xe8,0x5e,0xbf,0x3b,0x8e,0xf2,0xcd,0x51,0x27,0xf9, + 0xea,0xf7,0xc6,0x47,0xe8,0x1c,0x35,0x73,0xfd,0x13,0x78,0x1f,0x37,0x73,0xfd,0x04, + 0xb8,0xff,0x8f,0x38,0x49,0x9d,0x4f,0xb8,0xb9,0x94,0x70,0xdf,0x27,0xa7,0xf0,0x77, + 0x92,0xff,0xc3,0x0e,0xce,0x45,0xfb,0xfd,0x33,0xe4,0xfa,0xfb,0x06,0xec,0x0b,0xf0, + 0xd3,0xfc,0xc7,0x6b,0x7d,0xbf,0xa4,0xbf,0x75,0x26,0x9d,0x43,0x6f,0x18,0x5d,0x95, + 0x7d,0x0d,0x76,0x86,0x3b,0x34,0x4c,0xed,0x3c,0xf7,0x41,0x73,0xc7,0xf4,0x5e,0xdd, + 0xa2,0x4f,0xce,0x50,0x23,0xad,0xdd,0x68,0xda,0x5c,0x19,0x91,0x75,0x1e,0xfb,0x11, + 0x73,0xb6,0x67,0x99,0x05,0xbe,0xb7,0xbe,0x32,0xbd,0xd5,0x0e,0x76,0x0e,0xfc,0xac, + 0x99,0xcd,0x37,0xc0,0xa7,0xcc,0x6c,0x1e,0xc5,0xff,0x79,0xe3,0xff,0x02,0xf3,0xc4, + 0xfb,0xfa,0x96,0xfb,0x71,0xc1,0xf8,0x9a,0x00,0x9f,0x32,0x33,0xd4,0xfb,0x1a,0x35, + 0xb3,0x46,0xe7,0xcb,0x0d,0xb8,0x4c,0xc0,0x47,0x75,0xdb,0xd0,0x6d,0xe3,0x3b,0x21, + 0xce,0x4c,0xb9,0x69,0x66,0xa0,0x9f,0x5d,0xad,0xa6,0xf7,0x7f,0xa0,0x07,0x2e,0x99, + 0xde,0xff,0x11,0x7c,0x37,0xff,0x15,0x97,0xc1,0xfc,0xf7,0xd9,0x4f,0x7c,0x57,0x5d, + 0x26,0x96,0x62,0x3f,0x83,0xe7,0x39,0xdf,0x71,0xf7,0x7d,0x79,0x85,0x6f,0xd0,0x2a, + 0xe4,0x0f,0xcb,0x99,0x5c,0xe1,0x3c,0xed,0x77,0x8f,0x3e,0xff,0x96,0x0a,0x2e,0x97, + 0xf5,0x1f,0x73,0x58,0x0a,0xd2,0xe4,0x0f,0x00,0x00 }; // Generated from: @@ -102,13 +115,14 @@ constexpr uint8_t kBlitResolveStencilNoExport_comp_00000000[] = { // vec2 invSrcExtent; // int srcLayer; // int srcWidth; -// -// ivec4 blitArea; -// int destPitch; +// int srcHeight; // // bool flipX; // bool flipY; // bool rotateXY; +// +// ivec4 blitArea; +// int destPitch; // } params; // // layout(set = 0, binding = 0)buffer dst @@ -144,14 +158,23 @@ constexpr uint8_t kBlitResolveStencilNoExport_comp_00000000[] = { // if(params . rotateXY) // srcImageCoords . xy = srcImageCoords . yx; // -// int xDir = params . flipX ? - 1 : 1; +// int xDir = 0, yDir = 0; +// if(params . rotateXY) +// { +// yDir = params . flipY ? - 1 : 1; +// } +// else +// { +// xDir = params . flipX ? - 1 : 1; +// } // // uint outStencils = 0; // // for(int i = 0;i < 4;++ i) // { // -// if(srcImageCoords . x >= 0 && srcImageCoords . x < params . srcWidth) +// if((srcImageCoords . x >= 0 && srcImageCoords . x < params . srcWidth)&& +// (srcImageCoords . y >= 0 && srcImageCoords . y < params . srcHeight)) // { // // uint stencilValue = texture(usampler2D(stencil, blitSampler), srcImageCoords * params . invSrcExtent). x; @@ -160,7 +183,14 @@ constexpr uint8_t kBlitResolveStencilNoExport_comp_00000000[] = { // // } // -// srcImageCoords . x += xDir; +// if(params . rotateXY) +// { +// srcImageCoords . y += yDir; +// } +// else +// { +// srcImageCoords . x += xDir; +// } // } // // destData[gl_GlobalInvocationID . y * params . destPitch + gl_GlobalInvocationID . x]= outStencils; diff --git a/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000001.inc b/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000001.inc index 0ce02280dff..2b21a647ab1 100644 --- a/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000001.inc +++ b/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000001.inc @@ -10,86 +10,99 @@ #pragma once constexpr uint8_t kBlitResolveStencilNoExport_comp_00000001[] = { - 0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x02,0xff,0x6d,0x96,0xd9,0x6f,0x94,0x55, - 0x18,0xc6,0xbf,0x99,0x69,0xa7,0x65,0xb4,0x2d,0xd5,0x16,0xb0,0x05,0x4a,0xad,0xc1, - 0xa5,0x04,0x31,0x61,0x33,0x30,0x52,0x88,0x20,0xb6,0x44,0x2c,0xd8,0x09,0x06,0x95, - 0x6a,0xbc,0x80,0x8b,0x2e,0x49,0x89,0xb5,0x0d,0x6a,0x4b,0x2b,0x22,0x16,0x0d,0x02, - 0x2e,0x80,0x1a,0x8c,0xc4,0x34,0x9a,0x48,0x6d,0x82,0x60,0xa2,0xb2,0x68,0xbc,0x30, - 0xf1,0x06,0x41,0xbc,0xc2,0x7f,0xc2,0x3d,0x46,0xdf,0xe7,0xcc,0xef,0x98,0x37,0x13, - 0xbf,0xe4,0xe4,0xcc,0x79,0xde,0x7d,0x3b,0x67,0x32,0xe9,0x96,0x8a,0x24,0x49,0x25, - 0xb9,0xa4,0x32,0xf9,0x39,0x29,0x7e,0xb5,0x49,0xda,0x90,0x24,0xb9,0x21,0xc9,0x86, - 0xfd,0x81,0x4d,0x5b,0x37,0x2d,0x1e,0xd8,0xfd,0xf4,0xe2,0xa5,0xcb,0x96,0x88,0x5e, - 0x9d,0x64,0x02,0x9f,0x68,0x35,0xc6,0x53,0x6e,0x7b,0x99,0xad,0x9e,0x27,0x77,0xf5, - 0x0a,0xaf,0xb2,0x35,0xd3,0xf0,0xb2,0xa0,0x2b,0x31,0xcd,0xc5,0x15,0x74,0x19,0x5a, - 0x15,0x74,0x27,0xc9,0x5c,0x5b,0x1b,0x4d,0x7a,0x1e,0x76,0x5b,0xd8,0x23,0x96,0x02, - 0xab,0x74,0x58,0x1a,0x6c,0xa6,0xc3,0x32,0x60,0x73,0x1c,0x56,0x06,0xe6,0x6d,0x94, - 0x83,0x2d,0x70,0x58,0x16,0x6c,0x89,0xc3,0x2a,0xc0,0x96,0x3a,0xac,0x12,0x6c,0xa5, - 0xc3,0x66,0x80,0xad,0x0e,0x71,0x65,0xfe,0xf3,0x4f,0x31,0xee,0xb7,0xfd,0x56,0xe2, - 0x89,0xe7,0x66,0x97,0x83,0x89,0x12,0xfa,0x04,0xf4,0x28,0x7f,0x1a,0xdf,0xca,0xb0, - 0x37,0x55,0x92,0x23,0xd9,0x9b,0x22,0x76,0xf1,0x4f,0x97,0xe8,0x9b,0x46,0x5f,0x3c, - 0x5f,0x24,0xe7,0xb7,0xd8,0xba,0xd9,0xac,0xa4,0x03,0x3d,0x13,0xe4,0xf5,0xbb,0xde, - 0x78,0xb2,0xe4,0x46,0x3e,0xce,0xb6,0x73,0x05,0x3e,0x44,0x7a,0x0e,0x7a,0x02,0x5d, - 0xfa,0x72,0xf8,0xb0,0xc0,0xce,0x37,0x22,0x2b,0x7c,0x15,0xe7,0x2a,0xb0,0x56,0xe4, - 0xab,0x91,0x17,0x7f,0x0d,0xb4,0x9c,0xa3,0xdf,0x44,0xcc,0xf1,0x5c,0x0f,0xcf,0x2c, - 0xb3,0xd2,0x80,0x7d,0xd9,0x6e,0xb4,0xbd,0x01,0xdf,0x74,0x9e,0xeb,0xf2,0x35,0xdf, - 0x2c,0xab,0x16,0x8d,0x6e,0x65,0x59,0x91,0x2f,0xe7,0x96,0x7c,0x99,0x4f,0x3d,0xe7, - 0xe1,0xbb,0xce,0x4d,0x60,0xad,0x2e,0x37,0xe5,0xf0,0x37,0x43,0x93,0xbe,0x3a,0xf3, - 0x62,0x21,0x7e,0xdc,0x6e,0xfb,0x42,0xfc,0x8a,0x72,0xcb,0x89,0x41,0x72,0x2b,0x90, - 0x6b,0x84,0xde,0x40,0xff,0xd8,0xb7,0x66,0x91,0x69,0x17,0x9e,0x07,0x5b,0xed,0x74, - 0xb4,0x91,0xb7,0x78,0x5e,0x4f,0x9f,0x4a,0xe7,0x06,0x74,0xe6,0x1c,0xbd,0x93,0x9e, - 0x8d,0xe7,0xed,0x25,0xb1,0xec,0xb4,0xf5,0x8f,0x7d,0xf1,0x3c,0xe0,0xf2,0x2e,0x9f, - 0x06,0x5d,0x9d,0x9e,0x43,0x36,0x1b,0xfa,0x67,0x46,0xb2,0x0f,0x5b,0x29,0x78,0x4a, - 0x77,0xc9,0xbc,0xc4,0xef,0x7d,0xe4,0x53,0xe7,0xfd,0x60,0x0d,0x96,0x9d,0x03,0xf0, - 0xbd,0x02,0x76,0x00,0x3e,0x9d,0x27,0xc0,0x1a,0xad,0xe6,0xaf,0xa2,0x23,0xfa,0x79, - 0xa8,0x24,0xb7,0x47,0xe9,0x3f,0xe5,0xfe,0x6d,0x7a,0x22,0x9e,0xdf,0xc1,0x4f,0xdf, - 0x4f,0x27,0x15,0x77,0xa8,0x73,0x26,0xcc,0x58,0x2e,0xf4,0x4b,0x71,0x96,0x4e,0xe3, - 0xd3,0xa7,0xd8,0x98,0xc2,0x27,0x9d,0xa7,0x4b,0xec,0x9e,0x21,0x1f,0xe2,0xff,0x0a, - 0x9a,0xef,0xe3,0x0b,0xe4,0x7f,0x91,0x71,0x69,0x1e,0x2e,0x82,0x5d,0xa0,0xa7,0x97, - 0x5b,0xad,0xd3,0xf8,0x96,0xe0,0xf3,0xef,0x86,0xa8,0xbf,0x7e,0xb3,0xd3,0x25,0xf0, - 0xbf,0xec,0xb7,0x66,0xe6,0x6b,0xe8,0xda,0xd7,0x1a,0x57,0x0d,0x77,0x60,0x15,0x33, - 0x95,0xc7,0x6e,0x2d,0xf8,0xb8,0xf1,0xe4,0xc2,0xac,0x17,0x31,0xcd,0xd5,0x1e,0x7c, - 0xaf,0x03,0x8f,0x7a,0x66,0xa1,0xa7,0xde,0xe9,0x99,0x0d,0x1e,0x65,0xe6,0x80,0x3d, - 0x6c,0x32,0x15,0xdc,0x23,0x75,0xe0,0xd2,0xd3,0xcc,0xfd,0xd3,0xc4,0x9c,0xe4,0x99, - 0xc9,0x16,0xf0,0xcd,0x26,0x25,0xb9,0xdb,0xc0,0x5a,0xc8,0x59,0x26,0xe4,0xb6,0x3c, - 0xcc,0xcd,0x1d,0xd0,0xa5,0xfb,0x98,0xc9,0x6b,0x8e,0xee,0x04,0x57,0x4e,0x5a,0xc9, - 0xc9,0x9f,0x46,0x13,0x7e,0x57,0xc8,0x77,0x31,0x2f,0xfa,0xfd,0x87,0xed,0x97,0x38, - 0xb7,0x3a,0x9b,0x77,0x3b,0x9b,0xb1,0x4f,0x47,0x88,0xe3,0x1e,0xec,0x89,0xa7,0x8f, - 0x7b,0x65,0x19,0xb8,0xe2,0x5a,0xc1,0x9d,0xdf,0xc4,0x1c,0xe7,0xe1,0xb9,0x17,0xfc, - 0x45,0x66,0x76,0x15,0x72,0xc2,0x47,0xc1,0xd6,0x80,0xe7,0x9d,0xae,0xb5,0xe8,0x6a, - 0x73,0xba,0xd6,0x81,0x8f,0x21,0x77,0x3f,0xb2,0xeb,0x90,0xdb,0x10,0xee,0xf0,0xa2, - 0xdc,0x7a,0x57,0xa3,0x8d,0xe0,0x1f,0x19,0x8f,0x72,0xf5,0x20,0x58,0x35,0xf9,0xea, - 0x70,0xf9,0x12,0xad,0xdd,0x56,0x07,0xf9,0x69,0x0f,0x77,0x44,0x79,0x98,0x97,0x87, - 0xb0,0xa9,0xef,0x05,0xe6,0x7f,0x33,0xf8,0x16,0xab,0xbe,0x7c,0xfa,0x0e,0x2c,0xf2, - 0x29,0xd7,0x51,0x97,0xf6,0x5f,0x2c,0x9b,0xe2,0xfb,0x01,0x9e,0x56,0x64,0xda,0x5d, - 0x0c,0x5b,0x88,0xa1,0xd3,0xc5,0xb0,0x15,0x3c,0xc6,0xf0,0x08,0x58,0x8c,0xa1,0xe0, - 0x62,0x10,0xad,0xcb,0x56,0x01,0xbb,0x5d,0x2e,0x86,0x6d,0xd8,0x4e,0xb9,0x18,0x1e, - 0x05,0x8f,0x31,0x7c,0x0f,0x16,0xf9,0x14,0x43,0xd4,0x55,0x70,0x31,0x5c,0x81,0xa7, - 0x03,0x99,0x2e,0x17,0xc3,0x63,0xc4,0xb0,0xdd,0xc5,0xf0,0x38,0x78,0x8c,0xe1,0x09, - 0xb0,0x18,0x43,0xb7,0x8b,0x41,0xb4,0x1d,0xb6,0xba,0xb1,0xbb,0x83,0x3e,0x95,0xdd, - 0xa7,0xb0,0x7d,0xc5,0xdd,0xa5,0xf2,0x31,0xf2,0x76,0x3b,0x1f,0x7f,0x82,0xaf,0x80, - 0x9c,0xf4,0x4c,0x5a,0x9c,0x9a,0xd5,0x5d,0xf4,0xc2,0x4e,0x7a,0x56,0x3a,0x7a,0xd0, - 0xd1,0xe3,0x74,0x5c,0x43,0x8f,0xf4,0x5e,0xb6,0xd5,0x0f,0x4d,0x31,0xfd,0x88,0xff, - 0xa2,0x5d,0x77,0x34,0xe9,0xbf,0x4a,0xff,0x8a,0xf6,0x09,0xb4,0x29,0x62,0xdf,0x0d, - 0x5d,0xef,0xc9,0xaf,0x16,0x6f,0x1f,0xf4,0x18,0xbf,0xe8,0xbd,0x61,0xd6,0x8a,0xfe, - 0xf4,0xba,0x1a,0x3e,0x83,0x4f,0xfa,0xbe,0x44,0xdf,0xb3,0xe0,0x83,0xe4,0x72,0xd8, - 0xe9,0x12,0x6d,0xc8,0xd6,0x30,0xba,0x86,0xa8,0x93,0xde,0xab,0xe7,0xa9,0xd3,0x00, - 0x75,0xca,0x86,0xbe,0x28,0xe2,0x7d,0xf4,0xc7,0x08,0xd8,0x59,0x6c,0x8d,0x62,0x6b, - 0x84,0x9c,0x45,0xbd,0xc3,0xc4,0x2e,0x9e,0xbd,0xf8,0xd4,0x0b,0xff,0x10,0x7e,0x8d, - 0x3b,0xbf,0xf6,0x86,0x59,0x4e,0x02,0x26,0xf9,0x31,0x7c,0xd0,0x3b,0xf6,0x32,0xef, - 0xa0,0xce,0x7a,0xf3,0x0e,0xf2,0xde,0x15,0xcc,0x07,0xbd,0x75,0xaf,0xc1,0x73,0xd0, - 0xdd,0x19,0xaf,0x13,0xcb,0x21,0x77,0x67,0x1c,0x06,0x8f,0xf7,0xcf,0x11,0x72,0x77, - 0xd8,0xe5,0xe0,0x0d,0xe4,0x8e,0xba,0x1c,0xbc,0x09,0x1e,0x73,0xf0,0x16,0x58,0xac, - 0xc1,0x31,0x74,0x25,0x0e,0x3b,0x0e,0x96,0x0a,0xf7,0x7f,0x36,0xbc,0xb3,0x27,0xe0, - 0x3d,0x8e,0x8e,0x6d,0x96,0x1f,0xbd,0xb7,0xef,0x12,0xc3,0x09,0xee,0xf7,0x41,0xf4, - 0xa8,0xa7,0xde,0x83,0xae,0xef,0x5b,0xb0,0xf7,0xc1,0x4f,0xf2,0x66,0xc9,0xc7,0x0f, - 0xe8,0xa1,0xce,0xf0,0xee,0x15,0xf9,0x4e,0xc1,0x2b,0xda,0x37,0x60,0x1f,0xd2,0xa7, - 0xa7,0xa8,0x57,0xcc,0xf7,0xb8,0xeb,0xe3,0xeb,0xf0,0x0c,0xc3,0x3f,0xe6,0x62,0x9f, - 0x64,0x56,0x46,0x89,0xf3,0x63,0xea,0x3f,0xe9,0xee,0x8c,0xcb,0xe0,0xd7,0xdc,0x3c, - 0xf6,0x63,0xa7,0x9f,0x77,0x24,0xcb,0x1c,0x5c,0xfd,0x9f,0x79,0xeb,0x73,0xf5,0xf8, - 0x8c,0x7a,0x9c,0x71,0xf5,0x38,0x0b,0xbe,0x87,0xbb,0xe4,0x1c,0x58,0x7c,0xbf,0x3f, - 0xe7,0xdd,0x3d,0x87,0x2d,0x61,0x5f,0x80,0xd7,0x06,0xdd,0xd9,0xf0,0xff,0xe3,0x3c, - 0xff,0x51,0xda,0xa0,0xdf,0x67,0x3d,0x79,0x9e,0xd8,0xfd,0xbb,0xa8,0xfd,0x6f,0xab, - 0xe4,0x4a,0x5b,0xff,0x02,0x8d,0xed,0x49,0xea,0xfc,0x0d,0x00,0x00 + 0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x02,0xff,0x6d,0x96,0x7f,0x68,0x56,0x55, + 0x18,0xc7,0xef,0x7d,0xdf,0x77,0xef,0xe6,0x6b,0xdb,0x5c,0x6d,0xfe,0xd8,0xeb,0xaf, + 0x39,0xd1,0x6a,0xc3,0x0c,0x72,0x19,0xba,0x9c,0xa2,0x66,0x4e,0x32,0xb5,0x0d,0xc3, + 0x6a,0x2b,0xfa,0x67,0x83,0x74,0x90,0x7f,0xb8,0x4d,0x34,0xf7,0x03,0x2a,0x6b,0xa3, + 0x36,0xb0,0x56,0x6d,0x98,0xd9,0xb4,0xcc,0x34,0x4b,0x2d,0xac,0x24,0xca,0x21,0x85, + 0x08,0x41,0xae,0x81,0x65,0x10,0xf9,0xa3,0xff,0x04,0xfb,0x69,0xac,0xe7,0x39,0xf7, + 0x73,0xea,0xe1,0xad,0x0b,0x87,0x7b,0xcf,0xf7,0xf9,0xf9,0x7d,0xce,0x73,0xce,0x3d, + 0xf1,0x58,0x69,0x76,0x10,0x84,0x41,0x2a,0xc8,0x09,0x66,0x84,0x81,0x7b,0x0a,0x82, + 0x58,0xa0,0x9f,0x63,0x83,0xa4,0x7b,0xdf,0xb3,0x6a,0xdd,0xaa,0x39,0x4f,0x6e,0x7e, + 0x7c,0xce,0x1d,0xf3,0xe6,0xaa,0x3c,0x2f,0x88,0x3b,0x3d,0x95,0xe5,0x8b,0x4e,0x96, + 0xbc,0x13,0x32,0x9e,0x78,0xb4,0x61,0xa3,0xe2,0xb9,0x32,0xc6,0x09,0x9e,0x70,0xbe, + 0x02,0xf1,0x1c,0x0d,0xe7,0x4b,0xd0,0x5c,0xe7,0x3b,0x08,0x26,0xcb,0x58,0x21,0xd6, + 0x53,0xa2,0xb0,0x41,0x29,0x6f,0x8f,0x85,0x60,0x39,0x06,0x8b,0x81,0x8d,0x33,0x58, + 0x1c,0x6c,0xa2,0xc1,0x12,0x60,0x36,0x46,0x16,0xd8,0x74,0x83,0x25,0xc1,0x66,0x1a, + 0x2c,0x1b,0xec,0x66,0x83,0xe5,0x80,0x95,0x1b,0x6c,0x0c,0xd8,0x5c,0x83,0xa5,0xc0, + 0xaa,0x1c,0xd7,0xf8,0x3f,0x39,0x2b,0xef,0x3d,0xf2,0x9e,0x01,0x47,0x3f,0x2f,0x31, + 0x75,0x19,0xcc,0x90,0x0f,0x22,0xf7,0xf6,0xe7,0xc8,0x37,0x41,0xbc,0xe1,0x8c,0xba, + 0x69,0xbc,0x61,0xea,0xa1,0xfa,0x23,0x19,0xfe,0x46,0xf0,0xe7,0xe7,0x97,0x59,0x87, + 0x49,0x32,0x6e,0x92,0x28,0x31,0x27,0x8f,0x3b,0x7b,0xfd,0x2e,0x12,0x9d,0x24,0xf5, + 0xd2,0x1c,0x27,0xc8,0x3c,0x9b,0x1c,0xbc,0x3c,0x85,0x3c,0x40,0x3e,0x96,0x1a,0xc4, + 0x1d,0x9e,0x08,0x6e,0xc0,0x56,0xf1,0x05,0xcc,0x73,0xc1,0xca,0xb0,0xcf,0xc3,0x5e, + 0xf5,0xf3,0x91,0xa5,0x8c,0xfc,0x46,0x38,0xfb,0x79,0x11,0x3a,0xe3,0x25,0x4a,0x31, + 0xf1,0x35,0x76,0x5a,0xde,0xc5,0xe4,0xa6,0xf3,0xc9,0xa6,0x5e,0x53,0x25,0xaa,0xae, + 0x45,0xda,0x8c,0xa4,0x19,0x29,0x33,0xbc,0x9d,0xe6,0x33,0x95,0x75,0x9e,0x42,0xfe, + 0x3a,0x9f,0x06,0x56,0x66,0xea,0x33,0x06,0xfd,0x12,0xbe,0xd5,0x47,0xa1,0x64,0x32, + 0x8b,0x5c,0x66,0xcb,0x7b,0x16,0xb9,0x79,0xbb,0x0a,0x78,0xa8,0xdd,0x9d,0xd8,0xa5, + 0x91,0x2b,0x8f,0x85,0x51,0x59,0x16,0x95,0xcb,0x5a,0x2b,0x5e,0x09,0xb6,0xd0,0xf8, + 0xa8,0xa2,0x76,0x7e,0xbe,0xcc,0xe4,0xbe,0x1c,0x9f,0x29,0x23,0x5f,0x43,0x7f,0xfb, + 0xf9,0x06,0x7a,0xdb,0xcf,0x75,0x03,0x8f,0xca,0xe3,0xe7,0xdb,0x4c,0xed,0x35,0xa7, + 0x36,0xb3,0x56,0x4f,0xe3,0x3f,0x69,0xec,0x77,0xb1,0xcf,0x26,0x89,0x64,0x37,0xb1, + 0x39,0x56,0xfe,0xf3,0x56,0x1f,0xaf,0xf3,0xbd,0x9b,0xfa,0xea,0x7c,0x0f,0x58,0xb1, + 0x54,0x6b,0x2f,0x7a,0x6f,0x82,0xed,0x45,0x4f,0xe7,0x83,0x60,0x69,0xe9,0x83,0xfd, + 0xf8,0xf0,0x79,0x1c,0xc8,0xa8,0xf5,0x21,0x7a,0x52,0xd7,0xe2,0x7d,0xfa,0xc4,0xcf, + 0x8f,0x93,0xa7,0xed,0xb1,0x13,0x5a,0x07,0xb7,0xee,0x71,0xb7,0xef,0x52,0xae,0x87, + 0xa2,0xfd,0x75,0x8e,0x9c,0xbe,0x25,0xc6,0x30,0x39,0xe9,0x7c,0x24,0x23,0xee,0x79, + 0x6c,0x55,0xff,0x27,0x64,0xb6,0xb7,0x2f,0x51,0xff,0x72,0xd1,0xd6,0x3d,0x72,0x19, + 0xec,0x12,0x7d,0x5e,0x21,0xd5,0x8c,0x91,0x5b,0x40,0xce,0xbf,0x09,0xa2,0x35,0xfe, + 0x55,0x66,0x57,0xc0,0xff,0x94,0x6f,0xdd,0x47,0x3f,0x23,0xd7,0xf7,0x62,0xd1,0xca, + 0xe7,0xac,0xcc,0x65,0x9f,0x55,0x12,0xb7,0x00,0xbc,0x43,0x74,0x52,0x6e,0xff,0x47, + 0x98,0xee,0xb5,0xad,0xe4,0x5e,0x08,0xee,0xfd,0x8c,0xc7,0x4f,0x91,0xf1,0x33,0x01, + 0xdc,0xdb,0x4c,0x04,0xbb,0x5f,0x6c,0xb2,0x39,0x5b,0x0a,0xc1,0xd5,0x4f,0x09,0x67, + 0xd2,0x34,0xf6,0x4d,0x25,0xfb,0xb4,0x14,0x7c,0xb5,0x58,0x65,0x73,0x1e,0x97,0x32, + 0x62,0xf0,0x3e,0x22,0xf6,0xb3,0x39,0x97,0x67,0xe2,0xbb,0x4f,0xec,0x75,0x5f,0xdd, + 0x02,0xae,0x35,0x29,0xa3,0x26,0x7f,0x88,0x4c,0xf1,0x5b,0x5d,0xbd,0xa3,0xba,0xe8, + 0xf7,0xef,0xf2,0xbe,0xc2,0xbc,0xcc,0xc4,0xbc,0xcd,0xc4,0xf4,0x7d,0xfa,0x14,0x3c, + 0x6e,0x27,0x9e,0xea,0x6c,0xe2,0xac,0x99,0x07,0xae,0xbc,0x74,0xff,0xce,0x87,0x57, + 0x05,0xbc,0x54,0xe7,0x2e,0xf0,0x4e,0xf6,0xf0,0x02,0xec,0x14,0xdf,0x01,0xb6,0x08, + 0xbc,0xd2,0xf8,0x5a,0x8c,0xaf,0x2a,0xe3,0x6b,0x09,0x78,0x3b,0x76,0x4b,0xb1,0x5d, + 0x82,0xdd,0x72,0x77,0xae,0x47,0x76,0xcb,0xcc,0x1a,0xad,0x00,0x7f,0x5b,0x74,0xb4, + 0x56,0xf7,0x82,0xe5,0x51,0xaf,0x6a,0x53,0x2f,0x95,0xad,0x94,0x51,0x4d,0x7d,0x56, + 0xba,0x33,0x23,0xcb,0xed,0x97,0xfb,0x88,0xa9,0xcf,0x76,0xce,0x83,0xd5,0xe0,0x6b, + 0x65,0xf5,0x35,0xa7,0xab,0x60,0x5e,0x4f,0x6b,0xed,0x7d,0xe9,0xfb,0x9a,0x54,0x33, + 0x4d,0x71,0x97,0xb2,0x2e,0x57,0x89,0xe9,0x39,0xac,0x85,0xc3,0x1a,0xc3,0x61,0x1d, + 0xb8,0xe7,0xf0,0x00,0x98,0xe7,0x50,0x6b,0x38,0xa8,0xac,0x46,0x46,0x2d,0x71,0x6b, + 0x0c,0x87,0xf5,0xc4,0x0e,0x0d,0x87,0x07,0xc1,0x3d,0x87,0x6b,0x60,0x5e,0x4f,0x39, + 0x78,0x5f,0xb5,0x86,0x43,0x18,0x46,0x3a,0xd5,0xd8,0xd4,0x18,0x0e,0x0f,0xc1,0x61, + 0x83,0xe1,0xf0,0x30,0xb8,0xe7,0xf0,0x08,0x98,0xe7,0x50,0x6f,0x38,0xa8,0xac,0x4e, + 0x46,0x3d,0x71,0xeb,0xe8,0x53,0x8d,0xfb,0x18,0xb1,0xc3,0xf0,0xdf,0xb3,0x54,0x73, + 0xf4,0xba,0xf5,0x26,0xc7,0x24,0x7a,0xb5,0xd8,0xd5,0x11,0xab,0x31,0x23,0x56,0x83, + 0x8c,0x26,0xec,0xf5,0x7b,0xbf,0xd4,0x22,0xe9,0x7a,0x3d,0xaa,0xf5,0x46,0xfa,0x5a, + 0xe3,0x34,0xa2,0xd7,0x64,0xf4,0x36,0xd3,0x57,0xff,0xa7,0xd7,0x48,0x3e,0xaa,0x97, + 0x0e,0x23,0x9f,0x0d,0xf4,0x76,0x93,0x91,0x15,0x86,0x11,0xd6,0x80,0xbf,0x26,0xfc, + 0x6c,0xc1,0xcf,0x16,0xc3,0x2b,0x11,0x46,0xdc,0xd4,0x77,0x89,0xbc,0x5b,0x91,0xb9, + 0xbb,0x47,0x18,0xd5,0x54,0x65,0xd3,0x8d,0xcc,0xdd,0x5b,0x88,0xa1,0xb2,0x6f,0x82, + 0x48,0x76,0x98,0xf5,0xd8,0x8e,0x5c,0xff,0x79,0xbf,0x48,0x5d,0x5a,0x90,0xfb,0x3a, + 0xa9,0xbc,0x59,0x46,0x0b,0xf9,0x34,0x9b,0xbe,0xda,0x41,0x4e,0xfa,0x7c,0x82,0xbf, + 0x76,0xf0,0x36,0x6a,0xde,0x69,0x7c,0xb5,0xbb,0xb3,0x37,0x70,0x98,0xfa,0xea,0xa0, + 0x77,0xf4,0x9f,0xfa,0x0c,0xbd,0xb3,0x8d,0xde,0xd1,0xbc,0x9f,0x05,0xdf,0x44,0xcf, + 0xee,0x04,0x3b,0x4e,0xac,0xe7,0x88,0xb5,0x93,0x9a,0x79,0xbf,0x9d,0x70,0x57,0x9d, + 0xe7,0xc9,0xa9,0x19,0xfd,0x0e,0xf2,0xea,0x36,0x79,0xa9,0x4e,0x97,0x8c,0x6e,0xec, + 0xbb,0x0c,0xc7,0x17,0xe0,0x18,0x1a,0x8e,0x2f,0x82,0x7b,0x8e,0xbd,0xc6,0x97,0xca, + 0x7a,0x64,0xf4,0xe2,0xab,0xc7,0x70,0x7c,0x09,0x8e,0xbb,0x0c,0xc7,0x97,0xc1,0x3d, + 0xc7,0x3e,0x30,0xcf,0xf1,0x15,0x62,0xf5,0xc1,0xd1,0xfb,0xed,0x35,0x1c,0x5f,0x25, + 0xa7,0x2e,0xf4,0x7b,0xd0,0xf5,0x7c,0xba,0x8d,0xee,0x6b,0xd4,0xa4,0x13,0xbb,0x5e, + 0x38,0x0c,0x18,0x0e,0xaa,0xd3,0x2f,0x63,0x00,0xfb,0x7e,0xf2,0xd5,0xbb,0xc6,0x1b, + 0xdc,0x55,0x74,0xae,0xf7,0x92,0x7d,0xdc,0x49,0x6a,0x25,0x5f,0xbd,0x8f,0xbc,0x85, + 0xce,0x3e,0x73,0xae,0xbf,0x03,0xef,0x03,0xe6,0x5c,0x3f,0x08,0xee,0xff,0x11,0xef, + 0x52,0xe7,0x83,0xa6,0x5e,0x87,0xb1,0x3b,0x64,0xea,0xf5,0x1e,0xb8,0xaf,0xd7,0x11, + 0x30,0xbf,0x5e,0x1f,0xe0,0x2b,0x30,0xd8,0x51,0xb0,0xd0,0xfd,0xa3,0x93,0xee,0x2e, + 0x74,0x0c,0xdd,0xa3,0xf8,0x58,0x2f,0xf5,0xd1,0x3b,0xd1,0x87,0x70,0x38,0xc6,0x3f, + 0xb8,0x0d,0x3f,0xba,0xc7,0x3e,0x42,0xae,0xcf,0x10,0xd8,0xc7,0xe0,0x27,0xb8,0x57, + 0x68,0x8e,0x9f,0xb2,0xa7,0xf4,0x1c,0xfc,0x1c,0xbd,0x93,0xe8,0xaa,0xec,0x0b,0xb0, + 0xcf,0xd8,0xb7,0x27,0x59,0x2f,0x5f,0xef,0x01,0xb3,0xaf,0x75,0x2f,0xab,0x4e,0x37, + 0xfa,0xfd,0xac,0xd7,0x50,0xc6,0x59,0x76,0x4a,0xc6,0x19,0xec,0x4f,0x99,0xfa,0x9c, + 0xe6,0xfc,0xf1,0xb5,0xf8,0xd2,0xf4,0xf3,0x0e,0xb0,0xaf,0xc0,0x4f,0x9b,0xff,0xc1, + 0x75,0xf0,0x84,0xf9,0x1f,0x0c,0xe1,0xff,0x8c,0xf1,0x7f,0x96,0x33,0xcc,0xfb,0xfa, + 0x9a,0x3d,0x79,0xd6,0xf8,0x1a,0x05,0xf7,0x67,0x85,0xf5,0x35,0x64,0xce,0x37,0x3d, + 0xd3,0xae,0xc3,0x65,0x14,0x3e,0xaa,0xdb,0x8a,0x6e,0x2b,0x77,0x93,0x24,0xe7,0x98, + 0xd6,0xb8,0x22,0xe3,0xbc,0x6c,0x31,0xfd,0xf3,0x1d,0xfd,0x73,0xde,0xf4,0xcf,0xf7, + 0xe0,0x5b,0xf9,0x3f,0x5d,0x00,0xf3,0x77,0xc2,0x1f,0xb8,0xcb,0x5d,0x20,0x96,0x62, + 0x3f,0x82,0x17,0x38,0xdf,0x49,0x77,0xa7,0xbd,0xc8,0xbd,0xb7,0x0a,0xf9,0xdd,0xb2, + 0x26,0x17,0x59,0x4f,0x7b,0xd7,0xd2,0xf7,0x5f,0x52,0xc1,0xf9,0x32,0xfe,0x06,0x12, + 0x24,0x9e,0x45,0x78,0x10,0x00,0x00 }; // Generated from: @@ -105,13 +118,14 @@ constexpr uint8_t kBlitResolveStencilNoExport_comp_00000001[] = { // vec2 invSrcExtent; // int srcLayer; // int srcWidth; -// -// ivec4 blitArea; -// int destPitch; +// int srcHeight; // // bool flipX; // bool flipY; // bool rotateXY; +// +// ivec4 blitArea; +// int destPitch; // } params; // // layout(set = 0, binding = 0)buffer dst @@ -147,14 +161,23 @@ constexpr uint8_t kBlitResolveStencilNoExport_comp_00000001[] = { // if(params . rotateXY) // srcImageCoords . xy = srcImageCoords . yx; // -// int xDir = params . flipX ? - 1 : 1; +// int xDir = 0, yDir = 0; +// if(params . rotateXY) +// { +// yDir = params . flipY ? - 1 : 1; +// } +// else +// { +// xDir = params . flipX ? - 1 : 1; +// } // // uint outStencils = 0; // // for(int i = 0;i < 4;++ i) // { // -// if(srcImageCoords . x >= 0 && srcImageCoords . x < params . srcWidth) +// if((srcImageCoords . x >= 0 && srcImageCoords . x < params . srcWidth)&& +// (srcImageCoords . y >= 0 && srcImageCoords . y < params . srcHeight)) // { // // uint stencilValue = texture(usampler2DArray(stencil, blitSampler), vec3(srcImageCoords * params . invSrcExtent, params . srcLayer)). x; @@ -163,7 +186,14 @@ constexpr uint8_t kBlitResolveStencilNoExport_comp_00000001[] = { // // } // -// srcImageCoords . x += xDir; +// if(params . rotateXY) +// { +// srcImageCoords . y += yDir; +// } +// else +// { +// srcImageCoords . x += xDir; +// } // } // // destData[gl_GlobalInvocationID . y * params . destPitch + gl_GlobalInvocationID . x]= outStencils; diff --git a/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000002.inc b/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000002.inc index ef33fb50443..3cbbd25e010 100644 --- a/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000002.inc +++ b/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000002.inc @@ -10,75 +10,87 @@ #pragma once constexpr uint8_t kBlitResolveStencilNoExport_comp_00000002[] = { - 0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x02,0xff,0x5d,0x95,0xdb,0x6f,0x54,0x55, - 0x14,0xc6,0xf7,0xcc,0xb4,0x33,0x65,0xa4,0x2d,0xc5,0x16,0x90,0x7b,0xad,0x29,0xe8, - 0x18,0xc0,0x04,0x99,0x8a,0x14,0x95,0x26,0x22,0xd8,0x56,0xb0,0x28,0x8d,0x2f,0xb5, - 0x09,0xb4,0x35,0x08,0xb6,0x11,0xd0,0x36,0xe5,0xa6,0x42,0x20,0x3e,0x98,0x40,0x6d, - 0x02,0x42,0x42,0xe4,0x16,0x63,0xa2,0x21,0x26,0x88,0xd6,0x27,0xd4,0xf8,0x17,0x79, - 0x41,0x62,0x74,0x7d,0xfb,0xfc,0xb6,0xac,0xcc,0x49,0x76,0xf6,0x59,0xdf,0xba,0x7e, - 0x6b,0xaf,0x7d,0x4e,0x21,0xdf,0x51,0x0a,0x21,0x17,0xca,0xa1,0x21,0xfc,0x1c,0xb2, - 0xa7,0x25,0xe4,0x0d,0x09,0xe1,0x91,0x50,0x8c,0xfb,0xf6,0xde,0x81,0xde,0x75,0xef, - 0x1f,0xde,0xb7,0x6e,0xe3,0xb3,0x1b,0xa4,0x6f,0x0a,0x85,0x68,0x27,0x5d,0xb3,0xd9, - 0xd4,0xdb,0x5e,0x67,0xeb,0xe0,0xf0,0x3b,0x87,0x84,0x37,0xda,0x5a,0x60,0x78,0x5d, - 0x8c,0x15,0x2c,0x72,0xb6,0x62,0x2c,0x43,0x1b,0x63,0xec,0x10,0x96,0xdb,0x7a,0xc5, - 0xbc,0x57,0x90,0xb7,0x83,0x3d,0x61,0x39,0xb0,0x06,0x87,0xe5,0xc1,0x16,0x38,0xac, - 0x00,0xb6,0xc4,0x61,0x75,0x60,0x3e,0x47,0x3d,0xd8,0x6a,0x87,0x15,0xc1,0x36,0x38, - 0xac,0x04,0xb6,0xd1,0x61,0x0d,0x60,0x5d,0x0e,0x9b,0x07,0xb6,0x25,0xf2,0x2a,0xfc, - 0x5f,0x9f,0x38,0x1e,0xb7,0xfd,0x71,0xf8,0x24,0xb9,0xdd,0xf5,0xe0,0x02,0xb9,0xeb, - 0x88,0x37,0x53,0xd3,0x03,0xc5,0x9b,0x81,0x9b,0xec,0x67,0x6b,0xe2,0xcd,0x12,0x2f, - 0xc9,0x37,0xe8,0xe9,0x63,0xb6,0x1e,0xb5,0x2a,0xf2,0x51,0x5f,0x88,0xfe,0x7a,0x6f, - 0x33,0x9b,0x22,0xdc,0x55,0xc3,0x62,0x93,0x4b,0xd4,0x90,0xf4,0x65,0xf4,0x01,0xbd, - 0xe2,0x95,0xa9,0x61,0xb5,0xc9,0xf3,0xf1,0x15,0xfe,0x3c,0x72,0x23,0x58,0x05,0xff, - 0x26,0xfc,0x65,0xdf,0x8c,0xae,0xec,0xf4,0x0b,0xe1,0x9c,0xe4,0x36,0x6c,0x16,0x59, - 0x96,0xa5,0xe4,0x57,0xee,0x65,0xb6,0x2f,0xa5,0x36,0xc9,0xcb,0x5d,0xbf,0x56,0x5a, - 0xe6,0x74,0x4e,0xcb,0x58,0x45,0x56,0xb2,0x2b,0xbb,0xa5,0x5a,0x56,0x72,0x5e,0x2b, - 0xa8,0x5d,0xf2,0x2a,0xb0,0x8a,0xeb,0x4d,0x3d,0xf6,0xed,0xe8,0x14,0xaf,0xd5,0xaa, - 0xe8,0xa4,0x8e,0x35,0xb6,0x77,0x52,0x57,0xf2,0xab,0x3a,0xce,0x5d,0xf8,0x95,0x9c, - 0xbe,0x1b,0x59,0xfa,0xad,0xe8,0xcb,0x4e,0xbf,0x83,0xf9,0x4a,0xf2,0x40,0x4d,0x5d, - 0x43,0xb6,0xfe,0xb5,0x27,0xc9,0x6f,0xbb,0x9e,0x4b,0x3e,0x40,0x5f,0x14,0xff,0x30, - 0xbe,0xc5,0x38,0x0b,0xf3,0xc2,0x34,0xb9,0x72,0xe1,0xe1,0x93,0x73,0xb2,0x7c,0x8e, - 0xf1,0x3e,0x4d,0x6f,0x24,0x1f,0x77,0x73,0x70,0x8a,0x18,0xfe,0xdc,0x4e,0xab,0xa6, - 0xd8,0xcf,0x42,0x9c,0xe5,0x72,0x3c,0x97,0x6c,0x66,0x2f,0x10,0xf7,0x73,0xfa,0x34, - 0x43,0x5c,0xc9,0xb3,0x35,0xbd,0xbb,0x48,0xad,0xb2,0xff,0x12,0x9d,0x9f,0x97,0xeb, - 0xf4,0xe6,0x69,0xb3,0xd2,0xdc,0xdd,0x00,0xbb,0xce,0xec,0x6c,0xb2,0x13,0xcb,0x53, - 0x5b,0x60,0x56,0xff,0x32,0x44,0xe7,0xf8,0xa7,0x49,0x37,0xc1,0x1f,0xd8,0xbb,0x66, - 0xf3,0x16,0x7a,0xed,0x2f,0x99,0x55,0x33,0xdf,0x92,0x46,0x66,0xb7,0x9b,0xbc,0x2d, - 0xe0,0x9f,0x98,0x4d,0x39,0xde,0xa9,0x0c,0x5b,0x18,0xfb,0x94,0xd5,0xde,0x0a,0x9e, - 0xe2,0x2c,0x22,0x4e,0x9b,0x8b,0xb3,0x18,0x3c,0xf9,0x2c,0x01,0xdb,0x65,0x3e,0x25, - 0xee,0x6b,0x2b,0xb8,0xe2,0xb4,0x73,0xcf,0x57,0x31,0x8f,0xdd,0xcc,0x7e,0x07,0xf8, - 0x6b,0xe6,0x25,0xbf,0x27,0xc0,0x3a,0xe8,0x99,0x78,0x7f,0x67,0xfe,0x9a,0xcf,0xb5, - 0xe8,0x15,0xfb,0x92,0xf9,0x6b,0x5e,0x9f,0x04,0x57,0x4f,0x2a,0xf4,0xe4,0x6f,0xd3, - 0x09,0x7f,0x2a,0xf6,0x3b,0xeb,0x8b,0xde,0xef,0xdb,0x7e,0x13,0xb9,0xe2,0x72,0xae, - 0x77,0x39,0xd3,0x1c,0x9d,0x84,0xc7,0x33,0xe4,0x5b,0x0f,0x0f,0xdd,0x83,0xe7,0xe0, - 0x51,0x85,0x87,0xec,0x36,0x83,0x7f,0x84,0xdf,0x16,0x7c,0x37,0xe3,0xa7,0xfb,0xf1, - 0x02,0x7e,0xdd,0xae,0x8f,0x2f,0x82,0x7f,0x6d,0x36,0x9d,0xd1,0x36,0xc3,0x9a,0xe0, - 0xd4,0xe3,0x38,0x49,0xb7,0xcd,0x56,0x0f,0x1c,0xf4,0xbe,0xdb,0xfc,0xd4,0xff,0x97, - 0xc9,0x19,0xe2,0x8c,0x67,0x67,0xb2,0x1d,0xfc,0x75,0x93,0x54,0xd3,0x37,0x60,0xc9, - 0x4e,0xfd,0x48,0xb1,0xb4,0xff,0x4e,0x3f,0xbe,0xc7,0xa6,0x82,0xcf,0x36,0xc7,0x61, - 0x27,0x1c,0x76,0x38,0x0e,0xaf,0x82,0x27,0x0e,0xbd,0x60,0x89,0x43,0xbf,0xe3,0x20, - 0x5d,0x9f,0xad,0x7e,0xf2,0xf6,0x39,0x0e,0xbb,0xc8,0x9d,0x73,0x1c,0x76,0x83,0x27, - 0x0e,0xb7,0xc1,0x92,0x9d,0x38,0xa4,0x58,0xfd,0x8e,0xc3,0x5d,0x6c,0x7a,0xf0,0xe9, - 0x73,0x1c,0xf6,0xc0,0x61,0xc0,0x71,0x78,0x03,0x3c,0x71,0x78,0x13,0x2c,0x71,0x18, - 0x74,0x1c,0xa4,0xdb,0x6b,0x6b,0x90,0xbc,0x7b,0xdd,0x2c,0xbd,0x45,0xee,0xbb,0xee, - 0x5b,0xa4,0x1a,0x93,0xed,0xa0,0xab,0xf1,0x27,0xec,0xfa,0xf1,0x53,0x9c,0xaf,0x8c, - 0xa7,0x78,0x0f,0x33,0x0b,0x43,0x7c,0x17,0x15,0x63,0x3f,0x31,0xf6,0xbb,0x18,0x73, - 0xc4,0x51,0xdc,0x3b,0xb6,0xc6,0xd0,0x89,0xd3,0x8f,0xd4,0x2f,0xdd,0x3d,0xa7,0x53, - 0xfc,0x1f,0x98,0x5f,0xe9,0xce,0xa3,0xbb,0x0d,0xf7,0x77,0xd1,0xeb,0xfb,0xfb,0x87, - 0xf1,0x1d,0x45,0x9f,0xf8,0x4b,0x3f,0x62,0x6b,0x94,0x7a,0x46,0xdc,0x19,0x1e,0xa2, - 0x26,0x3d,0xdf,0x12,0xef,0x3d,0xf0,0x2a,0xbd,0x9c,0x70,0xb1,0xa4,0x1b,0xb7,0x35, - 0x41,0xac,0x71,0xce,0x49,0xdf,0xfb,0x23,0x9c,0xd3,0x01,0xce,0x49,0xf1,0x8f,0x82, - 0xa7,0x5a,0x3f,0x20,0xf6,0x51,0x7a,0x94,0xe2,0x4c,0xc0,0x55,0x36,0x1f,0x52,0xc3, - 0x08,0xf6,0xe3,0xd4,0x31,0xe5,0xea,0x90,0xcd,0xa4,0xad,0x29,0xfc,0x27,0xc9,0xa9, - 0x7f,0xc7,0x09,0xfe,0x1b,0x43,0x16,0xef,0x54,0xbc,0xe3,0x19,0x36,0xc7,0x5d,0xad, - 0xc2,0x5f,0x3d,0xff,0x18,0xbd,0x9e,0xdf,0xc0,0xce,0x80,0x9f,0xe6,0xbb,0x2b,0x1e, - 0x67,0xe9,0xb1,0xee,0xd1,0x2f,0xd8,0x9d,0xc3,0x56,0xba,0x5f,0xc1,0x3e,0xe5,0x1c, - 0xcf,0xc1,0x2f,0xd5,0x37,0xe5,0xce,0xf9,0x1e,0x36,0x13,0xd8,0x4f,0xf2,0xfd,0x52, - 0x9e,0xcf,0xe8,0xcf,0xb0,0xbb,0x43,0x77,0xc0,0xe7,0xdc,0x7c,0x8e,0x11,0x77,0xcc, - 0xf9,0x9e,0xa7,0xc6,0xda,0xf9,0x1b,0x75,0x67,0x74,0x89,0x33,0xba,0xe8,0xce,0xe8, - 0x0b,0xf0,0x69,0xee,0xd6,0x65,0xb0,0xf4,0xcf,0xb9,0xc2,0xbf,0xe2,0x32,0xb9,0x84, - 0x5d,0x05,0x6f,0x89,0xb1,0x8b,0xf1,0x9f,0x79,0x8d,0xff,0x6a,0x15,0xfd,0x56,0x3b, - 0xb3,0x6b,0x70,0xf5,0xdf,0x72,0xed,0xff,0xd8,0x6d,0xeb,0xb2,0xf5,0x1f,0x9d,0xad, - 0x56,0x74,0xf8,0x0b,0x00,0x00 + 0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x02,0xff,0x6d,0x96,0xfb,0x6b,0x96,0x65, + 0x18,0xc7,0x9f,0xf7,0xe0,0xfb,0xce,0xd7,0xb6,0xb9,0xda,0x3c,0x1f,0x5a,0x93,0x59, + 0x4d,0xd4,0xa0,0x9a,0x59,0x33,0x73,0x90,0x59,0xdb,0xd2,0x56,0x6d,0xf4,0x4b,0x1b, + 0xa4,0x2d,0xa8,0x70,0x5b,0x18,0xb5,0x91,0xa7,0x49,0x6d,0x60,0x56,0x0e,0xb3,0x13, + 0x46,0xe2,0x0f,0x5b,0x54,0x46,0x81,0xae,0x81,0x65,0x14,0x9e,0xfa,0x2d,0xe8,0x37, + 0xc1,0xcc,0xd1,0x5f,0xb0,0x8e,0x46,0x5d,0xdf,0xfb,0xfd,0xdc,0x72,0xf1,0xd2,0x03, + 0x37,0xf7,0x73,0x7f,0xaf,0xe3,0xf7,0xba,0xaf,0xfb,0x7e,0x9e,0x4c,0xba,0x2e,0x9f, + 0x24,0xa9,0xa4,0x90,0x94,0x25,0x99,0x54,0x12,0x9e,0xaa,0x24,0x9d,0xe8,0x75,0x56, + 0x92,0x0b,0xf3,0xc6,0x96,0xf6,0x96,0x95,0xfd,0x2f,0x3c,0xb5,0xf2,0xf6,0x3b,0x56, + 0x4b,0x5e,0x91,0x64,0x82,0x9e,0x64,0x95,0xa6,0x33,0xc3,0xe6,0xac,0x8d,0xe7,0xba, + 0x9f,0x79,0x5e,0x78,0xb9,0x8d,0xd9,0x86,0x67,0x83,0xaf,0xc4,0x3c,0x17,0x47,0xf0, + 0x65,0x68,0x79,0xf0,0x9d,0x24,0x8b,0x6c,0x3c,0x60,0xd6,0x8b,0x8b,0x61,0x93,0x3a, + 0xe6,0x88,0xa5,0xc0,0xca,0x1c,0x96,0x06,0x9b,0xed,0xb0,0x0c,0xd8,0x3c,0x87,0x65, + 0xc1,0x7c,0x8c,0x19,0x60,0x37,0x3a,0x2c,0x07,0xb6,0xcc,0x61,0x79,0xb0,0x9b,0x1d, + 0x56,0x06,0xb6,0xc2,0x61,0x33,0xc1,0x56,0x3b,0xac,0x00,0xb6,0x3e,0x70,0xcd,0x5c, + 0xcb,0x59,0xbc,0x0f,0xdb,0x7c,0x13,0x1c,0xe3,0xba,0xd6,0xd5,0xe5,0x24,0xf9,0x64, + 0xf1,0x37,0x51,0x52,0x17,0xf9,0x9b,0x80,0xaf,0xf4,0x27,0x4b,0xfc,0x4d,0xe2,0x2f, + 0xae,0xcf,0x53,0xe7,0xf9,0x36,0x6e,0xb0,0x2c,0xd2,0x41,0x9e,0x09,0xf6,0x7a,0xaf, + 0x31,0x9d,0x1c,0xf5,0x50,0x0e,0x73,0x6d,0x9d,0x27,0x87,0x28,0x2f,0x20,0x4f,0x90, + 0xcf,0x82,0x63,0x26,0xe0,0xd9,0xe4,0x3a,0x6c,0x85,0xdf,0xcd,0xba,0x1c,0xac,0x01, + 0xfb,0x0a,0xec,0xa5,0x5f,0x89,0xac,0xe0,0xe4,0xd7,0xc3,0x39,0xae,0x6b,0xd0,0x99, + 0x63,0x51,0x16,0x10,0x5f,0xb1,0x17,0xda,0xbc,0x80,0xdc,0xb4,0x5e,0xe4,0xea,0xb5, + 0xc4,0xa2,0xc6,0xbd,0x5b,0xc8,0xc8,0xb9,0x51,0x70,0x23,0xda,0x29,0x9f,0x25,0xec, + 0xe3,0x62,0xf2,0xd7,0x7a,0x29,0x58,0x83,0xab,0xcf,0x4c,0xf4,0x6b,0x79,0x97,0x8f, + 0x6a,0xcb,0xa4,0x9e,0x5c,0x96,0xdb,0x5c,0x4f,0x6e,0xd1,0xae,0xd1,0xf1,0x5e,0x83, + 0x5d,0xde,0xc9,0x9b,0x5c,0x1e,0xeb,0x90,0x17,0x9c,0x7c,0x53,0x89,0x7e,0x3b,0x7d, + 0x18,0xd7,0x5b,0x6d,0xfc,0x6b,0x4f,0x5c,0x6f,0x73,0x75,0xd7,0x7a,0x07,0xb5,0x91, + 0xff,0x9d,0xf8,0xcf,0x39,0xf9,0x7e,0xce,0xc4,0x7c,0x93,0x1c,0x22,0x36,0x57,0xc0, + 0xb5,0xf3,0x9d,0x72,0x1c,0xde,0xe6,0xfd,0x10,0xb5,0xd2,0xfa,0xb0,0xeb,0x8d,0xf7, + 0xf0,0xe1,0xf7,0xf2,0x88,0x72,0x0c,0xf5,0xcd,0x84,0xfe,0x2e,0x84,0xbd,0x2a,0xf6, + 0xf1,0x49,0xfc,0x7e,0x45,0xdd,0x26,0xf0,0xab,0xf5,0x64,0x49,0x2d,0x4f,0x61,0x2b, + 0xfd,0x33,0xc8,0x7c,0x0f,0x9d,0xa3,0x36,0x2b,0x4c,0x5b,0xbd,0x78,0x1e,0xec,0x1c, + 0xfd,0x74,0xa7,0x31,0x4d,0x93,0x5b,0x42,0xff,0xfe,0x61,0x88,0xf8,0xff,0x6e,0xab, + 0x0b,0xe0,0x7f,0xdb,0xbb,0xfa,0xf5,0x07,0xe4,0x9a,0xef,0x33,0xad,0x4a,0xee,0x9c, + 0x72,0xfa,0xb9,0x89,0xb8,0x55,0xe0,0x43,0xa6,0x53,0x08,0xe7,0xac,0x88,0xa9,0xa7, + 0x07,0xc9,0xbd,0x1a,0x3c,0xfa,0x99,0x83,0x9f,0x1a,0xe7,0x67,0x2e,0x78,0xb4,0x99, + 0x07,0xb6,0xd9,0x6c,0xf2,0x9c,0xe1,0x6a,0x70,0xf9,0xa9,0xe5,0xec,0x2f,0xa5,0x3f, + 0x9b,0x38,0x0f,0x75,0xe0,0x0f,0x9b,0x55,0x9e,0x7b,0xad,0x8e,0x91,0x86,0xf7,0x17, + 0x66,0xbf,0x9c,0xfb,0x6d,0x19,0xbe,0xdf,0x35,0x7b,0xf5,0xef,0x2d,0xe0,0xaa,0x49, + 0x03,0x35,0xf9,0xcb,0x64,0xc2,0x6f,0x0d,0xf5,0x2e,0xd6,0x45,0xef,0x7f,0xda,0x7c, + 0x81,0x75,0x83,0x8b,0xb9,0xca,0xc5,0x8c,0x7d,0xb4,0x0b,0x1e,0xb7,0x11,0x6f,0x15, + 0x3c,0x74,0x2e,0xee,0x82,0x47,0x23,0x3c,0xa4,0xb7,0x16,0x7c,0x0f,0x76,0xf7,0x60, + 0xbb,0x16,0x3b,0x9d,0x97,0x7b,0xb1,0x6b,0x72,0x75,0x5c,0x0f,0xfe,0xb1,0xe9,0xd4, + 0x07,0xdd,0x22,0x56,0x01,0xa7,0x66,0xc7,0x49,0xb2,0x0d,0x36,0x9a,0xe1,0xa0,0xf7, + 0x2d,0x66,0xa7,0xfa,0xdf,0x4f,0x4c,0x3d,0xaf,0xb0,0x27,0x1b,0xc1,0x1f,0xb1,0x95, + 0x72,0xfa,0x11,0x2c,0xea,0xa9,0x1e,0xd1,0x97,0xe6,0x69,0xea,0xf1,0x33,0x3a,0x0d, + 0xd8,0x6c,0x70,0x1c,0x1e,0x84,0xc3,0x26,0xc7,0xe1,0x21,0xf0,0xc8,0xa1,0x05,0x2c, + 0x72,0x68,0x73,0x1c,0x24,0x6b,0xb5,0xd1,0x46,0xdc,0x56,0xc7,0x61,0x33,0xb1,0x53, + 0x8e,0xc3,0x16,0xf0,0xc8,0xe1,0x27,0xb0,0xa8,0x27,0x0e,0xd1,0x57,0x9b,0xe3,0x70, + 0x19,0x9d,0x66,0x6c,0x5a,0x1d,0x87,0x47,0xe1,0xd0,0xee,0x38,0x3c,0x06,0x1e,0x39, + 0x3c,0x0e,0x16,0x39,0x74,0x3a,0x0e,0x92,0x75,0xd8,0xe8,0x24,0x6e,0x87,0xeb,0xa5, + 0x27,0x88,0x7d,0xd9,0xdd,0x45,0xca,0x31,0xea,0x76,0xba,0x1c,0x7f,0x45,0xaf,0x0d, + 0xbb,0x0e,0x62,0x75,0x97,0xc4,0xea,0xb2,0xd1,0x83,0xbd,0xde,0xc7,0xac,0x16,0xaa, + 0xcd,0xd3,0xd4,0x7a,0x2b,0x77,0xa9,0xe2,0x74,0xa3,0xd7,0xe3,0xf4,0x9e,0xa5,0xaf, + 0xfe,0x4f,0xaf,0x9b,0x7c,0xa4,0x77,0x15,0x9f,0x5d,0xf4,0x76,0x8f,0x93,0x4d,0x83, + 0x75,0xe1,0xaf,0x07,0x3f,0xdb,0xf1,0xb3,0xdd,0xf1,0x9a,0x82,0x9b,0x7c,0xa7,0xad, + 0x08,0xfd,0xc8,0x54,0xe7,0x2b,0xd4,0x54,0xb2,0x94,0x93,0x29,0xc6,0x2f,0xc4,0x90, + 0xec,0x44,0x52,0x94,0x7d,0xce,0x7e,0xbc,0x88,0x5c,0xdf,0x88,0xdf,0xac,0x2e,0x7d, + 0xc8,0x63,0x9d,0x24,0xef,0xb5,0xd1,0x47,0x3e,0xbd,0xae,0xaf,0x5e,0x22,0x27,0x3d, + 0x9f,0xe1,0xef,0x65,0xf0,0x46,0x6a,0x3e,0xe8,0x7c,0x49,0x36,0x10,0xee,0xb6,0xa2, + 0xaf,0x01,0x7a,0x67,0x67,0xb8,0x17,0x8a,0xbd,0xb3,0x83,0xde,0x91,0xff,0xdd,0xe0, + 0x31,0xd7,0x3d,0xf8,0xde,0x4d,0x8d,0xa2,0x9f,0x41,0xb8,0x4a,0x67,0x2f,0x39,0xf4, + 0xa2,0x3f,0x40,0x1e,0xfb,0x5c,0x1e,0x7b,0xc3,0x3d,0x9d,0x04,0x4c,0xf6,0x43,0x8e, + 0xd3,0xab,0x70,0x4a,0x39,0x4e,0xaf,0x81,0x47,0x4e,0x23,0xce,0x97,0x64,0xc3,0x36, + 0x46,0xf0,0x35,0xec,0x38,0xbd,0x0e,0xa7,0xfd,0x8e,0xd3,0x01,0xf0,0xc8,0xe9,0x0d, + 0x7c,0x1f,0x80,0x53,0xf4,0x33,0xe2,0x38,0xbd,0x49,0x0e,0x43,0xe8,0x0f,0xa3,0x1b, + 0xf3,0xdf,0xe7,0x74,0xdf,0xa2,0x06,0x83,0xd8,0x8d,0x90,0xf3,0xa8,0xcb,0x59,0x3a, + 0x07,0x6d,0x8c,0x62,0x7f,0x90,0xfc,0xf4,0x3d,0x7f,0x87,0x6f,0xf9,0x93,0xe6,0x4f, + 0xdf,0xf1,0xf7,0xc1,0xa6,0xb8,0x3f,0x1b,0xa9,0x95,0x7a,0xee,0x03,0xe4,0x7a,0xce, + 0x80,0x7d,0x08,0x7e,0x84,0x6f,0xa1,0x38,0x7f,0x44,0x8f,0xe9,0x5e,0xf8,0x0e,0xbd, + 0xa3,0xe8,0x4a,0xf6,0x3d,0xd8,0x31,0xfa,0xf8,0x28,0xfc,0x62,0x7e,0xa3,0xae,0xcf, + 0xd5,0xdb,0x57,0xd8,0xbb,0x63,0xf0,0x10,0xbf,0xf1,0x92,0xb3,0x3d,0x66,0xe3,0x38, + 0xf6,0x63,0x6e,0x7f,0x3f,0x71,0xfb,0xbb,0x0b,0xec,0x53,0xf0,0xab,0xee,0x3e,0xbc, + 0x08,0x3e,0xe5,0xee,0xc3,0x71,0xfc,0x1d,0x77,0xb6,0x5f,0xd2,0x93,0xd3,0xce,0xf6, + 0x12,0xf8,0x94,0xbb,0xa7,0xa2,0xed,0xb8,0x3b,0xcf,0x3a,0xc3,0x17,0xc9,0xf5,0x12, + 0xf9,0x4a,0xb7,0x1f,0xdd,0x7e,0x17,0xe7,0x04,0x35,0xdc,0x56,0x72,0x3f,0xf4,0xb9, + 0x7e,0xfb,0x9a,0x7e,0x3b,0xe5,0xfa,0xed,0x1b,0xf0,0x41,0xee,0xe3,0xd3,0x60,0xf1, + 0x3f,0xe5,0x5b,0xfe,0x2f,0x4e,0x13,0xab,0x10,0xf6,0xa3,0x88,0x57,0x05,0xdf,0xb9, + 0xf0,0x9f,0x75,0x96,0x7f,0xb1,0x46,0xe4,0xeb,0xac,0xe6,0x67,0xd9,0x2f,0xff,0xfd, + 0xd7,0xfc,0x8f,0x55,0x6c,0x8d,0x8d,0xff,0x00,0xf2,0xa0,0xf8,0x24,0x54,0x0e,0x00, + 0x00 }; // Generated from: @@ -96,13 +108,14 @@ constexpr uint8_t kBlitResolveStencilNoExport_comp_00000002[] = { // vec2 invSrcExtent; // int srcLayer; // int srcWidth; -// -// ivec4 blitArea; -// int destPitch; +// int srcHeight; // // bool flipX; // bool flipY; // bool rotateXY; +// +// ivec4 blitArea; +// int destPitch; // } params; // // layout(set = 0, binding = 0)buffer dst @@ -133,14 +146,23 @@ constexpr uint8_t kBlitResolveStencilNoExport_comp_00000002[] = { // if(params . rotateXY) // srcImageCoords . xy = srcImageCoords . yx; // -// int xDir = params . flipX ? - 1 : 1; +// int xDir = 0, yDir = 0; +// if(params . rotateXY) +// { +// yDir = params . flipY ? - 1 : 1; +// } +// else +// { +// xDir = params . flipX ? - 1 : 1; +// } // // uint outStencils = 0; // // for(int i = 0;i < 4;++ i) // { // -// if(srcImageCoords . x >= 0 && srcImageCoords . x < params . srcWidth) +// if((srcImageCoords . x >= 0 && srcImageCoords . x < params . srcWidth)&& +// (srcImageCoords . y >= 0 && srcImageCoords . y < params . srcHeight)) // { // // uint stencilValue = texelFetch(stencil, srcImageCoords, 0). x; @@ -149,7 +171,14 @@ constexpr uint8_t kBlitResolveStencilNoExport_comp_00000002[] = { // // } // -// srcImageCoords . x += xDir; +// if(params . rotateXY) +// { +// srcImageCoords . y += yDir; +// } +// else +// { +// srcImageCoords . x += xDir; +// } // } // // destData[gl_GlobalInvocationID . y * params . destPitch + gl_GlobalInvocationID . x]= outStencils; diff --git a/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000003.inc b/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000003.inc index e347861145a..ee6317a513b 100644 --- a/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000003.inc +++ b/src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000003.inc @@ -10,77 +10,89 @@ #pragma once constexpr uint8_t kBlitResolveStencilNoExport_comp_00000003[] = { - 0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x02,0xff,0x5d,0x95,0xeb,0x6f,0xd4,0x45, - 0x14,0x86,0x67,0x2f,0xdd,0x2d,0xab,0x6d,0x29,0xb4,0xdc,0x6f,0xb5,0xa6,0x8a,0x4b, - 0x00,0x13,0x74,0x2b,0x52,0x54,0x9a,0x88,0x68,0x5b,0xc1,0xaa,0x34,0x7c,0x29,0x4d, - 0xa0,0x2d,0x41,0xb1,0x8d,0x88,0xb6,0xa9,0x28,0x48,0x40,0x0d,0x46,0xe2,0x07,0x12, - 0xa8,0x4d,0x10,0x48,0x0c,0x14,0x34,0xc6,0x98,0xf8,0x05,0x51,0xd4,0x10,0xfc,0x7f, - 0xb8,0x69,0x8c,0x9e,0x77,0xf6,0x19,0x72,0xb2,0x9b,0x9c,0xcc,0xce,0x7b,0xae,0xef, - 0x99,0x33,0xbf,0xc9,0x65,0xdb,0x8b,0x21,0x64,0x42,0x29,0xd4,0x87,0xbf,0x42,0xf5, - 0xd7,0x1c,0xb2,0x86,0x84,0xf0,0x50,0x28,0xc4,0x75,0x6b,0x4f,0x7f,0xcf,0xda,0x77, - 0x0f,0xee,0x59,0xbb,0xe1,0xa9,0xf5,0xd2,0x37,0x86,0x5c,0xb4,0x93,0xae,0xc9,0x6c, - 0xea,0x6c,0xcd,0x9b,0xbc,0x3d,0xb4,0xef,0x80,0xf0,0x06,0x93,0xb9,0x86,0xe7,0x63, - 0xac,0x60,0x91,0xab,0x12,0x63,0x19,0xda,0x10,0x63,0x87,0xb0,0xcc,0xe4,0x25,0xf3, - 0x5e,0x4e,0xde,0x76,0xd6,0x84,0x65,0xc0,0xea,0x1d,0x96,0x05,0x9b,0xeb,0xb0,0x1c, - 0xd8,0x22,0x87,0xe5,0xc1,0x7c,0x8e,0x3a,0xb0,0x55,0x0e,0x2b,0x80,0xad,0x77,0x58, - 0x11,0x6c,0x83,0xc3,0xea,0xc1,0x3a,0x1d,0x36,0x07,0x6c,0x53,0xe4,0x95,0x7b,0x50, - 0x9f,0x38,0x1e,0xb6,0xf5,0x11,0xf8,0xa4,0x7d,0x9b,0xeb,0xc1,0x59,0x72,0xe7,0x89, - 0x37,0x5d,0xd3,0x03,0xc5,0x9b,0x86,0x9b,0xec,0x67,0x6a,0xe2,0xcd,0x10,0x2f,0xed, - 0xaf,0xd0,0xd3,0xc5,0x26,0xf3,0xad,0x8a,0x6c,0xd4,0xe7,0xa2,0xbf,0xfe,0xb7,0x9a, - 0x4d,0x01,0xee,0xaa,0x61,0xa1,0xed,0x8b,0xd4,0x90,0xf4,0x25,0xf4,0x01,0xbd,0xe2, - 0x95,0xa8,0x61,0x95,0xed,0x1f,0xc6,0x57,0xf8,0xb3,0xec,0x1b,0xc0,0xca,0xf8,0x37, - 0xe2,0x2f,0xfb,0x26,0x74,0x25,0xa7,0x9f,0x07,0xe7,0xb4,0x6f,0xc5,0x66,0x81,0x65, - 0x59,0x42,0x7e,0xe5,0x5e,0x6a,0xeb,0x12,0x6a,0xd3,0x7e,0x99,0xeb,0xd7,0x0a,0xcb, - 0x9c,0xce,0x69,0x29,0x52,0x40,0x92,0x5d,0xc9,0x89,0x6a,0x59,0xc1,0x79,0x2d,0xa7, - 0x76,0xed,0x57,0x82,0x95,0x5d,0x6f,0xea,0xb0,0x6f,0x43,0xa7,0x78,0x2d,0x56,0x45, - 0x07,0x75,0x3c,0x66,0x6b,0x07,0x75,0x25,0xbf,0x8a,0xe3,0xdc,0x89,0x5f,0xd1,0xe9, - 0xbb,0xd8,0x4b,0xbf,0x19,0x7d,0xc9,0xe9,0xb7,0x31,0x5f,0x69,0xdf,0x5f,0x53,0xd7, - 0xa0,0xc9,0x7f,0xf6,0x4b,0xfb,0xdd,0xae,0xe7,0xda,0xef,0xa7,0x2f,0x8a,0x7f,0x10, - 0xdf,0x42,0x9c,0x85,0x39,0x61,0x8a,0x5c,0x19,0x6a,0xcc,0x38,0x49,0x35,0x7f,0xc8, - 0xff,0x29,0x7a,0xa3,0xfd,0x61,0xb0,0x94,0xe3,0x08,0x73,0xa0,0x1e,0x1c,0x23,0x7e, - 0xda,0x7f,0x4a,0x0e,0x7f,0xae,0x27,0x55,0x73,0xec,0x77,0x2e,0xce,0x7a,0x29,0x9e, - 0x5b,0x75,0xa6,0xcf,0x92,0xf7,0x6b,0xfa,0x38,0x4d,0x5e,0xed,0x67,0x6a,0x7a,0x7b, - 0x8e,0x5c,0xb2,0xbf,0x84,0xce,0xcf,0xd3,0x2c,0xbd,0x5b,0x63,0x56,0x9a,0xcb,0x2b, - 0x60,0xb3,0xcc,0xd6,0xd3,0x76,0xa2,0x59,0x6a,0x0b,0xd4,0x7c,0xcf,0x10,0x9d,0xf3, - 0x5d,0xdb,0x5d,0x05,0xff,0xc7,0xfe,0x6b,0x76,0xbf,0x43,0xaf,0xf5,0x05,0xb3,0x6a, - 0xe2,0x5b,0xd3,0xc0,0x6c,0x77,0x91,0xb7,0x19,0xfc,0x98,0xd9,0x94,0xe2,0x9d,0xab, - 0x62,0xf3,0x62,0x1f,0xab,0xb5,0xb7,0x80,0xa7,0x38,0x0b,0x88,0xd3,0xea,0xe2,0x2c, - 0x04,0x4f,0x3e,0x8b,0xc0,0xb6,0x9b,0x4f,0x91,0xfb,0xdc,0x02,0xae,0x38,0x6d,0x7c, - 0x07,0x56,0x32,0xaf,0x5d,0xdc,0x8d,0x76,0xf0,0x57,0xcd,0x4b,0x7e,0x8f,0x82,0xb5, - 0xd3,0x33,0xf1,0xfe,0xd1,0xfc,0x35,0xbf,0x8f,0xa3,0x5f,0x1c,0xcf,0x22,0x1f,0xe7, - 0x79,0x35,0xb8,0x7a,0x52,0xa6,0x27,0x7f,0x9b,0x4e,0xf8,0x13,0xb1,0xdf,0xd5,0xbe, - 0xe8,0xff,0x7d,0x5b,0xaf,0xb2,0x2f,0xbb,0x9c,0xeb,0x5c,0xce,0x34,0x6b,0x1f,0xc3, - 0xe3,0x49,0xf2,0xad,0x83,0x87,0xee,0xc9,0x33,0xf0,0xa8,0xc0,0x43,0x76,0x1b,0xc1, - 0x8f,0xe2,0xb7,0x09,0xdf,0x8d,0xf8,0xe9,0xfe,0x3c,0x87,0x5f,0x97,0xeb,0xe3,0xf3, - 0xe0,0xb3,0x66,0xd3,0x11,0x6d,0xab,0x58,0x23,0x9c,0xba,0x1d,0x27,0xe9,0xb6,0x98, - 0x74,0xc3,0x41,0xff,0x77,0x98,0x9f,0xfa,0xff,0x22,0x39,0x43,0xbc,0x03,0xd5,0x33, - 0xd9,0x0a,0xfe,0x9a,0xed,0x54,0xd3,0x4f,0x60,0xc9,0x4e,0xfd,0x48,0xb1,0xb4,0xde, - 0xa6,0x1f,0xbf,0x60,0x53,0xc6,0x67,0x8b,0xe3,0xf0,0x32,0x1c,0xb6,0x39,0x0e,0xaf, - 0x80,0x27,0x0e,0x3d,0x60,0x89,0x43,0x9f,0xe3,0x20,0x5d,0xaf,0x49,0x1f,0x79,0x7b, - 0x1d,0x87,0xed,0xe4,0xce,0x38,0x0e,0x3b,0xc0,0x13,0x87,0x9f,0xc1,0x92,0x9d,0x38, - 0xa4,0x58,0x7d,0x8e,0xc3,0x75,0x6c,0xba,0xf1,0xe9,0x75,0x1c,0x5e,0x87,0x43,0xbf, - 0xe3,0xf0,0x06,0x78,0xe2,0xf0,0x26,0x58,0xe2,0x30,0xe0,0x38,0x48,0xb7,0xd3,0x64, - 0x80,0xbc,0x3b,0xdd,0x2c,0xed,0x22,0xf7,0x75,0xf7,0xad,0x52,0x8d,0xc9,0x76,0xc0, - 0xd5,0xf8,0x3b,0x76,0x7d,0xf8,0x29,0xce,0x25,0xe3,0x29,0xde,0x43,0xcc,0xc2,0x20, - 0xdf,0x4d,0xc5,0xd8,0x4b,0x8c,0xbd,0x2e,0xc6,0x0d,0xe2,0x28,0xee,0x35,0x93,0x51, - 0x74,0xe2,0xf4,0x1b,0xf5,0x4b,0x77,0xcb,0xe9,0x14,0xff,0x57,0xe6,0x57,0xba,0x33, - 0xe8,0x7e,0x80,0xfb,0x5b,0xe8,0xf5,0x7d,0xbe,0x63,0x7c,0x47,0xd0,0x27,0xfe,0xd2, - 0x0f,0x9b,0x8c,0x50,0xcf,0xb0,0x3b,0xc3,0x03,0xd4,0xa4,0xdf,0xf7,0xc4,0x7b,0x07, - 0xbc,0x42,0x2f,0xc7,0x5d,0x2c,0xe9,0xc6,0x4c,0xc6,0x89,0x35,0xc6,0x39,0xe9,0x3d, - 0x78,0x8f,0x73,0xda,0xcf,0x39,0x29,0xfe,0x21,0xf0,0x54,0xeb,0xfb,0xc4,0x3e,0x44, - 0x8f,0x52,0x9c,0x71,0xb8,0xca,0xe6,0x03,0x6a,0x18,0xc6,0x7e,0x8c,0x3a,0x26,0x5d, - 0x1d,0xb2,0x99,0x30,0x99,0xc4,0x7f,0x82,0x9c,0x7a,0x5b,0x3e,0xe2,0x5d,0x49,0x75, - 0x1d,0xa5,0xae,0x23,0xae,0xae,0x4f,0xc0,0x53,0x1f,0x8e,0xd3,0x87,0x4c,0x9c,0xdf, - 0x42,0x7c,0x7b,0x4e,0x50,0xeb,0x71,0xec,0x07,0xad,0x3e,0xbd,0x41,0x9f,0x91,0xe3, - 0x04,0x77,0xbf,0x42,0x1c,0x9d,0xe1,0xe7,0xe8,0xf5,0xbb,0x09,0xf6,0x05,0xf8,0x49, - 0xbe,0xe3,0xca,0xf7,0x25,0x67,0xa6,0x7b,0xf9,0x07,0x76,0xa7,0xb0,0x95,0xee,0x4f, - 0xb0,0xaf,0x98,0x8b,0x53,0xf4,0x2b,0xf1,0x9d,0x74,0x73,0x73,0x0b,0x9b,0x71,0xec, - 0x27,0xf8,0x1e,0x2a,0xcf,0x69,0x38,0x0c,0xb9,0x3b,0x79,0x0d,0xfc,0x86,0x9b,0xf7, - 0x51,0xe2,0x8e,0x3a,0xdf,0x33,0xd4,0x58,0x3b,0xcf,0x23,0xae,0xb7,0xdf,0xd0,0xdb, - 0x73,0xae,0xb7,0xe7,0xc1,0xa7,0xb8,0xab,0x17,0xc0,0xd2,0x1b,0x76,0x91,0xb7,0xe7, - 0x02,0xb9,0x84,0x7d,0x0b,0xde,0x1c,0x63,0x17,0xe2,0x1b,0x7c,0x99,0x77,0xba,0x82, - 0x7e,0xb3,0xcd,0xc0,0x65,0xb8,0xfa,0xb7,0x41,0xeb,0xbf,0x76,0x72,0x9d,0x26,0xff, - 0x03,0xd9,0xf4,0x6d,0x73,0x68,0x0c,0x00,0x00 + 0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x02,0xff,0x6d,0x96,0x6d,0x68,0x95,0x65, + 0x18,0xc7,0x9f,0xf3,0xe2,0x39,0xdb,0xb1,0x6d,0xae,0x36,0xdf,0x5f,0x5a,0x93,0x59, + 0x1d,0x51,0x83,0xea,0x98,0x35,0x33,0x07,0x99,0xb5,0xad,0xd9,0xaa,0x8d,0xbe,0xb4, + 0x81,0xda,0x82,0x0a,0xb7,0x85,0x51,0x3b,0xe4,0xdb,0xa4,0x36,0x30,0x2b,0x87,0x9a, + 0x5a,0x68,0x85,0xa1,0x09,0x39,0x2a,0xfc,0x10,0xe8,0x1a,0x99,0x06,0x91,0x2f,0x7d, + 0x0b,0xfa,0x26,0xa8,0x39,0xfa,0xd6,0xbb,0x51,0xd7,0x75,0x3f,0xbf,0x2b,0x2e,0x0e, + 0x1d,0xb8,0x79,0x9e,0xfb,0x7f,0xbd,0xfe,0xaf,0xfb,0xba,0xaf,0xf3,0xa4,0x92,0xf5, + 0xd9,0x28,0x4a,0x44,0xb9,0xa8,0x2c,0xca,0x25,0xa2,0xf0,0xab,0x8e,0x92,0x91,0xbe, + 0x4e,0x8e,0x32,0xe1,0xb9,0xaa,0xb9,0xbd,0x79,0x51,0xff,0x8b,0x6b,0x17,0xdd,0x79, + 0xd7,0x12,0x95,0x57,0x46,0xa9,0xa0,0xa7,0xb2,0x2a,0xd1,0x99,0x24,0xcf,0xb4,0xac, + 0xe7,0xbb,0x9f,0x7d,0x41,0xf1,0x0a,0x59,0x53,0x04,0x4f,0x07,0x5f,0x91,0x78,0x8e, + 0x57,0xf0,0x25,0x68,0x45,0xf0,0x1d,0x45,0xb3,0x65,0x3d,0x24,0xd6,0x73,0xe2,0xb0, + 0x51,0x3d,0x4f,0xc3,0x12,0x60,0x65,0x0e,0x4b,0x82,0x4d,0x71,0x58,0x0a,0x6c,0xba, + 0xc3,0xd2,0x60,0x3e,0xc6,0x24,0xb0,0x9b,0x1d,0x96,0x01,0x9b,0xef,0xb0,0x2c,0xd8, + 0xad,0x0e,0x2b,0x03,0x5b,0xe8,0xb0,0x72,0xb0,0x25,0x0e,0xcb,0x81,0xad,0x08,0x5c, + 0x53,0xff,0xe5,0xac,0xbc,0xf7,0xca,0xf3,0x16,0x38,0xda,0xbe,0xce,0xd5,0xe5,0x14, + 0xf9,0xa4,0xf1,0x37,0x56,0x52,0x17,0xf5,0x37,0x06,0x5f,0xd5,0x1f,0x2f,0xf1,0x37, + 0x8e,0x3f,0xdb,0x5f,0xa0,0xce,0x33,0x64,0xdd,0x24,0x59,0x24,0x83,0x3c,0x15,0xec, + 0xf5,0xbd,0x56,0x74,0x32,0xd4,0x43,0x73,0x98,0x26,0xfb,0x2c,0x39,0x98,0x3c,0x87, + 0x3c,0x42,0x3e,0x19,0x8e,0xa9,0x80,0xa7,0xa3,0x1b,0xb0,0x55,0xfc,0x5e,0xf6,0x15, + 0x60,0x79,0xec,0x2b,0xb1,0x57,0xfd,0x2a,0x64,0x39,0x27,0xbf,0x11,0xce,0xb6,0xaf, + 0x45,0x67,0xaa,0x44,0x99,0x49,0x7c,0x8d,0x3d,0x4b,0x9e,0x33,0xc9,0x4d,0xf7,0xb3, + 0x5d,0xbd,0xe6,0x4a,0x54,0x3b,0xbb,0x59,0xac,0x8c,0x5b,0x39,0xb7,0xcc,0x4e,0xf3, + 0x99,0xcb,0x39,0xce,0x21,0x7f,0xdd,0xcf,0x03,0xcb,0xbb,0xfa,0x94,0xa3,0x5f,0xc7, + 0xbb,0xfa,0xa8,0x91,0x4c,0x1a,0xc8,0x65,0x81,0x3c,0x1b,0xc8,0xcd,0xec,0x0a,0x8e, + 0xf7,0x52,0xec,0xb2,0x4e,0xde,0xe8,0xf2,0x58,0x8e,0x3c,0xe7,0xe4,0xab,0x4b,0xf4, + 0xdb,0xe9,0x43,0xdb,0xaf,0x93,0xf5,0x8f,0xfc,0x6c,0xbf,0xde,0xd5,0x5d,0xf7,0x1b, + 0xa9,0x8d,0xfa,0xdf,0x84,0xff,0x8c,0x93,0xef,0xe0,0x4e,0xcc,0x10,0xc9,0x6e,0x62, + 0x33,0x02,0xc2,0x33,0xe1,0xf6,0xea,0x63,0x0f,0xef,0xbb,0xa9,0x95,0xee,0xf7,0x82, + 0x99,0xcf,0xfd,0xf4,0x86,0xd6,0xe4,0x3d,0xe2,0xd9,0xfe,0x7d,0x62,0xf8,0xb3,0x3e, + 0xac,0x1c,0x42,0xfd,0x53,0xa1,0xff,0x73,0xe1,0x2c,0xe3,0x3e,0x3f,0x45,0xdc,0x2f, + 0xa9,0xeb,0x18,0x71,0x75,0x3f,0x5e,0x52,0xeb,0xd3,0xd8,0xaa,0xfe,0x77,0xc8,0x7c, + 0x8f,0x9d,0xa7,0x76,0x0b,0x45,0x5b,0x7b,0xf5,0x02,0xd8,0x79,0xfa,0xed,0x6e,0xa9, + 0x44,0x92,0xdc,0x22,0x72,0xfe,0x5d,0x10,0xad,0xcf,0x6f,0xb2,0xbb,0x08,0xfe,0x97, + 0xbc,0x6b,0x3f,0x7f,0x8f,0x5c,0x9f,0x0f,0x88,0x56,0x15,0x33,0xa9,0x82,0x7e,0x6f, + 0x24,0x6e,0x35,0xf8,0xa0,0xe8,0xe4,0xc2,0x3d,0x8c,0x31,0xed,0xf9,0x22,0xb9,0xd7, + 0x80,0x9b,0x9f,0xa9,0xf8,0xa9,0x75,0x7e,0xa6,0x81,0x9b,0xcd,0x74,0xb0,0x36,0xb1, + 0xc9,0x72,0xc7,0x6b,0xc0,0xd5,0x4f,0x1d,0xb3,0x61,0x1e,0xfd,0xdb,0xc8,0x7d,0xa9, + 0x07,0x7f,0x54,0xac,0xb2,0xcc,0xbd,0x7a,0x56,0x12,0xde,0x9f,0x8a,0xfd,0x02,0xe6, + 0xdf,0x7c,0x7c,0xef,0x13,0x7b,0xed,0xef,0xdb,0xc0,0xb5,0x26,0x79,0x6a,0xf2,0xa7, + 0xc8,0x14,0xbf,0x3d,0xd4,0x3b,0xae,0x8b,0xbe,0xff,0x21,0xcf,0x8b,0xec,0xf3,0x2e, + 0xe6,0x62,0x17,0xd3,0x7a,0x6d,0x33,0x3c,0xee,0x20,0xde,0x62,0x78,0xe8,0xbd,0xb9, + 0x07,0x1e,0x05,0x78,0xa8,0xde,0x32,0xf0,0xad,0xd8,0xdd,0x87,0xed,0x32,0xec,0xf4, + 0x3e,0xdd,0x8f,0x5d,0xa3,0xab,0xe3,0x0a,0xf0,0x8f,0x45,0xa7,0x21,0xe8,0xc6,0x58, + 0x25,0x9c,0x9a,0x1c,0x27,0x95,0xad,0x94,0xd5,0x04,0x07,0x7d,0x5f,0x23,0x76,0x5a, + 0xff,0x07,0x89,0xa9,0xbf,0x57,0x39,0x93,0x55,0xe0,0x8f,0xc9,0x4e,0x73,0xfa,0x01, + 0xcc,0xf4,0xb4,0x1e,0xe6,0x4b,0x9f,0xbf,0x50,0x8f,0x2b,0xe8,0xe4,0xb1,0x59,0xe9, + 0x38,0x3c,0x0c,0x87,0xd5,0x8e,0xc3,0x23,0xe0,0xc6,0xa1,0x19,0xcc,0x38,0xb4,0x3a, + 0x0e,0x2a,0x6b,0x91,0xd5,0x4a,0xdc,0x16,0xc7,0xa1,0x8d,0xd8,0x09,0xc7,0x61,0x0d, + 0xb8,0x71,0xf8,0x11,0xcc,0xf4,0x94,0x83,0xf9,0x6a,0x75,0x1c,0xae,0xa2,0xd3,0x84, + 0x4d,0x8b,0xe3,0xf0,0x38,0x1c,0xda,0x1d,0x87,0x27,0xc0,0x8d,0xc3,0x93,0x60,0xc6, + 0xa1,0xd3,0x71,0x50,0x59,0x87,0xac,0x4e,0xe2,0x76,0xb8,0x5e,0x7a,0x8a,0xd8,0x57, + 0xdd,0xac,0xd2,0x1c,0x4d,0xb7,0xd3,0xe5,0xf8,0x33,0x7a,0xad,0xd8,0x75,0x10,0xab, + 0xbb,0x24,0x56,0x97,0xac,0x1e,0xec,0xf5,0xfd,0x88,0xd4,0x42,0x6b,0xf3,0x0c,0xb5, + 0x5e,0xc7,0xac,0xd5,0x38,0xdd,0xe8,0xf5,0x38,0xbd,0xe7,0xe8,0xab,0xff,0xd3,0xeb, + 0x26,0x9f,0x30,0x17,0x13,0xb1,0xcf,0x2e,0x7a,0xbb,0xc7,0xc9,0xae,0x83,0x75,0xe1, + 0xaf,0x07,0x3f,0x1b,0xf0,0xb3,0xc1,0xf1,0x9a,0x80,0x9b,0xfa,0x2e,0x17,0x9f,0xfd, + 0xc8,0xb4,0xce,0xd7,0xa8,0xa9,0xca,0xca,0x9c,0x4c,0x63,0xfc,0x44,0x0c,0x95,0x9d, + 0x8c,0x62,0xd9,0x28,0xe7,0xf1,0x12,0x72,0xfd,0x0f,0xf9,0x55,0xea,0xd2,0x87,0xdc, + 0xea,0xa4,0xf2,0x5e,0x59,0x7d,0xe4,0xd3,0xeb,0xfa,0xea,0x65,0x72,0xd2,0xdf,0x27, + 0xf8,0x7b,0x05,0xbc,0x40,0xcd,0x8b,0xce,0x97,0xca,0x06,0xc2,0x6c,0x8b,0x7d,0x0d, + 0xd0,0x3b,0x9b,0xc2,0x5c,0x88,0x7b,0x67,0x23,0xbd,0xa3,0xfe,0xb7,0x80,0x5b,0xae, + 0x5b,0xf1,0xbd,0x85,0x1a,0x99,0x9f,0x22,0x5c,0x55,0x67,0x1b,0x39,0xf4,0xa2,0x3f, + 0x40,0x1e,0xdb,0x5d,0x1e,0xdb,0xc2,0x9c,0x8e,0x02,0xa6,0xf6,0x83,0x8e,0xd3,0x6b, + 0x70,0x4a,0x38,0x4e,0xaf,0x83,0x1b,0xa7,0x61,0xe7,0x4b,0x65,0x43,0xb2,0x86,0xf1, + 0x35,0xe4,0x38,0xbd,0x01,0xa7,0x1d,0x8e,0xd3,0x4e,0x70,0xe3,0xf4,0x26,0xbe,0x77, + 0xc2,0xc9,0xfc,0x0c,0x3b,0x4e,0x6f,0x91,0xc3,0x20,0xfa,0x43,0xe8,0x5a,0xfe,0xdb, + 0x9d,0xee,0xdb,0xd4,0xa0,0x88,0xdd,0x30,0x39,0x8f,0xb8,0x9c,0x55,0x67,0x97,0xac, + 0x11,0xec,0x77,0x91,0x9f,0xfe,0xdf,0xbf,0xc3,0x7f,0xbd,0x71,0x38,0x00,0x87,0xfd, + 0x8e,0xc3,0xbb,0xe0,0x56,0xb3,0x83,0xae,0x66,0x6d,0x82,0xe8,0xf7,0xc0,0x21,0xce, + 0xea,0x20,0xfa,0x4f,0x4b,0x7e,0xfa,0x5d,0xf0,0x01,0x31,0x0e,0x31,0x8f,0x0b,0xf8, + 0xd1,0x1e,0xfe,0x10,0xb9,0xfe,0xce,0x80,0x7d,0x04,0x7e,0x98,0xff,0xd6,0x4c,0xb8, + 0x7f,0x71,0xcf,0xea,0x9c,0xf9,0x0a,0xbd,0xa3,0xe8,0x1e,0x09,0xdf,0x08,0x31,0x76, + 0x8c,0x7b,0x71,0x94,0x7a,0x19,0xdf,0x11,0x77,0x6f,0xf4,0xae,0x5c,0xa3,0x17,0x8e, + 0x51,0x17,0xad,0xd7,0x68,0xc9,0xac,0x38,0x2e,0xeb,0x04,0xf6,0xc7,0x1d,0xf7,0xcf, + 0x1c,0xf7,0xcd,0x60,0x9f,0x83,0xeb,0xbd,0xb7,0xf9,0x7a,0x09,0x7c,0xc2,0xcd,0xd7, + 0x51,0xfc,0x9d,0x70,0xb6,0x5f,0x50,0xb7,0xeb,0x6e,0x36,0x5f,0x06,0x9f,0x70,0x73, + 0xcf,0x6c,0x47,0xdd,0x7c,0xd0,0x99,0x70,0x89,0x5c,0x2f,0x93,0xaf,0xea,0xf6,0xa3, + 0xdb,0xef,0xe2,0x9c,0xa4,0x86,0xeb,0x4b,0xe6,0x4d,0x9f,0x3b,0xfb,0xaf,0x39,0xfb, + 0xd3,0xee,0xec,0xcf,0x80,0x17,0x99,0xef,0x67,0xc1,0xec,0xbb,0xe7,0x1b,0xbe,0x57, + 0xce,0x12,0x4b,0xb1,0x6f,0xc1,0xab,0x83,0xef,0x4c,0xf8,0x6e,0x3b,0xc7,0xb7,0x5d, + 0x01,0xf9,0x72,0xa9,0xf9,0x39,0xce,0xcb,0x7f,0x4f,0xe8,0xf3,0x6f,0xa9,0xd8,0x52, + 0x59,0xff,0x02,0x60,0x4c,0xcd,0x8e,0xc4,0x0e,0x00,0x00 }; // Generated from: @@ -98,13 +110,14 @@ constexpr uint8_t kBlitResolveStencilNoExport_comp_00000003[] = { // vec2 invSrcExtent; // int srcLayer; // int srcWidth; -// -// ivec4 blitArea; -// int destPitch; +// int srcHeight; // // bool flipX; // bool flipY; // bool rotateXY; +// +// ivec4 blitArea; +// int destPitch; // } params; // // layout(set = 0, binding = 0)buffer dst @@ -135,14 +148,23 @@ constexpr uint8_t kBlitResolveStencilNoExport_comp_00000003[] = { // if(params . rotateXY) // srcImageCoords . xy = srcImageCoords . yx; // -// int xDir = params . flipX ? - 1 : 1; +// int xDir = 0, yDir = 0; +// if(params . rotateXY) +// { +// yDir = params . flipY ? - 1 : 1; +// } +// else +// { +// xDir = params . flipX ? - 1 : 1; +// } // // uint outStencils = 0; // // for(int i = 0;i < 4;++ i) // { // -// if(srcImageCoords . x >= 0 && srcImageCoords . x < params . srcWidth) +// if((srcImageCoords . x >= 0 && srcImageCoords . x < params . srcWidth)&& +// (srcImageCoords . y >= 0 && srcImageCoords . y < params . srcHeight)) // { // // uint stencilValue = texelFetch(stencil, ivec3(srcImageCoords, params . srcLayer), 0). x; @@ -151,7 +173,14 @@ constexpr uint8_t kBlitResolveStencilNoExport_comp_00000003[] = { // // } // -// srcImageCoords . x += xDir; +// if(params . rotateXY) +// { +// srcImageCoords . y += yDir; +// } +// else +// { +// srcImageCoords . x += xDir; +// } // } // // destData[gl_GlobalInvocationID . y * params . destPitch + gl_GlobalInvocationID . x]= outStencils; diff --git a/src/libANGLE/renderer/vulkan/shaders/src/BlitResolveStencilNoExport.comp b/src/libANGLE/renderer/vulkan/shaders/src/BlitResolveStencilNoExport.comp index 74665ce80ce..e9c68dde9e4 100644 --- a/src/libANGLE/renderer/vulkan/shaders/src/BlitResolveStencilNoExport.comp +++ b/src/libANGLE/renderer/vulkan/shaders/src/BlitResolveStencilNoExport.comp @@ -48,13 +48,14 @@ layout(push_constant) uniform PushConstants { vec2 invSrcExtent; int srcLayer; int srcWidth; - // Output. - ivec4 blitArea; - int destPitch; + int srcHeight; // Flip control. bool flipX; bool flipY; bool rotateXY; + // Output. + ivec4 blitArea; + int destPitch; } params; layout (set = 0, binding = 0) buffer dst @@ -103,14 +104,23 @@ void main() if (params.rotateXY) srcImageCoords.xy = srcImageCoords.yx; - int xDir = params.flipX ? -1 : 1; + int xDir = 0, yDir = 0; + if (params.rotateXY) + { + yDir = params.flipY ? -1 : 1; + } + else + { + xDir = params.flipX ? -1 : 1; + } uint outStencils = 0; for (int i = 0; i < 4; ++i) { - // Bounds check on X: - if (srcImageCoords.x >= 0 && srcImageCoords.x < params.srcWidth) + // Bounds check on X and Y: + if ((srcImageCoords.x >= 0 && srcImageCoords.x < params.srcWidth) && + (srcImageCoords.y >= 0 && srcImageCoords.y < params.srcHeight)) { // Note: always resolve using sample 0. GLES3 gives us freedom in choosing how // to resolve depth/stencil images. @@ -123,7 +133,14 @@ void main() #endif } - srcImageCoords.x += xDir; + if (params.rotateXY) + { + srcImageCoords.y += yDir; + } + else + { + srcImageCoords.x += xDir; + } } destData[gl_GlobalInvocationID.y * params.destPitch + gl_GlobalInvocationID.x] = outStencils; diff --git a/src/tests/angle_end2end_tests_expectations.txt b/src/tests/angle_end2end_tests_expectations.txt index c9513b0ac07..3b0e9b30ae6 100644 --- a/src/tests/angle_end2end_tests_expectations.txt +++ b/src/tests/angle_end2end_tests_expectations.txt @@ -85,8 +85,6 @@ 42265405 VULKAN : Texture2DTestES3.TextureRGBUpdateWithPBO/ES3_Vulkan* = SKIP 42265226 VULKAN : GLSLTest_ES3.GLVertexIDIntegerTextureDrawElementsU8Line/* = SKIP 42265226 VULKAN : GLSLTest_ES3.GLVertexIDIntegerTextureDrawElementsU8LineIds/* = SKIP -42265671 VULKAN : BlitFramebufferTest.BlitMultisampleStencilToDefault/ES3_Vulkan_EmulatedPrerotation90 = SKIP -42265671 VULKAN : BlitFramebufferTest.BlitMultisampleStencilToDefault/ES3_Vulkan_EmulatedPrerotation270 = SKIP 235877059 VULKAN : MultisampleTestES3.ResolveToFBO/ES3_Vulkan_EmulatedPrerotation180 = SKIP 235877059 VULKAN : MultisampleTestES3.ResolveToFBO/ES3_Vulkan_EmulatedPrerotation270 = SKIP // ANGLE is broken if a context is made current before a surface is created in the presence of multiple queue families @@ -1371,7 +1369,6 @@ b/267953710 GALAXYS22 VULKAN : VulkanPerformanceCounterTest_ES31.ColorMaskedFram 42266622 GALAXYA23 VULKAN : GLSLTest_ES31.StructAndArrayEqualOperator/* = SKIP // Samsung Galaxy A23 non-crash failures -42266622 GALAXYA23 VULKAN : BlitFramebufferTest.BlitMultisampleStencilToDefault/* = SKIP 42266622 GALAXYA23 VULKAN : ClearTestES3.ClearMaxAttachmentsAfterDraw/* = SKIP 42266622 GALAXYA23 VULKAN : ClearTestES3.ClearStencilAfterDraw/* = SKIP 42266622 GALAXYA23 VULKAN : ClearTestES3.MaskedClearBufferBug/* = SKIP diff --git a/src/tests/deqp_support/deqp_khr_gles3_test_expectations.txt b/src/tests/deqp_support/deqp_khr_gles3_test_expectations.txt index 3c9e0efcd93..e6cf0bfed33 100644 --- a/src/tests/deqp_support/deqp_khr_gles3_test_expectations.txt +++ b/src/tests/deqp_support/deqp_khr_gles3_test_expectations.txt @@ -95,9 +95,6 @@ b/328156792 PINEAPPLE VULKAN : KHR-GLES3.shaders.function.global_variable_aliasi 42266649 MALIG710 VULKAN : KHR-GLES3.number_parsing.* = FAIL // The newly added cases are failing -42267072 ANDROID : KHR-GLES3.framebuffer_blit.framebuffer_blit_functionality_multisampled_to_singlesampled_blit = FAIL -42267072 LINUX : KHR-GLES3.framebuffer_blit.framebuffer_blit_functionality_multisampled_to_singlesampled_blit = FAIL -42267072 WIN : KHR-GLES3.framebuffer_blit.framebuffer_blit_functionality_multisampled_to_singlesampled_blit = FAIL b/332383430 PIXEL6 VULKAN : KHR-GLES3.texture_lod_bias.texture_lod_bias_all = FAIL // Flaky timeout diff --git a/src/tests/gl_tests/BlitFramebufferANGLETest.cpp b/src/tests/gl_tests/BlitFramebufferANGLETest.cpp index 604909a15b6..d40d668d88d 100644 --- a/src/tests/gl_tests/BlitFramebufferANGLETest.cpp +++ b/src/tests/gl_tests/BlitFramebufferANGLETest.cpp @@ -1712,6 +1712,107 @@ class BlitFramebufferTest : public ANGLETest<> quadVertices.data()); glDrawArrays(GL_TRIANGLES, 0, 6); } + + void BlitSampleStencilToDefault(GLsizei samples) + { + GLsizei w = 3, h = 2; + GLint stencilValue = 1; + glClearColor(0.0f, 0.0f, 0.0f, 1.0f); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); + + GLRenderbuffer colorbuf; + glBindRenderbuffer(GL_RENDERBUFFER, colorbuf); + if (samples != 0) + { + glRenderbufferStorageMultisample(GL_RENDERBUFFER, 4, GL_RGBA8, w, h); + } + else + { + glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, w, h); + } + + GLRenderbuffer depthstencilbuf; + glBindRenderbuffer(GL_RENDERBUFFER, depthstencilbuf); + if (samples != 0) + { + glRenderbufferStorageMultisample(GL_RENDERBUFFER, 4, GL_DEPTH24_STENCIL8, w, h); + } + else + { + glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, w, h); + } + + GLFramebuffer framebuffer; + glBindFramebuffer(GL_FRAMEBUFFER, framebuffer); + glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, colorbuf); + glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, + depthstencilbuf); + glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, + depthstencilbuf); + glCheckFramebufferStatus(GL_FRAMEBUFFER); + + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); + glFlush(); + + // Clear the stencil of each pixel to a different value. + glEnable(GL_STENCIL_TEST); + glEnable(GL_SCISSOR_TEST); + glViewport(0, 0, w, h); + for (GLsizei y = 0; y < h; y++) + { + for (GLsizei x = 0; x < w; x++) + { + glScissor(x, y, 1, 1); + glClearStencil(stencilValue); + glClear(GL_STENCIL_BUFFER_BIT); + stencilValue += 1; + } + } + glDisable(GL_SCISSOR_TEST); + + // Blit stencil buffer to default framebuffer. + GLenum attachments1[] = {GL_COLOR_ATTACHMENT0}; + glInvalidateFramebuffer(GL_FRAMEBUFFER, 1, attachments1); + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); + glBlitFramebuffer(0, 0, w, h, 0, 0, w, h, GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT, + GL_NEAREST); + glBindFramebuffer(GL_READ_FRAMEBUFFER, 0); + + // Disable stencil and draw full_screen green color. + ANGLE_GL_PROGRAM(drawGreen, essl3_shaders::vs::Simple(), essl3_shaders::fs::Green()); + glDisable(GL_STENCIL_TEST); + drawQuad(drawGreen, essl3_shaders::PositionAttrib(), 0.5f); + + // Get the stencil through drawQuad. + // If the blit finished successfully, the stencil test should all pass. + ANGLE_GL_PROGRAM(drawColor, essl1_shaders::vs::Simple(), essl1_shaders::fs::UniformColor()); + GLint colorUniformLocation = + glGetUniformLocation(drawColor, angle::essl1_shaders::ColorUniform()); + ASSERT_NE(colorUniformLocation, -1); + glUseProgram(drawColor); + glEnable(GL_STENCIL_TEST); + for (GLsizei i = 1; i <= 6; i++) + { + glStencilFunc(GL_EQUAL, i, 255); + glUniform4f(colorUniformLocation, i * 1.0f / 255, 0.0f, 0.0f, 1.0f); + drawQuad(drawColor, essl1_shaders::PositionAttrib(), 1.0f); + ASSERT_GL_NO_ERROR(); + } + + // Check the result. + std::vector pixels(w * h); + GLuint color_ref = 1; + glReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, pixels.data()); + for (GLsizei y = 0; y < h; y++) + { + for (GLsizei x = 0; x < w; x++) + { + const int curPos = y * w + x; + EXPECT_COLOR_NEAR(GLColor(color_ref, 0, 0, 255), pixels[curPos], 1); + color_ref += 1; + } + } + } }; class BlitFramebufferTestES31 : public BlitFramebufferTest @@ -1793,72 +1894,16 @@ TEST_P(BlitFramebufferTest, MultisampleDepth) ASSERT_GL_NO_ERROR(); } -// Blit multisample stencil buffer to default framebuffer without prerotaion. -TEST_P(BlitFramebufferTest, BlitMultisampleStencilToDefault) +// Blit stencil buffer to default framebuffer with prerotaion. +TEST_P(BlitFramebufferTest, BlitStencilToDefault) { - // http://anglebug.com/42262159 - ANGLE_SKIP_TEST_IF(IsOpenGL() && IsIntel() && IsMac()); - - glClearColor(0.0f, 0.0f, 0.0f, 1.0f); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); - - GLRenderbuffer colorbuf; - glBindRenderbuffer(GL_RENDERBUFFER, colorbuf); - glRenderbufferStorageMultisample(GL_RENDERBUFFER, 4, GL_RGBA8, 128, 128); - - GLRenderbuffer depthstencilbuf; - glBindRenderbuffer(GL_RENDERBUFFER, depthstencilbuf); - glRenderbufferStorageMultisample(GL_RENDERBUFFER, 4, GL_DEPTH24_STENCIL8, 128, 128); - - GLFramebuffer framebuffer; - glBindFramebuffer(GL_FRAMEBUFFER, framebuffer); - glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, colorbuf); - glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, - depthstencilbuf); - glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, - depthstencilbuf); - glCheckFramebufferStatus(GL_FRAMEBUFFER); - - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); - glFlush(); - - // Replace stencil to 1. - ANGLE_GL_PROGRAM(drawRed, essl3_shaders::vs::Simple(), essl3_shaders::fs::Red()); - glEnable(GL_STENCIL_TEST); - glStencilOp(GL_REPLACE, GL_REPLACE, GL_REPLACE); - glStencilFunc(GL_ALWAYS, 1, 255); - drawQuad(drawRed, essl3_shaders::PositionAttrib(), 0.8f); - - // Blit multisample stencil buffer to default frambuffer. - GLenum attachments1[] = {GL_COLOR_ATTACHMENT0}; - glInvalidateFramebuffer(GL_FRAMEBUFFER, 1, attachments1); - glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); - glBlitFramebuffer(0, 0, 128, 128, 0, 0, 128, 128, GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT, - GL_NEAREST); - glBindFramebuffer(GL_READ_FRAMEBUFFER, 0); - - // Disable stencil and draw full_screen green color. - ANGLE_GL_PROGRAM(drawGreen, essl3_shaders::vs::Simple(), essl3_shaders::fs::Green()); - glDisable(GL_STENCIL_TEST); - drawQuad(drawGreen, essl3_shaders::PositionAttrib(), 0.5f); - - // Draw blue color if the stencil is equal to 1. - // If the blit finished successfully, the stencil test should all pass. - ANGLE_GL_PROGRAM(drawBlue, essl3_shaders::vs::Simple(), essl3_shaders::fs::Blue()); - glEnable(GL_STENCIL_TEST); - glStencilFunc(GL_EQUAL, 1, 255); - drawQuad(drawBlue, essl3_shaders::PositionAttrib(), 0.2f); - - // Check the result, especially the boundaries. - EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::blue); - EXPECT_PIXEL_COLOR_EQ(127, 0, GLColor::blue); - EXPECT_PIXEL_COLOR_EQ(50, 0, GLColor::blue); - EXPECT_PIXEL_COLOR_EQ(127, 1, GLColor::blue); - EXPECT_PIXEL_COLOR_EQ(0, 127, GLColor::blue); - EXPECT_PIXEL_COLOR_EQ(127, 127, GLColor::blue); - EXPECT_PIXEL_COLOR_EQ(64, 64, GLColor::blue); + BlitSampleStencilToDefault(0); +} - ASSERT_GL_NO_ERROR(); +// Blit multisample stencil buffer to default framebuffer with prerotaion. +TEST_P(BlitFramebufferTest, BlitMultisampleStencilToDefault) +{ + BlitSampleStencilToDefault(4); } // Test blit multisampled framebuffer to MRT framebuffer