From 2494960b39e8782d867066d99db062f6bc4ff713 Mon Sep 17 00:00:00 2001
From: Jacki <jacki@thejackimonster.de>
Date: Sun, 13 Oct 2024 06:40:57 +0200
Subject: [PATCH] Drop murmur3 submodule
Signed-off-by: Jacki <jacki@thejackimonster.de>
---
.gitmodules | 3 ---
modules/shader_compiler/CMakeLists.txt | 3 +--
modules/shader_compiler/config/Murmur3.cmake | 9 ---------
modules/shader_compiler/config/Shady.cmake | 1 -
modules/shader_compiler/lib/murmur3 | 1 -
5 files changed, 1 insertion(+), 16 deletions(-)
delete mode 100644 modules/shader_compiler/config/Murmur3.cmake
delete mode 160000 modules/shader_compiler/lib/murmur3
diff --git a/.gitmodules b/.gitmodules
index 77297e80..25bbdfcb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -76,9 +76,6 @@
[submodule "modules/shader_compiler/lib/SPIRV-Headers"]
path = modules/shader_compiler/lib/SPIRV-Headers
url = https://github.com/KhronosGroup/SPIRV-Headers.git
-[submodule "modules/shader_compiler/lib/murmur3"]
- path = modules/shader_compiler/lib/murmur3
- url = https://github.com/PeterScott/murmur3.git
[submodule "modules/shader_compiler/lib/json-c"]
path = modules/shader_compiler/lib/json-c
url = https://github.com/json-c/json-c.git
diff --git a/modules/shader_compiler/CMakeLists.txt b/modules/shader_compiler/CMakeLists.txt
index b7452fe1..48af8730 100644
--- a/modules/shader_compiler/CMakeLists.txt
+++ b/modules/shader_compiler/CMakeLists.txt
@@ -52,8 +52,7 @@ include(config/SPIRV-Headers.cmake)
# Check and load GLSLANG
include(config/GLSLANG.cmake)
-# Check and load Shady (with murmur3)
-include(config/Murmur3.cmake)
+# Check and load Shady
include(config/Shady.cmake)
# Check and load SLANG
diff --git a/modules/shader_compiler/config/Murmur3.cmake b/modules/shader_compiler/config/Murmur3.cmake
deleted file mode 100644
index d220b52c..00000000
--- a/modules/shader_compiler/config/Murmur3.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-
-use_git_submodule("${vkcv_shader_compiler_lib_path}/murmur3" murmur3_status)
-
-if (${murmur3_status})
- add_library(murmur3 STATIC ${vkcv_shader_compiler_lib}/murmur3/murmur3.c)
-
- target_include_directories(murmur3 INTERFACE ${vkcv_shader_compiler_lib}/murmur3)
- set_target_properties(murmur3 PROPERTIES POSITION_INDEPENDENT_CODE ON)
-endif ()
diff --git a/modules/shader_compiler/config/Shady.cmake b/modules/shader_compiler/config/Shady.cmake
index 3fac5733..c88aa4c8 100644
--- a/modules/shader_compiler/config/Shady.cmake
+++ b/modules/shader_compiler/config/Shady.cmake
@@ -4,7 +4,6 @@ use_git_submodule("${vkcv_shader_compiler_lib_path}/shady" shady_status)
if (${shady_status})
set(EXTERNAL_JSON_C ON CACHE INTERNAL "")
set(EXTERNAL_SPIRV_HEADERS ON CACHE INTERNAL "")
-
set(EXTERNAL_JSON_C_INCLUDE ${JSON_C_INCLUDE_DIR} CACHE INTERNAL "")
set(BUILD_RUNTIME OFF CACHE INTERNAL "")
diff --git a/modules/shader_compiler/lib/murmur3 b/modules/shader_compiler/lib/murmur3
deleted file mode 160000
index dae94be0..00000000
--- a/modules/shader_compiler/lib/murmur3
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit dae94be0c0f54a399d23ea6cbe54bca5a4e93ce4
--
GitLab