edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-19 17:14:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use CMake cache instead of extra file for shader compile, fix typos

Browse source
This commit is contained in:
Jupeyy 2022-12-20 11:09:53 +01:00
parent e9ba7857fe
commit 19a107a098
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -40,7 +40,6 @@ pack_*/
release
rules.ninja
testrunner\[1\]_include.cmake
vulkan_shaders_sha256.txt
/SDL2.framework

1
CMakeLists.txt
View file

@ -577,6 +577,7 @@ if(TARGET_OS AND TARGET_OS STREQUAL "mac")
endif()
set(VULKAN_SHADER_FILE_LIST "" CACHE STRING "Vulkan shader file list")
set(VULKAN_SHADER_FILE_SHA256 "" CACHE STRING "Vulkan shader file hash")
if(CLIENT AND VULKAN)
find_package(Vulkan)
include(cmake/BuildVulkanShaders.cmake)

15
cmake/BuildVulkanShaders.cmake
View file

@ -43,13 +43,13 @@ if(NOT SPIRV_OPTIMIZER_PROGRAM)
endif()
file(GLOB_RECURSE GLSL_SHADER_FILES
"data/shaders/vulkan/*.frag"
"data/shaders/vulkan/*.vert"
"data/shader/vulkan/*.frag"
"data/shader/vulkan/*.vert"
)
set(TMP_SHADER_SHA256_LIST "")
foreach(GLSL_SHADER_FILE ${GLSL_SHADER_FILES})
file(SHA256 ${FILE_NAME} TMP_FILE_SHA)
file(SHA256 ${GLSL_SHADER_FILE} TMP_FILE_SHA)
set(TMP_SHADER_SHA256_LIST "${TMP_SHADER_SHA256_LIST}${TMP_FILE_SHA}")
endforeach(GLSL_SHADER_FILE)
@ -58,11 +58,8 @@ set(GLSL_SHADER_SHA256 "${GLSL_SHADER_SHA256}@v1")
set(FOUND_MATCHING_SHA256_FILE FALSE)
if(EXISTS "${PROJECT_BINARY_DIR}/vulkan_shaders_sha256.txt")
file(STRINGS "${PROJECT_BINARY_DIR}/vulkan_shaders_sha256.txt" VULKAN_SHADERS_SHA256_FILE_CONTENT)
if("${VULKAN_SHADERS_SHA256_FILE_CONTENT}" STREQUAL "${GLSL_SHADER_SHA256}")
set(FOUND_MATCHING_SHA256_FILE TRUE)
endif()
if("${VULKAN_SHADER_FILE_SHA256}" STREQUAL "${GLSL_SHADER_SHA256}")
set(FOUND_MATCHING_SHA256_FILE TRUE)
endif()
set(TW_VULKAN_VERSION "vulkan100")
@ -177,5 +174,5 @@ if(NOT FOUND_MATCHING_SHA256_FILE)
set(VULKAN_SHADER_FILE_LIST ${VULKAN_SHADER_FILE_LIST} CACHE STRING "Vulkan shader file list" FORCE)
message(STATUS "Finished building vulkan shaders")
file(WRITE "${PROJECT_BINARY_DIR}/vulkan_shaders_sha256.txt" "${GLSL_SHADER_SHA256}")
set(VULKAN_SHADER_FILE_SHA256 ${GLSL_SHADER_SHA256} CACHE STRING "Vulkan shader file hash" FORCE)
endif()