diff --git a/.gitmodules b/.gitmodules index 77297e8074164f808f141a1e78a7a7404d2ff809..25bbdfcbf1a4e1e40b1bf262d71f33bcd761ba6c 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 b7452fe1ae8ca93d40b402bd820443d874c31d16..48af87303c7de33f93a8787de26d55137c46072c 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 d220b52cd015b38c6ef198b455de193c7759745d..0000000000000000000000000000000000000000 --- 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 3fac573354c3d2cd92f768c6976226a2dab03230..c88aa4c83564e94d0baf94991843bbcf3837e8f6 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 dae94be0c0f54a399d23ea6cbe54bca5a4e93ce4..0000000000000000000000000000000000000000 --- a/modules/shader_compiler/lib/murmur3 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dae94be0c0f54a399d23ea6cbe54bca5a4e93ce4