Skip to content

ShaderC dependencies and Shader Compilation Refactor #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MathewBensonCode wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

ShaderC dependencies and Shader Compilation Refactor #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ if (NOT LAUNCHER_ONLY)
## Setup Dependencies
include(dependencies.cmake)

## Compile Shaders

add_subdirectory (Resources)

# Core engine lib is here
#
add_subdirectory (ZEngine)
Expand Down
3 changes: 0 additions & 3 deletions Obelisk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ install(TARGETS ${TARGET_NAME}
DESTINATION bin
)

install(DIRECTORY ../Resources/Editor/Settings DESTINATION bin)

install(DIRECTORY ../Resources/Shaders DESTINATION bin)



33 changes: 33 additions & 0 deletions Resources/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
set(ShaderPath ${CMAKE_CURRENT_SOURCE_DIR}/Shaders)
set(ShaderOutputPath "${ShaderPath}/Cache")

file (MAKE_DIRECTORY "${ShaderOutputPath}")

file (GLOB VertexShaders CONFIGURE_DEPENDS "${ShaderPath}/*.vert")
file (GLOB FragmentShaders CONFIGURE_DEPENDS "${ShaderPath}/*.frag")

foreach(VertexShader ${VertexShaders})

cmake_path(GET VertexShader STEM shaderfilename)
cmake_path(APPEND_STRING shaderfilename "_vertex.spv" OUTPUT_VARIABLE VertexShaderOutputFileName )
cmake_path(APPEND ShaderOutputPath ${VertexShaderOutputFileName} OUTPUT_VARIABLE VertexShaderOutputPath)

add_custom_target("Compile-${shaderfilename}-vertex" ALL COMMAND glslang-standalone "-I${ShaderPath}" "-V" "-o" "${VertexShaderOutputPath}" "${VertexShader}")


endforeach()

foreach(FragmentShader ${FragmentShaders})

cmake_path(GET FragmentShader STEM shaderfilename)
cmake_path(APPEND_STRING shaderfilename "_fragment.spv" OUTPUT_VARIABLE FragmentShaderOutputFileName )
cmake_path(APPEND ShaderOutputPath ${FragmentShaderOutputFileName} OUTPUT_VARIABLE FragmentShaderOutputPath)


add_custom_target("Compile-${shaderfilename}-fragment" ALL COMMAND glslang-standalone "-V" "-I${ShaderPath}" "-o" "${FragmentShaderOutputPath}" "${FragmentShader}")

endforeach()

install(DIRECTORY Editor/Settings DESTINATION bin)

install(DIRECTORY Shaders/Cache DESTINATION bin/Shaders)
8 changes: 0 additions & 8 deletions Scripts/BuildEngine.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
}
}


if(-Not $LauncherOnly) {

# Run Clang format
Expand All @@ -195,13 +194,6 @@ if(-Not $LauncherOnly) {
}
}


# Run Shader Compilation
foreach ($config in $Configurations) {
$shaderCompileScript = Join-Path $PSScriptRoot -ChildPath "ShaderCompile.ps1"
& pwsh -File $shaderCompileScript -Configuration:$config -ForceRebuild:$true
}

if ($LASTEXITCODE -ne 0) {
Write-Error "Stopped build process..." -ErrorAction Stop
}
Expand Down
137 changes: 0 additions & 137 deletions Scripts/PostBuild.ps1
View file
Open in desktop

This file was deleted.

100 changes: 0 additions & 100 deletions Scripts/ShaderCompile.ps1
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ZEngine/ZEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
file (GLOB_RECURSE HEADER_FILES_LIST CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
file (GLOB_RECURSE CPP_FILES_LIST CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
file (GLOB_RECURSE RESOURCE_FILES_LIST CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/../Resources/Shaders/*.*)

source_group (TREE ${PROJECT_SOURCE_DIR}/ZEngine PREFIX "Source Files" FILES ${HEADER_FILES_LIST} ${CPP_FILES_LIST})
source_group (TREE ${PROJECT_SOURCE_DIR}/../Resources PREFIX "Resources Files" FILES ${RESOURCE_FILES_LIST})

# ZEngine source files
#
Expand Down
9 changes: 3 additions & 6 deletions dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ FetchContent_Declare(

)


FetchContent_Declare(
SPIRV-Tools
GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Tools.git
Expand Down Expand Up @@ -179,14 +178,14 @@ FetchContent_MakeAvailable(
yaml-cpp
VulkanMemoryAllocator
SPIRV-Headers
SPIRV-Tools
glslang
spirv_cross_core
GTest
nlohmann_json
tlsf
CLI11
rapidhash
SPIRV-Tools
glslang
GTest
)

set(IMGUIDIR ${FETCHCONTENT_BASE_DIR}/imgui)
Expand Down Expand Up @@ -240,7 +239,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
target_link_libraries(External_libs INTERFACE SPIRV-Tools-static)
else()
target_link_libraries(External_libs INTERFACE SPIRV-Tools)

endif()


Expand All @@ -261,7 +259,6 @@ target_link_libraries(External_libs
glslang::glslang
glslang::glslang-default-resource-limits
glslang::SPIRV
glslang::SPVRemapper
GPUOpen::VulkanMemoryAllocator
nlohmann_json::nlohmann_json
)
Expand Down