N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

renderer_vulkan: Separate glsl->spirv compilation to CompileGLSLtoSPIRV

Browse source 
Allows other library code to compile GLSL to SPRIV intermediately before creating a shader-module
This commit is contained in:
Wunkolo 2024-03-02 11:21:33 -08:00
parent 21bfc043f0
commit d24722ba96
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/video_core/renderer_vulkan/vk_shader_util.cpp
View file

@ -158,7 +158,14 @@ bool InitializeCompiler() {
} }
} // Anonymous namespace } // Anonymous namespace
vk::ShaderModule Compile(std::string_view code, vk::ShaderStageFlagBits stage, vk::Device device) { /**
* @brief Compiles GLSL into SPIRV
* @param code The string containing GLSL code.
* @param stage The pipeline stage the shader will be used in.
* @param device The vulkan device handle.
*/
std::vector<u32> CompileGLSLtoSPIRV(std::string_view code, vk::ShaderStageFlagBits stage,
vk::Device device) {
if (!InitializeCompiler()) { if (!InitializeCompiler()) {
return {}; return {};
} }
@ -212,7 +219,11 @@ vk::ShaderModule Compile(std::string_view code, vk::ShaderStageFlagBits stage, v
LOG_INFO(Render_Vulkan, "SPIR-V conversion messages: {}", spv_messages); LOG_INFO(Render_Vulkan, "SPIR-V conversion messages: {}", spv_messages);
} }
return CompileSPV(out_code, device); return out_code;
}
vk::ShaderModule Compile(std::string_view code, vk::ShaderStageFlagBits stage, vk::Device device) {
return CompileSPV(CompileGLSLtoSPIRV(code, stage, device), device);
} }
vk::ShaderModule CompileSPV(std::span<const u32> code, vk::Device device) { vk::ShaderModule CompileSPV(std::span<const u32> code, vk::Device device) {

9
src/video_core/renderer_vulkan/vk_shader_util.h
View file

@ -10,6 +10,15 @@
namespace Vulkan { namespace Vulkan {
/**
* @brief Compiles GLSL into SPIRV
* @param code The string containing GLSL code.
* @param stage The pipeline stage the shader will be used in.
* @param device The vulkan device handle.
*/
std::vector<u32> CompileGLSLtoSPIRV(std::string_view code, vk::ShaderStageFlagBits stage,
vk::Device device);
/** /**
* @brief Creates a vulkan shader module from GLSL by converting it to SPIR-V using glslang. * @brief Creates a vulkan shader module from GLSL by converting it to SPIR-V using glslang.
* @param code The string containing GLSL code. * @param code The string containing GLSL code.