diff options
author | android-autoroll <android-autoroll@skia-public.iam.gserviceaccount.com> | 2024-04-17 13:42:11 +0000 |
---|---|---|
committer | android-autoroll <android-autoroll@skia-public.iam.gserviceaccount.com> | 2024-04-17 13:42:11 +0000 |
commit | 5b8d9fb4e6baeabf6e7ea2a64f723edff9065cee (patch) | |
tree | 582db021e80acc7418623093dfe7e286f6d85f22 | |
parent | 59d508c3e508a52181af594d842d7025b9dee490 (diff) | |
parent | 313c73c3f6a056a049c03c4f928ab5d83f17a77a (diff) | |
download | angle-5b8d9fb4e6baeabf6e7ea2a64f723edff9065cee.tar.gz |
Roll ANGLE from e92b8e8d97d8 to 313c73c3f6a0 (3 revisions)
https://chromium.googlesource.com/angle/angle.git/+log/e92b8e8d97d8..313c73c3f6a0
Please enable autosubmit on changes if possible when approving them.
If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/angle-android-autoroll
Please CC angle-team@google.com,rmistry@google.com,syoussefi@google.com on the revert to ensure that a human
is aware of the problem.
To file a bug in ANGLE: https://bugs.chromium.org/p/angleproject/issues/entry
To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Test: Presubmit checks will test this change.
Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
Change-Id: I3baf51b2f02ce91060dc5e70de28488aa4946cad
6 files changed, 18 insertions, 20 deletions
@@ -49,7 +49,7 @@ vars = { 'dummy_checkout_chromium': False, # Current revision of VK-GL-CTS (a.k.a dEQP). - 'vk_gl_cts_revision': 'b529676d05230c7f1c8eb5572d787352da2cbace', + 'vk_gl_cts_revision': '669273b1098a0e3db085d10a626b6c7e293f9064', # Current revision of googletest. # Note: this dep cannot be auto-rolled b/c of nesting. @@ -938,7 +938,7 @@ deps = { }, 'third_party/vulkan-deps': { - 'url': Var('chromium_git') + '/vulkan-deps@8dc5cb57074c42295aa647ea407e1adb85f6ec93', + 'url': Var('chromium_git') + '/vulkan-deps@bb53ad5f34d9a44e19cd13b3b77ca0ffa74b352c', 'condition': 'not build_with_chromium', }, diff --git a/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json b/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json index 7201f0b927..f4a1892878 100644 --- a/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json +++ b/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json @@ -6,7 +6,7 @@ "src/tests/deqp_support/deqp_data_autogen.gni": "ee4959858b1d06191d66e1dcdcb8a1cb", "third_party/VK-GL-CTS/src/CMakeLists.txt": - "edb6df6a790907da91c2e45d3202d2f3", + "b1b12aa1c15b24104e391ecd007ec94a", "third_party/VK-GL-CTS/src/execserver/CMakeLists.txt": "38aa187592e6ef9a331fc1ea313fc68d", "third_party/VK-GL-CTS/src/executor/CMakeLists.txt": diff --git a/src/libANGLE/renderer/vulkan/vk_renderer.cpp b/src/libANGLE/renderer/vulkan/vk_renderer.cpp index 10787ee90b..202f6a897e 100644 --- a/src/libANGLE/renderer/vulkan/vk_renderer.cpp +++ b/src/libANGLE/renderer/vulkan/vk_renderer.cpp @@ -280,8 +280,6 @@ constexpr const char *kSkippedMessages[] = { "VUID-vkCmdDrawIndexed-format-07753", "VUID-vkCmdDraw-format-07753", "Undefined-Value-ShaderFragmentOutputMismatch", - // https://anglebug.com/8668 - "VUID-VkSwapchainCreateInfoKHR-pNext-07781", }; // Validation messages that should be ignored only when VK_EXT_primitive_topology_list_restart is diff --git a/third_party/vulkan-deps/DEPS b/third_party/vulkan-deps/DEPS index 9f1ccbc5f3..f39133b816 100644 --- a/third_party/vulkan-deps/DEPS +++ b/third_party/vulkan-deps/DEPS @@ -10,7 +10,7 @@ vars = { 'chromium_git': 'https://chromium.googlesource.com', # Current revision of glslang, the Khronos SPIRV compiler. - 'glslang_revision': '05ba15169ea4b1471e18305786f12526600a7810', + 'glslang_revision': '9001ec9aa56597ba6ddd5104bf53b44d7ae63527', # Current revision of spirv-cross, the Khronos SPIRV cross compiler. 'spirv_cross_revision': 'b8fcf307f1f347089e3c46eb4451d27f32ebc8d3', @@ -25,16 +25,16 @@ vars = { 'vulkan_headers_revision': '1e7b8a6d03d30c9254b5f533b561d62bba8c3199', # Current revision of Khronos Vulkan-Loader. - 'vulkan_loader_revision': '6d9e995cb65cb0766d9ab4610145302be300f3b0', + 'vulkan_loader_revision': 'c684aed192ce1bb202dedd775ea18f066c8c55cb', # Current revision of Khronos Vulkan-Tools. 'vulkan_tools_revision': '9fc3b7bfacb3fa5f4f18dd5aee77c07d53863a3a', # Current revision of Khronos Vulkan-Utility-Libraries. - 'vulkan_utility_libraries_revision': 'a78460f66b69285ec3c2e5abf794163ef61d1782', + 'vulkan_utility_libraries_revision': 'd0670f9ff0da1a2f7596d4861f601dc4c8810aea', # Current revision of Khronos Vulkan-ValidationLayers. - 'vulkan_validation_revision': 'c64f16a6404d02a6f438a92b54159104e18de1c2', + 'vulkan_validation_revision': '6bb4f917888277dc2e57fb5cc9a6bd64c81ee69f', } deps = { diff --git a/third_party/vulkan-deps/glslang/src/.github/workflows/continuous_deployment.yml b/third_party/vulkan-deps/glslang/src/.github/workflows/continuous_deployment.yml index 2127a7b8b3..95be4e1127 100644 --- a/third_party/vulkan-deps/glslang/src/.github/workflows/continuous_deployment.yml +++ b/third_party/vulkan-deps/glslang/src/.github/workflows/continuous_deployment.yml @@ -42,7 +42,7 @@ jobs: cmake_build_type: [Debug, Release] steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - uses: lukka/get-cmake@b111a57714ab6e67a65d3f857b72b148554c4262 # v3.29.1 + - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2 - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 with: python-version: '3.7' @@ -106,7 +106,7 @@ jobs: cmake_build_type: [Debug, Release] steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - uses: lukka/get-cmake@b111a57714ab6e67a65d3f857b72b148554c4262 # v3.29.1 + - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2 - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 with: python-version: '3.7' @@ -163,7 +163,7 @@ jobs: cmake_build_type: [Debug, Release] steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - uses: lukka/get-cmake@b111a57714ab6e67a65d3f857b72b148554c4262 # v3.29.1 + - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2 - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 with: python-version: '3.7' diff --git a/third_party/vulkan-deps/glslang/src/.github/workflows/continuous_integration.yml b/third_party/vulkan-deps/glslang/src/.github/workflows/continuous_integration.yml index bb4916abce..9253ceca6c 100644 --- a/third_party/vulkan-deps/glslang/src/.github/workflows/continuous_integration.yml +++ b/third_party/vulkan-deps/glslang/src/.github/workflows/continuous_integration.yml @@ -18,7 +18,7 @@ jobs: cmake_build_type: [Debug, Release] steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - uses: lukka/get-cmake@b111a57714ab6e67a65d3f857b72b148554c4262 # v3.29.1 + - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2 - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 with: python-version: '3.7' @@ -54,7 +54,7 @@ jobs: flags: ['-fsanitize=address', '-fsanitize=thread'] steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - uses: lukka/get-cmake@b111a57714ab6e67a65d3f857b72b148554c4262 # v3.29.1 + - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2 - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 with: python-version: '3.7' @@ -95,7 +95,7 @@ jobs: - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 with: python-version: '3.7' - - uses: lukka/get-cmake@b111a57714ab6e67a65d3f857b72b148554c4262 # v3.29.1 + - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2 with: cmakeVersion: 3.17.2 - name: Setup ccache @@ -127,7 +127,7 @@ jobs: cmake_build_type: [Debug, Release] steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - uses: lukka/get-cmake@b111a57714ab6e67a65d3f857b72b148554c4262 # v3.29.1 + - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2 - run: ./update_glslang_sources.py - run: cmake -S . -B build -D CMAKE_BUILD_TYPE=${{matrix.cmake_build_type}} -G Ninja -DBUILD_WERROR=ON -D GLSLANG_TESTS=ON env: @@ -151,7 +151,7 @@ jobs: cmake_build_type: [Debug, Release] steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - uses: lukka/get-cmake@b111a57714ab6e67a65d3f857b72b148554c4262 # v3.29.1 + - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2 - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 with: python-version: '3.7' @@ -169,7 +169,7 @@ jobs: runs-on: macos-13 steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - uses: lukka/get-cmake@b111a57714ab6e67a65d3f857b72b148554c4262 # v3.29.1 + - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2 - name: Setup ccache uses: hendrikmuhs/ccache-action@faf867a11c028c0b483fb2ae72b6fc8f7d842714 # v1.2.12 with: @@ -198,7 +198,7 @@ jobs: LEGACY: [ON, OFF] steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - - uses: lukka/get-cmake@b111a57714ab6e67a65d3f857b72b148554c4262 # v3.29.1 + - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2 - name: Setup ccache uses: hendrikmuhs/ccache-action@faf867a11c028c0b483fb2ae72b6fc8f7d842714 # v1.2.12 with: @@ -224,7 +224,7 @@ jobs: - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 with: python-version: '3.7' - - uses: lukka/get-cmake@b111a57714ab6e67a65d3f857b72b148554c4262 # v3.29.1 + - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2 - name: Setup ccache uses: hendrikmuhs/ccache-action@faf867a11c028c0b483fb2ae72b6fc8f7d842714 # v1.2.12 with: |