GLSL Utils: made parameters of BuildGLSLSourceString more flexible

Author: TheMostDiligent

Graphics/Archiver/src/Archiver_GL.cpp

@@ -179,8 +179,10 @@ struct CompiledShaderGL final : SerializedShaderImpl::CompiledShader
         const std::string GLSLSourceString = BuildGLSLSourceString(
             {
                 ShaderCI,
-                GLShaderCI.DeviceInfo,
                 GLShaderCI.AdapterInfo,
+                GLShaderCI.DeviceInfo.Features,
+                GLShaderCI.DeviceInfo.Type,
+                GLShaderCI.DeviceInfo.MaxShaderVersion,
                 TargetGLSLCompiler::glslang,
                 GLProps.ZeroToOneClipZ, // Note that this is not the same as GLShaderCI.DeviceInfo.NDC.MinZ == 0
             });

Graphics/GraphicsEngineOpenGL/src/ShaderGLImpl.cpp

@@ -72,7 +72,16 @@ ShaderGLImpl::ShaderGLImpl(IReferenceCounters*     pRefCounters,
 
     // Build the full source code string that will contain GLSL version declaration,
     // platform definitions, user-provided shader macros, etc.
-    m_GLSLSourceString = BuildGLSLSourceString({ShaderCI, DeviceInfo, AdapterInfo, TargetGLSLCompiler::driver, DeviceInfo.NDC.MinZ == 0});
+    m_GLSLSourceString = BuildGLSLSourceString(
+        {
+            ShaderCI,
+            AdapterInfo,
+            DeviceInfo.Features,
+            DeviceInfo.Type,
+            DeviceInfo.MaxShaderVersion,
+            TargetGLSLCompiler::driver,
+            DeviceInfo.NDC.MinZ == 0,
+        });
 
     const SHADER_SOURCE_LANGUAGE SourceLang = ParseShaderSourceLanguageDefinition(m_GLSLSourceString);
     if (SourceLang != SHADER_SOURCE_LANGUAGE_DEFAULT)

Graphics/GraphicsEngineVulkan/src/ShaderVkImpl.cpp

@@ -118,7 +118,17 @@ std::vector<uint32_t> CompileShaderGLSLang(const ShaderCreateInfo&         Shade
         {
             // Build the full source code string that will contain GLSL version declaration,
             // platform definitions, user-provided shader macros, etc.
-            GLSLSourceString        = BuildGLSLSourceString({ShaderCI, VkShaderCI.DeviceInfo, VkShaderCI.AdapterInfo, TargetGLSLCompiler::glslang, true, VulkanDefine});
+            GLSLSourceString = BuildGLSLSourceString(
+                {
+                    ShaderCI,
+                    VkShaderCI.AdapterInfo,
+                    VkShaderCI.DeviceInfo.Features,
+                    VkShaderCI.DeviceInfo.Type,
+                    VkShaderCI.DeviceInfo.MaxShaderVersion,
+                    TargetGLSLCompiler::glslang,
+                    true, // ZeroToOneClipZ
+                    VulkanDefine,
+                });
             SourceData.Source       = GLSLSourceString.c_str();
             SourceData.SourceLength = StaticCast<Uint32>(GLSLSourceString.length());
         }

Graphics/ShaderTools/include/GLSLUtils.hpp

@@ -53,13 +53,15 @@ struct IHLSL2GLSLConversionStream;
 // new stream will be created and warning message will be displayed.
 struct BuildGLSLSourceStringAttribs
 {
-    const ShaderCreateInfo&      ShaderCI;
-    const RenderDeviceInfo&      DeviceInfo;
-    const GraphicsAdapterInfo&   AdapterInfo;
-    TargetGLSLCompiler           TargetCompiler;
-    bool                         ZeroToOneClipZ     = false;
-    const char*                  ExtraDefinitions   = nullptr;
-    IHLSL2GLSLConversionStream** ppConversionStream = nullptr;
+    const ShaderCreateInfo&       ShaderCI;
+    const GraphicsAdapterInfo&    AdapterInfo;
+    const DeviceFeatures&         Features;
+    RENDER_DEVICE_TYPE            DeviceType         = RENDER_DEVICE_TYPE_UNDEFINED;
+    RenderDeviceShaderVersionInfo MaxShaderVersion   = {};
+    TargetGLSLCompiler            TargetCompiler     = TargetGLSLCompiler::glslang;
+    bool                          ZeroToOneClipZ     = false;
+    const char*                   ExtraDefinitions   = nullptr;
+    IHLSL2GLSLConversionStream**  ppConversionStream = nullptr;
 };
 
 String BuildGLSLSourceString(const BuildGLSLSourceStringAttribs& Attribs) noexcept(false);

Graphics/ShaderTools/src/GLSLUtils.cpp

@@ -269,7 +269,7 @@ String BuildGLSLSourceString(const BuildGLSLSourceStringAttribs& Attribs) noexce
 
     ShaderVersion GLSLVer;
     bool          IsES = false;
-    GetGLSLVersion(ShaderCI, Attribs.TargetCompiler, Attribs.DeviceInfo.Type, Attribs.DeviceInfo.MaxShaderVersion, GLSLVer, IsES);
+    GetGLSLVersion(ShaderCI, Attribs.TargetCompiler, Attribs.DeviceType, Attribs.MaxShaderVersion, GLSLVer, IsES);
 
     const auto ShaderType = ShaderCI.Desc.ShaderType;
 
@@ -283,7 +283,7 @@ String BuildGLSLSourceString(const BuildGLSLSourceStringAttribs& Attribs) noexce
     // All extensions must go right after the version directive
     if (IsES)
     {
-        AppendGLESExtensions(ShaderType, Attribs.DeviceInfo.Features, Attribs.AdapterInfo.Texture, GLSLVer, GLSLSource);
+        AppendGLESExtensions(ShaderType, Attribs.Features, Attribs.AdapterInfo.Texture, GLSLVer, GLSLSource);
     }
 
     if (ShaderCI.GLSLExtensions != nullptr && ShaderCI.GLSLExtensions[0] != '\0')
@@ -318,7 +318,7 @@ String BuildGLSLSourceString(const BuildGLSLSourceStringAttribs& Attribs) noexce
 
     if (IsES)
     {
-        AppendPrecisionQualifiers(Attribs.DeviceInfo.Features, Attribs.AdapterInfo.Texture, GLSLVer, GLSLSource);
+        AppendPrecisionQualifiers(Attribs.Features, Attribs.AdapterInfo.Texture, GLSLVer, GLSLSource);
     }
 
     // It would be much more convenient to use row_major matrices.
@@ -331,7 +331,7 @@ String BuildGLSLSourceString(const BuildGLSLSourceStringAttribs& Attribs) noexce
 
     AppendShaderMacros(GLSLSource, ShaderCI.Macros);
 
-    if (IsES && GLSLVer == ShaderVersion{3, 0} && Attribs.DeviceInfo.Features.SeparablePrograms && ShaderType == SHADER_TYPE_VERTEX)
+    if (IsES && GLSLVer == ShaderVersion{3, 0} && Attribs.Features.SeparablePrograms && ShaderType == SHADER_TYPE_VERTEX)
     {
         // From https://www.khronos.org/registry/OpenGL/extensions/EXT/EXT_separate_shader_objects.gles.txt:
         //
@@ -386,7 +386,7 @@ String BuildGLSLSourceString(const BuildGLSLSourceStringAttribs& Attribs) noexce
         // all shader stages.
         // https://www.khronos.org/registry/OpenGL/extensions/ARB/ARB_separate_shader_objects.txt
         // (search for "Input Layout Qualifiers" and "Output Layout Qualifiers").
-        ConvertAttribs.UseInOutLocationQualifiers = Attribs.DeviceInfo.Features.SeparablePrograms;
+        ConvertAttribs.UseInOutLocationQualifiers = Attribs.Features.SeparablePrograms;
         auto ConvertedSource                      = Converter.Convert(ConvertAttribs);
         if (ConvertedSource.empty())
         {