SuperResolutionFSR: Fix crash in OpenGL backend

Author: MikhailGorobets

Graphics/SuperResolution/CMakeLists.txt

@@ -73,6 +73,7 @@ if(DILIGENT_FSR_SUPPORTED)
         ${CMAKE_CURRENT_SOURCE_DIR}/shaders/FSR_ContrastAdaptiveSharpening.fx
         ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fsr1/ffx_common_types.h
         ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fsr1/ffx_core.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fsr1/ffx_core_cpu.h
         ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fsr1/ffx_core_glsl.h
         ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fsr1/ffx_core_gpu_common.h
         ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fsr1/ffx_core_gpu_common_half.h

Graphics/SuperResolution/shaders/FSRStructures.fxh

@@ -26,7 +26,7 @@ struct FSRAttribs
 };
 
 #ifdef CHECK_STRUCT_ALIGNMENT
-CHECK_STRUCT_ALIGNMENT(FSRAttribs);
+CHECK_STRUCT_ALIGNMENT(FSRAttribs)
 #endif
 
 

Graphics/SuperResolution/shaders/FSR_FullQuad.fx

@@ -1,14 +1,9 @@
-struct FSR_VSOutput
-{
-    float4 Position : SV_Position;
-};
-
-void FSR_FullQuadVS(in uint VertexId : SV_VertexID, out FSR_VSOutput VSOut)
+float4 FSR_FullQuadVS(in uint VertexId : SV_VertexID) : SV_Position
 {
     float2 PosXY[3];
     PosXY[0] = float2(-1.0, -1.0);
     PosXY[1] = float2(-1.0, +3.0);
     PosXY[2] = float2(+3.0, -1.0);
 
-    VSOut.Position = float4(PosXY[VertexId % 3u], 0.0, 1.0);
+    return float4(PosXY[VertexId % 3u], 0.0, 1.0);
 }

Graphics/SuperResolution/src/FSRProvider.cpp

@@ -248,13 +248,14 @@ FSRProvider::FSRProvider(IRenderDevice* pDevice) :
 
     auto CreateShader = [&](SHADER_TYPE Type, const char* Name, const char* EntryPoint, const char* FilePath, const ShaderMacroArray& ShaderMacros = {}) {
         ShaderCreateInfo ShaderCI;
-        ShaderCI.SourceLanguage             = SHADER_SOURCE_LANGUAGE_HLSL;
-        ShaderCI.Desc.ShaderType            = Type;
-        ShaderCI.Desc.Name                  = Name;
-        ShaderCI.EntryPoint                 = EntryPoint;
-        ShaderCI.FilePath                   = FilePath;
-        ShaderCI.Macros                     = ShaderMacros;
-        ShaderCI.pShaderSourceStreamFactory = m_pShaderSourceFactory;
+        ShaderCI.SourceLanguage                  = SHADER_SOURCE_LANGUAGE_HLSL;
+        ShaderCI.Desc.ShaderType                 = Type;
+        ShaderCI.Desc.Name                       = Name;
+        ShaderCI.Desc.UseCombinedTextureSamplers = true;
+        ShaderCI.EntryPoint                      = EntryPoint;
+        ShaderCI.FilePath                        = FilePath;
+        ShaderCI.Macros                          = ShaderMacros;
+        ShaderCI.pShaderSourceStreamFactory      = m_pShaderSourceFactory;
         RefCntAutoPtr<IShader> pShader;
         pDevice->CreateShader(ShaderCI, &pShader);
         return pShader;
@@ -278,7 +279,7 @@ FSRProvider::PipelineData& FSRProvider::GetOrCreatePipelines(TEXTURE_FORMAT Outp
         ResourceLayout
             .SetDefaultVariableType(SHADER_RESOURCE_VARIABLE_TYPE_DYNAMIC)
             .AddVariable(SHADER_TYPE_PIXEL, "cbFSRAttribs", SHADER_RESOURCE_VARIABLE_TYPE_MUTABLE)
-            .AddImmutableSampler(SHADER_TYPE_PIXEL, "g_TextureSource_sampler", Sam_PointClamp);
+            .AddImmutableSampler(SHADER_TYPE_PIXEL, "g_TextureSource", Sam_PointClamp);
 
         GraphicsPipelineStateCreateInfoX PSOCreateInfo{"FSR::EASU PSO"};
         PSOCreateInfo