From 1b8ec8171b215e889c2271d61be2c205a921c142 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 6 Apr 2024 17:06:46 +1000 Subject: [PATCH] 3rdparty: Remove glslang --- .gitmodules | 3 - 3rdparty/glslang/CMakeLists.txt | 58 ------- 3rdparty/glslang/glslang | 1 - 3rdparty/glslang/glslang.vcxproj | 147 ------------------ 3rdparty/glslang/glslang.vcxproj.filters | 107 ------------- 3rdparty/glslang/include/glslang/build_info.h | 62 -------- 6 files changed, 378 deletions(-) delete mode 100644 3rdparty/glslang/CMakeLists.txt delete mode 160000 3rdparty/glslang/glslang delete mode 100644 3rdparty/glslang/glslang.vcxproj delete mode 100644 3rdparty/glslang/glslang.vcxproj.filters delete mode 100644 3rdparty/glslang/include/glslang/build_info.h diff --git a/.gitmodules b/.gitmodules index 2624ebf1db720..d81b981453c9a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,9 +12,6 @@ path = 3rdparty/rapidyaml/rapidyaml url = https://github.com/biojppm/rapidyaml.git branch = master -[submodule "3rdparty/glslang/glslang"] - path = 3rdparty/glslang/glslang - url = https://github.com/KhronosGroup/glslang.git [submodule "3rdparty/vulkan-headers"] path = 3rdparty/vulkan-headers url = https://github.com/KhronosGroup/Vulkan-Headers.git diff --git a/3rdparty/glslang/CMakeLists.txt b/3rdparty/glslang/CMakeLists.txt deleted file mode 100644 index 3db3d21fae64d..0000000000000 --- a/3rdparty/glslang/CMakeLists.txt +++ /dev/null @@ -1,58 +0,0 @@ -add_library(glslang - glslang/glslang/CInterface/glslang_c_interface.cpp - glslang/glslang/GenericCodeGen/CodeGen.cpp - glslang/glslang/GenericCodeGen/Link.cpp - glslang/glslang/MachineIndependent/attribute.cpp - glslang/glslang/MachineIndependent/Constant.cpp - glslang/glslang/MachineIndependent/glslang_tab.cpp - glslang/glslang/MachineIndependent/InfoSink.cpp - glslang/glslang/MachineIndependent/Initialize.cpp - glslang/glslang/MachineIndependent/Intermediate.cpp - glslang/glslang/MachineIndependent/intermOut.cpp - glslang/glslang/MachineIndependent/IntermTraverse.cpp - glslang/glslang/MachineIndependent/iomapper.cpp - glslang/glslang/MachineIndependent/limits.cpp - glslang/glslang/MachineIndependent/linkValidate.cpp - glslang/glslang/MachineIndependent/parseConst.cpp - glslang/glslang/MachineIndependent/ParseContextBase.cpp - glslang/glslang/MachineIndependent/ParseHelper.cpp - glslang/glslang/MachineIndependent/PoolAlloc.cpp - glslang/glslang/MachineIndependent/preprocessor/Pp.cpp - glslang/glslang/MachineIndependent/preprocessor/PpAtom.cpp - glslang/glslang/MachineIndependent/preprocessor/PpContext.cpp - glslang/glslang/MachineIndependent/preprocessor/PpScanner.cpp - glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp - glslang/glslang/MachineIndependent/propagateNoContraction.cpp - glslang/glslang/MachineIndependent/reflection.cpp - glslang/glslang/MachineIndependent/RemoveTree.cpp - glslang/glslang/MachineIndependent/Scan.cpp - glslang/glslang/MachineIndependent/ShaderLang.cpp - glslang/glslang/MachineIndependent/SpirvIntrinsics.cpp - glslang/glslang/MachineIndependent/SymbolTable.cpp - glslang/glslang/MachineIndependent/Versions.cpp - glslang/OGLCompilersDLL/InitializeDll.cpp - glslang/SPIRV/disassemble.cpp - glslang/SPIRV/doc.cpp - glslang/SPIRV/GlslangToSpv.cpp - glslang/SPIRV/InReadableOrder.cpp - glslang/SPIRV/Logger.cpp - glslang/SPIRV/SpvBuilder.cpp - glslang/SPIRV/SpvPostProcess.cpp - glslang/SPIRV/SPVRemapper.cpp - glslang/SPIRV/SpvTools.cpp - glslang/StandAlone/ResourceLimits.cpp - glslang/StandAlone/resource_limits_c.cpp -) - -if(WIN32) - target_sources(glslang PRIVATE glslang/glslang/OSDependent/Windows/ossource.cpp) -else() - target_sources(glslang PRIVATE glslang/glslang/OSDependent/Unix/ossource.cpp) -endif() - -target_include_directories(glslang PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/glslang" "${CMAKE_CURRENT_SOURCE_DIR}/include") - -# Needed for macOS compile. -set_property(TARGET glslang PROPERTY CXX_STANDARD 11) -set_property(TARGET glslang PROPERTY CXX_STANDARD_REQUIRED ON) - diff --git a/3rdparty/glslang/glslang b/3rdparty/glslang/glslang deleted file mode 160000 index c9706bdda0ac2..0000000000000 --- a/3rdparty/glslang/glslang +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5 diff --git a/3rdparty/glslang/glslang.vcxproj b/3rdparty/glslang/glslang.vcxproj deleted file mode 100644 index cd20e072dc9d2..0000000000000 --- a/3rdparty/glslang/glslang.vcxproj +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - {EF6834A9-11F3-4331-BC34-21B325ABB180} - Win32Proj - - - - StaticLibrary - $(DefaultPlatformToolset) - ClangCL - MultiByte - true - true - false - - - - - - - - - - - - - - AllRules.ruleset - - - - TurnOffAllWarnings - %(PreprocessorDefinitions) - $(ProjectDir)glslang;$(ProjectDir)include;%(AdditionalIncludeDirectories) - stdcpp14 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/glslang/glslang.vcxproj.filters b/3rdparty/glslang/glslang.vcxproj.filters deleted file mode 100644 index 2c49020b82708..0000000000000 --- a/3rdparty/glslang/glslang.vcxproj.filters +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/glslang/include/glslang/build_info.h b/3rdparty/glslang/include/glslang/build_info.h deleted file mode 100644 index 9d70f7962dc65..0000000000000 --- a/3rdparty/glslang/include/glslang/build_info.h +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (C) 2020 The Khronos Group Inc. -// -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// -// Neither the name of The Khronos Group Inc. nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -// COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. - -#ifndef GLSLANG_BUILD_INFO -#define GLSLANG_BUILD_INFO - -#define GLSLANG_VERSION_MAJOR 11 -#define GLSLANG_VERSION_MINOR 7 -#define GLSLANG_VERSION_PATCH 1 -#define GLSLANG_VERSION_FLAVOR "" - -#define GLSLANG_VERSION_GREATER_THAN(major, minor, patch) \ - (((major) > GLSLANG_VERSION_MAJOR) || ((major) == GLSLANG_VERSION_MAJOR && \ - (((minor) > GLSLANG_VERSION_MINOR) || ((minor) == GLSLANG_VERSION_MINOR && \ - ((patch) > GLSLANG_VERSION_PATCH))))) - -#define GLSLANG_VERSION_GREATER_OR_EQUAL_TO(major, minor, patch) \ - (((major) > GLSLANG_VERSION_MAJOR) || ((major) == GLSLANG_VERSION_MAJOR && \ - (((minor) > GLSLANG_VERSION_MINOR) || ((minor) == GLSLANG_VERSION_MINOR && \ - ((patch) >= GLSLANG_VERSION_PATCH))))) - -#define GLSLANG_VERSION_LESS_THAN(major, minor, patch) \ - (((major) < GLSLANG_VERSION_MAJOR) || ((major) == GLSLANG_VERSION_MAJOR && \ - (((minor) < GLSLANG_VERSION_MINOR) || ((minor) == GLSLANG_VERSION_MINOR && \ - ((patch) < GLSLANG_VERSION_PATCH))))) - -#define GLSLANG_VERSION_LESS_OR_EQUAL_TO(major, minor, patch) \ - (((major) < GLSLANG_VERSION_MAJOR) || ((major) == GLSLANG_VERSION_MAJOR && \ - (((minor) < GLSLANG_VERSION_MINOR) || ((minor) == GLSLANG_VERSION_MINOR && \ - ((patch) <= GLSLANG_VERSION_PATCH))))) - -#endif // GLSLANG_BUILD_INFO