diff options
| author | bunnei <bunneidev@gmail.com> | 2020-10-23 19:01:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-23 19:01:16 +0200 |
| commit | 3e46934442a77a2e009a17ee48739c28dbe02d46 (patch) | |
| tree | c74da5853aac50c581eac6c08695a8c66acd0a8e | |
| parent | Merge pull request #4792 from bunnei/rtc-fix (diff) | |
| parent | video_core: Fix instances where msbuild always regenerated host shaders (diff) | |
| download | yuzu-3e46934442a77a2e009a17ee48739c28dbe02d46.tar yuzu-3e46934442a77a2e009a17ee48739c28dbe02d46.tar.gz yuzu-3e46934442a77a2e009a17ee48739c28dbe02d46.tar.bz2 yuzu-3e46934442a77a2e009a17ee48739c28dbe02d46.tar.lz yuzu-3e46934442a77a2e009a17ee48739c28dbe02d46.tar.xz yuzu-3e46934442a77a2e009a17ee48739c28dbe02d46.tar.zst yuzu-3e46934442a77a2e009a17ee48739c28dbe02d46.zip | |
| -rw-r--r-- | src/video_core/host_shaders/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | src/video_core/host_shaders/StringShaderHeader.cmake | 2 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/video_core/host_shaders/CMakeLists.txt b/src/video_core/host_shaders/CMakeLists.txt index aa62363a7..c157724a9 100644 --- a/src/video_core/host_shaders/CMakeLists.txt +++ b/src/video_core/host_shaders/CMakeLists.txt @@ -1,23 +1,16 @@ -set(SHADER_FILES +set(SHADER_SOURCES opengl_present.frag opengl_present.vert ) set(SHADER_INCLUDE ${CMAKE_CURRENT_BINARY_DIR}/include) -set(HOST_SHADERS_INCLUDE ${SHADER_INCLUDE} PARENT_SCOPE) - set(SHADER_DIR ${SHADER_INCLUDE}/video_core/host_shaders) -add_custom_command( - OUTPUT - ${SHADER_DIR} - COMMAND - ${CMAKE_COMMAND} -E make_directory ${SHADER_DIR} -) +set(HOST_SHADERS_INCLUDE ${SHADER_INCLUDE} PARENT_SCOPE) set(INPUT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/source_shader.h.in) set(HEADER_GENERATOR ${CMAKE_CURRENT_SOURCE_DIR}/StringShaderHeader.cmake) -foreach(FILENAME IN ITEMS ${SHADER_FILES}) +foreach(FILENAME IN ITEMS ${SHADER_SOURCES}) string(REPLACE "." "_" SHADER_NAME ${FILENAME}) set(SOURCE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}) set(HEADER_FILE ${SHADER_DIR}/${SHADER_NAME}.h) @@ -29,8 +22,8 @@ foreach(FILENAME IN ITEMS ${SHADER_FILES}) MAIN_DEPENDENCY ${SOURCE_FILE} DEPENDS - ${HEADER_GENERATOR} ${INPUT_FILE} + # HEADER_GENERATOR should be included here but msbuild seems to assume it's always modified ) set(SHADER_HEADERS ${SHADER_HEADERS} ${HEADER_FILE}) endforeach() @@ -39,5 +32,5 @@ add_custom_target(host_shaders DEPENDS ${SHADER_HEADERS} SOURCES - ${SHADER_FILES} + ${SHADER_SOURCES} ) diff --git a/src/video_core/host_shaders/StringShaderHeader.cmake b/src/video_core/host_shaders/StringShaderHeader.cmake index 368bce0ed..c0fc49768 100644 --- a/src/video_core/host_shaders/StringShaderHeader.cmake +++ b/src/video_core/host_shaders/StringShaderHeader.cmake @@ -8,4 +8,6 @@ string(TOUPPER ${CONTENTS_NAME} CONTENTS_NAME) file(READ ${SOURCE_FILE} CONTENTS) +get_filename_component(OUTPUT_DIR ${HEADER_FILE} DIRECTORY) +make_directory(${OUTPUT_DIR}) configure_file(${INPUT_FILE} ${HEADER_FILE} @ONLY) |