Pull out compile settings from OpModuleProcessed, use for re-compilation

Author: baldurk

renderdoc/driver/gl/gl_driver.cpp

@@ -27,7 +27,7 @@
 #include <algorithm>
 #include "common/common.h"
 #include "data/glsl_shaders.h"
-#include "driver/shaders/spirv/spirv_common.h"
+#include "driver/shaders/spirv/spirv_compile.h"
 #include "jpeg-compressor/jpge.h"
 #include "maths/matrix.h"
 #include "maths/vec.h"

renderdoc/driver/gl/wrappers/gl_shader_funcs.cpp

@@ -26,7 +26,7 @@
 #include "../gl_driver.h"
 #include "../gl_shader_refl.h"
 #include "common/common.h"
-#include "driver/shaders/spirv/spirv_common.h"
+#include "driver/shaders/spirv/spirv_compile.h"
 #include "serialise/string_utils.h"
 
 void WrappedOpenGL::ShaderData::Compile(WrappedOpenGL &gl, ResourceId id)
@@ -73,8 +73,11 @@ void WrappedOpenGL::ShaderData::Compile(WrappedOpenGL &gl, ResourceId id)
 
     vector<uint32_t> spirvwords;
 
-    SPIRVCompilationSettings settings(SPIRVSourceLanguage::OpenGLGLSL,
-                                      SPIRVShaderStage(ShaderIdx(type)));
+    SPIRVCompilationSettings settings;
+
+    settings.lang = SPIRVSourceLanguage::OpenGLGLSL;
+    settings.entryPoint = "main";
+    settings.stage = SPIRVShaderStage(ShaderIdx(type));
 
     string s = CompileSPIRV(settings, sources, spirvwords);
     if(!spirvwords.empty())

renderdoc/driver/shaders/spirv/CMakeLists.txt

@@ -89,9 +89,9 @@ if(UNIX)
 endif()
 
 set(sources
-    spirv_common.cpp
     spirv_common.h
     spirv_compile.cpp
+    spirv_compile.h
     spirv_disassemble.cpp
     ${glslang_sources})
 

renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj

@@ -59,7 +59,7 @@
       <PreprocessorDefinitions>RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
-	<ItemDefinitionGroup>
+  <ItemDefinitionGroup>
     <ClCompile>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
@@ -145,12 +145,6 @@
       <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
       <ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
     </ClCompile>
-    <ClCompile Include="spirv_common.cpp">
-      <WarningLevel>Level4</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>precompiled.h</ForcedIncludeFiles>
-    </ClCompile>
     <ClCompile Include="spirv_compile.cpp">
       <WarningLevel>Level4</WarningLevel>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -217,6 +211,7 @@
     <ClInclude Include="..\..\..\3rdparty\glslang\SPIRV\spvIR.h" />
     <ClInclude Include="precompiled.h" />
     <ClInclude Include="spirv_common.h" />
+    <ClInclude Include="spirv_compile.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj.filters

@@ -107,7 +107,6 @@
     </ClCompile>
     <ClCompile Include="spirv_compile.cpp" />
     <ClCompile Include="spirv_disassemble.cpp" />
-    <ClCompile Include="spirv_common.cpp" />
     <ClCompile Include="..\..\..\3rdparty\glslang\hlsl\hlslGrammar.cpp">
       <Filter>3rdparty\glslang</Filter>
     </ClCompile>
@@ -300,5 +299,6 @@
     <ClInclude Include="precompiled.h">
       <Filter>PCH</Filter>
     </ClInclude>
+    <ClInclude Include="spirv_compile.h" />
   </ItemGroup>
 </Project>

renderdoc/driver/shaders/spirv/spirv_common.cpp

@@ -29,42 +29,11 @@
 #include <utility>
 #include <vector>
 #include "3rdparty/glslang/SPIRV/spirv.hpp"
+#include "api/replay/renderdoc_replay.h"
 
 using std::string;
 using std::vector;
 
-enum class SPIRVShaderStage
-{
-  Vertex,
-  TessControl,
-  TessEvaluation,
-  Geometry,
-  Fragment,
-  Compute,
-  Invalid,
-};
-
-enum class SPIRVSourceLanguage
-{
-  Unknown,
-  OpenGLGLSL,
-  VulkanGLSL,
-  VulkanHLSL,
-};
-
-struct SPIRVCompilationSettings
-{
-  SPIRVCompilationSettings(SPIRVSourceLanguage l, SPIRVShaderStage s) : stage(s), lang(l) {}
-  SPIRVCompilationSettings() = default;
-
-  SPIRVShaderStage stage = SPIRVShaderStage::Invalid;
-  SPIRVSourceLanguage lang = SPIRVSourceLanguage::Unknown;
-  std::string entryPoint;
-};
-
-void InitSPIRVCompiler();
-void ShutdownSPIRVCompiler();
-
 struct SPVInstruction;
 
 enum class ShaderStage : uint32_t;
@@ -105,6 +74,7 @@ struct SPVModule
   spv::SourceLanguage sourceLang;
   uint32_t sourceVer;
 
+  ShaderCompileFlags compileFlags;
   vector<std::pair<string, string>> sourceFiles;
 
   vector<string> extensions;
@@ -132,6 +102,4 @@ struct SPVModule
                       ShaderBindpointMapping &mapping, SPIRVPatchData &patchData);
 };
 
-string CompileSPIRV(const SPIRVCompilationSettings &settings, const vector<string> &sources,
-                    vector<uint32_t> &spirv);
 void ParseSPIRV(uint32_t *spirv, size_t spirvLength, SPVModule &module);