From cacfdbad90111011edf057848f9971d871312ae3 Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Tue, 7 Feb 2023 11:31:58 +0100 Subject: [PATCH] Revert "deps: update glslang and vulkan" This reverts commit 1c8e558e25feae0b05ece6a7f8b5c6e67a6c5759. --- .github/workflows/c-cpp.yml | 2 +- core/deps/Vulkan-Headers | 2 +- core/deps/glslang | 2 +- core/rend/vulkan/compiler.cpp | 9 --------- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 2e0b94c9f..a9a81e6e4 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -33,7 +33,7 @@ jobs: brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done brew update brew install libao ldid ninja pulseaudio - VULKAN_VER=1.3.236.0 && aria2c --parameterized-uri=true https://{sdk.lunarg.com/sdk/download/$VULKAN_VER/mac,distfiles.macports.org/MoltenVK}/vulkansdk-macos-$VULKAN_VER.dmg + VULKAN_VER=1.3.224.1 && aria2c --parameterized-uri=true https://{sdk.lunarg.com/sdk/download/$VULKAN_VER/mac,distfiles.macports.org/MoltenVK}/vulkansdk-macos-$VULKAN_VER.dmg hdiutil attach ./vulkansdk-macos-*.dmg sudo /Volumes/vulkansdk-macos-*/InstallVulkan.app/Contents/MacOS/InstallVulkan --root $HOME/VulkanSDK --accept-licenses --default-answer --confirm-command install hdiutil detach /Volumes/vulkansdk-macos-* diff --git a/core/deps/Vulkan-Headers b/core/deps/Vulkan-Headers index b75e5a02b..c896e2f92 160000 --- a/core/deps/Vulkan-Headers +++ b/core/deps/Vulkan-Headers @@ -1 +1 @@ -Subproject commit b75e5a02b6933caf86c5822d019067b335492c85 +Subproject commit c896e2f920273bfee852da9cca2a356bc1c2031e diff --git a/core/deps/glslang b/core/deps/glslang index 77551c429..10423ec65 160000 --- a/core/deps/glslang +++ b/core/deps/glslang @@ -1 +1 @@ -Subproject commit 77551c429f86c0e077f26552b7c1c0f12a9f235e +Subproject commit 10423ec659d301a0ff2daac8bbf38980abf27590 diff --git a/core/rend/vulkan/compiler.cpp b/core/rend/vulkan/compiler.cpp index f2cb9d424..bbbec258f 100644 --- a/core/rend/vulkan/compiler.cpp +++ b/core/rend/vulkan/compiler.cpp @@ -115,15 +115,6 @@ static const TBuiltInResource DefaultTBuiltInResource = { /* .maxTaskWorkGroupSizeY_NV = */ 1, /* .maxTaskWorkGroupSizeZ_NV = */ 1, /* .maxMeshViewCountNV = */ 4, - /* .maxMeshOutputVerticesEXT = */ 256, - /* .maxMeshOutputPrimitivesEXT = */ 256, - /* .maxMeshWorkGroupSizeX_EXT = */ 128, - /* .maxMeshWorkGroupSizeY_EXT = */ 128, - /* .maxMeshWorkGroupSizeZ_EXT = */ 128, - /* .maxTaskWorkGroupSizeX_EXT = */ 128, - /* .maxTaskWorkGroupSizeY_EXT = */ 128, - /* .maxTaskWorkGroupSizeZ_EXT = */ 128, - /* .maxMeshViewCountEXT = */ 4, /* .maxDualSourceDrawBuffersEXT = */ 1, /* .limits = */ {