Using GL_EXT_samplerless_texture_functions instead of NoSampler

Author: johang88

sources/engine/Stride.Graphics/Vulkan/CommandList.Vulkan.cs

@@ -460,7 +460,7 @@ public unsafe void ResourceBarrierTransition(GraphicsResource resource, Graphics
                     case GraphicsResourceState.PixelShaderResource:
                         texture.NativeLayout = VkImageLayout.ShaderReadOnlyOptimal;
                         texture.NativeAccessMask = VkAccessFlags.ShaderRead;
-                        texture.NativePipelineStageMask = VkPipelineStageFlags.FragmentShader | VkPipelineStageFlags.ComputeShader; // TODO: Not sure why I did this can probably double check ...
+                        texture.NativePipelineStageMask = VkPipelineStageFlags.FragmentShader | VkPipelineStageFlags.ComputeShader;
                         break;
                     case GraphicsResourceState.GenericRead:
                         texture.NativeLayout = VkImageLayout.General;

sources/engine/Stride.Shaders.Compiler/OpenGL/ShaderCompiler.cs

@@ -295,13 +295,6 @@ private string Compile(string shaderSource, string entryPoint, ShaderStage stage
 
                 if (shaderPlatform == GlslShaderPlatform.Vulkan)
                 {
-                    // Register "NoSampler", required by HLSL=>GLSL translation to support HLSL such as texture.Load().
-                    var noSampler = new EffectResourceBindingDescription { KeyInfo = { KeyName = "NoSampler" }, RawName = "NoSampler", Class = EffectParameterClass.Sampler, SlotStart = -1, SlotCount = 1 };
-                    reflection.ResourceBindings.Add(noSampler);
-
-                    // Make sure it's a point sampler as some texture formats do not support linear sampling which will result in validation errors.
-                    reflection.SamplerStates.Add(new EffectSamplerStateBinding("NoSampler", new SamplerStateDescription(TextureFilter.Point, TextureAddressMode.Clamp)));
-
                     // Defines the ordering of resource groups in Vulkan. This is mirrored in the PipelineState
                     var resourceGroups = reflection.ResourceBindings.Select(x => x.ResourceGroup ?? "Globals").Distinct().ToList();
 
@@ -370,6 +363,8 @@ private string Compile(string shaderSource, string entryPoint, ShaderStage stage
                 glslShaderWriter.Extensions.Add("GL_EXT_shader_image_load_formatted");
             }
 
+            glslShaderWriter.Extensions.Add("GL_EXT_samplerless_texture_functions");
+
             // Write shader
             glslShaderWriter.Visit(glslShader);
 

sources/shaders/Stride.Core.Shaders/Convertor/HlslToGlslConvertor.cs

@@ -2549,10 +2549,6 @@ private void GenerateSamplerMappingAndStrip()
                     AddGlobalDeclaration(textureSampler.Value);
                 }
             }
-            else
-            {
-                AddGlobalDeclaration(new Variable(StateType.SamplerState, "NoSampler"));
-            }
         }
 
         /// <summary>
@@ -3751,7 +3747,7 @@ private Expression GetGLSampler(Variable sampler, Variable texture, bool forceNu
                 }
                 else
                 {
-                    return new MethodInvocationExpression(new TypeReferenceExpression(glslSampler.Type), new VariableReferenceExpression(texture), new VariableReferenceExpression("NoSampler"));
+                    return new VariableReferenceExpression(texture);
                 }
             }