ShaderC dependencies Remove and Shader Compilation Refactor (JeanPhilippeKernel#504)

- We remove the use of the shaderc download, which was only being used
  for compiling shaders.
- We instead use the glslang compiler that we we're compiling anyway.
- This way we can extract the glslang compiler that we have compiled
  and do the shader compilation as part of the CMake Scripting.
- This should reduce the compilation times and/or storage requirements.
- As Currently configured the Shaders will be compiled in each build,
  however, we can improve on this and ensure that compilation is only
  done as required at a later stage

Co-authored-by: Mathew Benson <mathew@benson.co.ke>

Author: MathewBensonCode

CMakeLists.txt

@@ -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)

Obelisk/CMakeLists.txt

@@ -53,9 +53,6 @@ install(TARGETS ${TARGET_NAME}
     DESTINATION bin
 )
 
-install(DIRECTORY ../Resources/Editor/Settings DESTINATION bin)
-
-install(DIRECTORY ../Resources/Shaders DESTINATION bin)
 
 
 

Resources/CMakeLists.txt

@@ -0,0 +1,40 @@
+set(ShaderPath ${CMAKE_CURRENT_SOURCE_DIR}/Shaders)
+set(ShaderOutputPath "${ShaderPath}/Cache")
+
+set(Flags)
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  set(Flags "-g")
+else()
+  set(Flags "-Os")
+endif()
+
+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" ${Flags} "-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)

Scripts/BuildEngine.ps1

@@ -174,7 +174,6 @@ function Build([string]$configuration, [int]$VsVersion , [bool]$runBuild) {
     }
 }
 
-
 if(-Not $LauncherOnly) {
 
     # Run Clang format
@@ -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
     }

Scripts/PostBuild.ps1

@@ -102,7 +102,6 @@ FetchContent_Declare(
 
 )
 
-
 FetchContent_Declare(
     SPIRV-Tools
     GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Tools.git
@@ -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)
@@ -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()
 
 
@@ -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
 )