Fixes and clean-up for shader parser

Author: VReaperV

cmake/DaemonVulkan.cmake

@@ -114,40 +114,61 @@ endfunction()
 
 # GenerateVulkanHeaders()
 
-add_executable( VulkanShaderParser "${DAEMON_DIR}/cmake/DaemonVulkan/VulkanShaderParser.cpp" )
-
-set( GRAPHICS_ENGINE_PATH ${DAEMON_DIR}/src/engine/renderer-vulkan/GraphicsEngine/ )
-set( GRAPHICS_ENGINE_PROCESSED_PATH ${DAEMON_GENERATED_DIR}/DaemonVulkan/GraphicsEngine/ )
-target_compile_definitions( VulkanShaderParser PRIVATE "-DDAEMON_VULKAN_GRAPHICS_ENGINE_PATH=\"${GRAPHICS_ENGINE_PATH}\"" )
-target_compile_definitions( VulkanShaderParser PRIVATE "-DDAEMON_VULKAN_GRAPHICS_ENGINE_PROCESSED_PATH=\"${GRAPHICS_ENGINE_PROCESSED_PATH}\"" )
-
-file( MAKE_DIRECTORY ${GRAPHICS_ENGINE_PROCESSED_PATH} )
-
-option( VULKAN_SPIRV_OUT "Output human-readable SPIR-V files alongside the binary format." ON )
+option( VULKAN_SPIRV_OUT "Output text SPIR-V files alongside the binary format." ON )
 option( VULKAN_SPIRV_OPTIMISE "Enable SPIR-V optimisations." ON )
 option( VULKAN_SPIRV_LTO "Enable link-time SPIR-V optimisations." ON )
 
-set( VULKAN_SPIRV_DEBUG "default" CACHE STRING "glslangValidator debug options (remove: g0, non-semantic: gV)")
-set_property( CACHE VULKAN_SPIRV_DEBUG PROPERTY STRINGS default remove non-semantic )
+if( USE_VULKAN )
+	add_executable( VulkanShaderParser "${DAEMON_DIR}/cmake/DaemonVulkan/VulkanShaderParser.cpp" )
 
-include( DaemonEmbed )
+	set( GRAPHICS_ENGINE_PATH ${DAEMON_DIR}/src/engine/renderer-vulkan/GraphicsEngine/ )
+	set( GRAPHICS_ENGINE_PROCESSED_PATH ${DAEMON_GENERATED_DIR}/DaemonVulkan/GraphicsEngine/ )
+	target_compile_definitions( VulkanShaderParser PRIVATE "-DDAEMON_VULKAN_GRAPHICS_ENGINE_PATH=\"${GRAPHICS_ENGINE_PATH}\"" )
+	target_compile_definitions( VulkanShaderParser PRIVATE "-DDAEMON_VULKAN_GRAPHICS_ENGINE_PROCESSED_PATH=\"${GRAPHICS_ENGINE_PROCESSED_PATH}\"" )
 
-macro( GenerateVulkanShaders target )
+	file( MAKE_DIRECTORY ${GRAPHICS_ENGINE_PROCESSED_PATH} )
+	
 	file( MAKE_DIRECTORY ${DAEMON_GENERATED_DIR}/DaemonVulkan/GraphicsEngine/processed/ )
 	file( MAKE_DIRECTORY ${DAEMON_GENERATED_DIR}/DaemonVulkan/GraphicsEngine/spirv/ )
 	file( MAKE_DIRECTORY ${DAEMON_GENERATED_DIR}/DaemonVulkan/GraphicsEngine/bin/ )
 
+	set( VULKAN_SPIRV_DEBUG "default" CACHE STRING "glslangValidator debug options (remove: g0, non-semantic: gV)")
+	set_property( CACHE VULKAN_SPIRV_DEBUG PROPERTY STRINGS default remove non-semantic )
+endif()
+
+include( DaemonEmbed )
+
+macro( GenerateVulkanShaders target )
 	# Pre-processing for #insert/#include
 	foreach( src IN LISTS graphicsEngineList )
 		set( graphicsProcessedList ${graphicsProcessedList} ${src} )
 		list( APPEND graphicsEngineOutputList ${GRAPHICS_ENGINE_PROCESSED_PATH}processed/${src} )
+		
+		get_filename_component( name "${src}" NAME_WE )
+		
+		if( VULKAN_SPIRV_OUT )
+			set( spirvAsmPath ${DAEMON_GENERATED_DIR}/DaemonVulkan/GraphicsEngine/spirv/${name}.spirv )
+		endif()
+
+		set( spirvBinPath ${DAEMON_GENERATED_DIR}/DaemonVulkan/GraphicsEngine/bin/${name}.spirvBin )
+		
+		list( APPEND graphicsEngineOutputList ${spirvAsmPath} )
+		list( APPEND graphicsEngineOutputList ${spirvBinPath} )
 	endforeach()
+	
+	list( APPEND graphicsEngineOutputList ${DAEMON_GENERATED_DIR}/DaemonVulkan/GraphicsEngine/spirv/spirv.h )
 
 	# glslangValidator
 	find_program( glslangV glslangValidator HINTS /usr/bin /usr/local/bin $ENV{VULKAN_SDK}/Bin/ $ENV{VULKAN_SDK}/Bin32/ )
 
 	set( spirvOptions --target-env vulkan1.3 --glsl-version 460 -e main -l -t )
 
+	if( VULKAN_SPIRV_OUT )
+		set( spirvOut "ON" )
+	else()
+		set( spirvOut "OFF" )
+	endif()
+
 	if( NOT VULKAN_SPIRV_OPTIMISE )
 		set( spirvOptions ${spirvOptions} -Od )
 	endif()
@@ -163,7 +184,7 @@ macro( GenerateVulkanShaders target )
 	endif()
 
 	add_custom_command(
-		COMMAND VulkanShaderParser \"${glslangV} ${spirvOptions}\" ${graphicsProcessedList}
+		COMMAND VulkanShaderParser \"${glslangV} ${spirvOptions}\" ${spirvOut} ${graphicsProcessedList}
 		DEPENDS ${graphicsEngineIDEList}
 		OUTPUT ${graphicsEngineOutputList}
 		COMMENT "Generating Vulkan graphics engine: ${graphicsProcessedList}"
@@ -182,8 +203,7 @@ macro( GenerateVulkanShaders target )
 		
 		set( spirvAsmPath ${DAEMON_GENERATED_DIR}/DaemonVulkan/GraphicsEngine/spirv/${name}.spirv )
 
-		set( spirvBinPath ${DAEMON_GENERATED_DIR}/DaemonVulkan/GraphicsEngine/bin/${src} )
-		string( REGEX REPLACE "[.]glsl$" ".spirvBin" spirvBinPath ${spirvBinPath} )
+		set( spirvBinPath ${DAEMON_GENERATED_DIR}/DaemonVulkan/GraphicsEngine/bin/${name}.spirvBin )
 
 		list( POP_FRONT stagesList stage )
 

cmake/DaemonVulkan/VulkanShaderParser.cpp

@@ -169,7 +169,9 @@ int main( int argc, char** argv ) {
 
 	const std::string baseSpirvOptions = argv[1];
 
-	for( int i = 2; i < argc; i++ ) {
+	const bool spirvAsm = !stricmp( argv[2], "ON" );
+
+	for( int i = 3; i < argc; i++ ) {
 		std::string path = argv[i];
 
 		FILE* glslSource = fopen( ( graphicsEnginePath + path ).c_str(), "r" );
@@ -224,7 +226,10 @@ int main( int argc, char** argv ) {
 		fclose( glslSource );
 		fclose( processedGLSL );
 
-		spirvOptions += " -V " + srcPath + name + " -o " + spirvBinPath + nameNoExt + ".spirvBin -H > " + spirvPath + name + ".spirv";
+		spirvOptions += " -V " + srcPath + name + " -o " + spirvBinPath + nameNoExt + ".spirvBin";
+		if ( spirvAsm ) {
+			spirvOptions += " -H > " + spirvPath + nameNoExt + ".spirv";
+		}
 
 		int r = system( spirvOptions.c_str() );