various tweaks to get vulkan to work with stride streaming terrain

johang88 · johang88 · commit a8eb1556a44b · 2025-06-12T14:16:02.000+02:00
diff --git a/sources/engine/Stride.Graphics/Vulkan/Buffer.Vulkan.cs b/sources/engine/Stride.Graphics/Vulkan/Buffer.Vulkan.cs
@@ -126,6 +126,18 @@ public unsafe void Recreate(IntPtr dataPointer)
                     NativePipelineStageMask |= VkPipelineStageFlags.VertexShader | VkPipelineStageFlags.FragmentShader;
                 }
 
+                if ((ViewFlags & BufferFlags.StructuredBuffer) != 0)
+                {
+                    createInfo.usage |= VkBufferUsageFlags.StorageBuffer;
+                    NativeAccessMask |= VkAccessFlags.UniformRead;
+                    NativePipelineStageMask |= VkPipelineStageFlags.VertexShader | VkPipelineStageFlags.FragmentShader;
+
+                    if ((ViewFlags & BufferFlags.UnorderedAccess) != 0)
+                    {
+                        NativeAccessMask |= VkAccessFlags.ShaderWrite;
+                    }
+                }
+
                 if ((ViewFlags & BufferFlags.ShaderResource) != 0)
                 {
                     createInfo.usage |= VkBufferUsageFlags.UniformTexelBuffer;
diff --git a/sources/engine/Stride.Graphics/Vulkan/CommandList.Vulkan.cs b/sources/engine/Stride.Graphics/Vulkan/CommandList.Vulkan.cs
@@ -373,6 +373,12 @@ private unsafe void BindDescriptorSets()
                         write->pTexelBufferView = &descriptorData->BufferView;
                         break;
 
+                    case VkDescriptorType.StorageBuffer:
+                        buffer = heapObject.Value as Buffer;
+                        descriptorData->BufferInfo = new VkDescriptorBufferInfo { buffer = buffer?.NativeBuffer ?? VkBuffer.Null, offset = (ulong)heapObject.Offset, range = (ulong)(buffer?.SizeInBytes ?? 0)};
+                        write->pBufferInfo = &descriptorData->BufferInfo;
+                        break;
+
                     default:
                         throw new InvalidOperationException();
                 }
@@ -1321,10 +1327,11 @@ public unsafe MappedResource MapSubresource(GraphicsResource resource, int subRe
                     throw new InvalidOperationException();
             }
 
-            if (mapMode == MapMode.WriteDiscard)
-            {
-                throw new InvalidOperationException("Can't use WriteDiscard on Graphics API that doesn't support renaming");
-            }
+            // Maybe it just works if removed?
+            //if (mapMode == MapMode.WriteDiscard)
+            //{
+            //    throw new InvalidOperationException("Can't use WriteDiscard on Graphics API that doesn't support renaming");
+            //}
 
             if (mapMode != MapMode.WriteNoOverwrite && mapMode != MapMode.Write)
             {
diff --git a/sources/engine/Stride.Graphics/Vulkan/GraphicsDevice.Vulkan.cs b/sources/engine/Stride.Graphics/Vulkan/GraphicsDevice.Vulkan.cs
@@ -57,7 +57,7 @@ public partial class GraphicsDevice
             64, // UniformTexelBuffer
             64, // StorageTexelBuffer
             512, // UniformBuffer
-            0, // StorageBuffer
+            64, // StorageBuffer
             0, // UniformBufferDynamic
             0, // StorageBufferDynamic
             0 // InputAttachment
diff --git a/sources/engine/Stride.Graphics/Vulkan/Texture.Vulkan.cs b/sources/engine/Stride.Graphics/Vulkan/Texture.Vulkan.cs
@@ -487,7 +487,7 @@ private unsafe VkImageView GetImageView(ViewType viewType, int arrayOrDepthSlice
             if (!IsShaderResource)
                 return VkImageView.Null;
 
-            if (viewType == ViewType.MipBand)
+            if (viewType == ViewType.MipBand && IsRenderTarget)
                 throw new NotSupportedException("ViewSlice.MipBand is not supported for render targets");
 
             GetViewSliceBounds(viewType, ref arrayOrDepthSlice, ref mipIndex, out var arrayOrDepthCount, out var mipCount);
diff --git a/sources/engine/Stride.Graphics/Vulkan/VulkanConvertExtensions.cs b/sources/engine/Stride.Graphics/Vulkan/VulkanConvertExtensions.cs
@@ -276,6 +276,15 @@ public static void ConvertPixelFormat(PixelFormat inputFormat, out VkFormat form
                     pixelSize = 4;
                     break;
 
+                case PixelFormat.R10G10B10A2_UInt:
+                    format = VkFormat.A2R10G10B10UIntPack32;
+                    pixelSize = 4;
+                    break;
+                case PixelFormat.R10G10B10A2_UNorm:
+                    format = VkFormat.A2R10G10B10UNormPack32;
+                    pixelSize = 4;
+                    break;
+
                 case PixelFormat.R16_Float:
                     format = VkFormat.R16Sfloat;
                     pixelSize = 2;
@@ -396,6 +405,10 @@ public static void ConvertPixelFormat(PixelFormat inputFormat, out VkFormat form
                     format = VkFormat.D32Sfloat;
                     pixelSize = 4;
                     break;
+                case PixelFormat.D32_Float_S8X24_UInt:
+                    format = VkFormat.D32SFloatS8UInt;
+                    pixelSize = 8;
+                    break;
 
                 case PixelFormat.ETC1:
                 case PixelFormat.ETC2_RGB: // ETC1 upper compatible
@@ -554,6 +567,8 @@ public static VkDescriptorType ConvertDescriptorType(EffectParameterClass @class
 
                         case EffectParameterType.Buffer:
                             return VkDescriptorType.UniformTexelBuffer;
+                        case EffectParameterType.StructuredBuffer:
+                            return VkDescriptorType.StorageBuffer;
 
                         default:
                             throw new NotImplementedException();
@@ -578,6 +593,7 @@ public static VkDescriptorType ConvertDescriptorType(EffectParameterClass @class
                             return VkDescriptorType.StorageImage;
 
                         case EffectParameterType.Buffer:
+                        case EffectParameterType.StructuredBuffer:
                             return VkDescriptorType.StorageBuffer;
 
                         default:
diff --git a/sources/engine/Stride.Shaders.Compiler/OpenGL/ShaderCompiler.cs b/sources/engine/Stride.Shaders.Compiler/OpenGL/ShaderCompiler.cs
@@ -344,6 +344,12 @@ private string Compile(string shaderSource, string entryPoint, ShaderStage stage
                             layoutQualifier.Layouts.Add(new LayoutKeyValue("binding", layoutBindingIndex + 1));
 
                             resourceBindings.Add(bindings[layoutBindingIndex].Key.KeyName, layoutBindingIndex + 1);
+
+                            // Buffer should not be marked with uniform, this probably should not be here but it works and does not mess anything up.
+                            if (variable.Type.Qualifiers.Contains(StorageQualifier.Buffer))
+                            {
+                                variable.Qualifiers.Values.Remove(StorageQualifier.Uniform);
+                            }
                         }
                     }
                 }
diff --git a/sources/shaders/Stride.Core.Shaders/Ast/StorageQualifier.cs b/sources/shaders/Stride.Core.Shaders/Ast/StorageQualifier.cs
@@ -21,6 +21,11 @@ public partial class StorageQualifier
         /// </summary>
         public static readonly Qualifier Uniform = new Qualifier("uniform");
 
+        /// <summary>
+        ///   Uniform qualifier.
+        /// </summary>
+        public static readonly Qualifier Buffer = new Qualifier("buffer");
+
         /// <summary>
         ///   Shared qualifier.
         /// </summary>
diff --git a/sources/shaders/Stride.Core.Shaders/Convertor/HlslToGlslConvertor.cs b/sources/shaders/Stride.Core.Shaders/Convertor/HlslToGlslConvertor.cs
@@ -101,6 +101,8 @@ public class HlslToGlslConvertor : ShaderRewriter
 
         private int breakIndex = 0;
 
+        private int structedBufferCounter = 0;
+
         #endregion
 
         #region Constructors and Destructors
@@ -243,7 +245,7 @@ public HlslToGlslConvertor(GlslShaderPlatform shaderPlatform, int shaderVersion,
                 { "GroupMemoryBarrier", "groupMemoryBarrier" },
                 //{ "D3DCOLORtoUBYTE4", "ivec4" }, 
             };
-}
+        }
 
         #endregion
 
@@ -1093,7 +1095,7 @@ protected Statement VisitStatementAsMemberInvocation(Statement statement, Method
             if (memberReferenceExpression.Member == "GetDimensions")
             {
                 var textureRef = memberReferenceExpression.Target as VariableReferenceExpression;
-                var variableTexture = this.FindGlobalVariableFromExpression(textureRef);
+                var variableTexture = FindParameterOrGlobalVariableFromExpression(textureRef);
 
                 if (variableTexture == null)
                 {
@@ -1233,6 +1235,7 @@ protected Statement VisitStatementAsAssignExpression(Statement statement, Assign
                             "RWBuffer" => ScalarType.Int,
                             "RWTexture2D" => VectorType.Int2,
                             "RWTexture3D" => VectorType.Int3,
+                            "RWTexture2DArray" => VectorType.Int3,
                             _ => throw new NotSupportedException($"imageStore not supported for {variable.Name.Text}")
                         };
 
@@ -1307,6 +1310,24 @@ public override Node Visit(MethodInvocationExpression methodInvocationExpression
                     return new ParenthesizedExpression(new BinaryExpression(BinaryOperator.Multiply, leftParameter, rightParameter));
                 }
 
+                if (methodName == "rcp")
+                {
+                    var rightParameter = ConvertToSafeExpressionForBinary(methodInvocationExpression.Arguments[0]);
+                    return new ParenthesizedExpression(new BinaryExpression(BinaryOperator.Divide, new LiteralExpression(1.0f), rightParameter));
+                }
+
+                if (methodName == "mad")
+                {
+                    var firstParameter = ConvertToSafeExpressionForBinary(methodInvocationExpression.Arguments[0]);
+                    var secondParameter = ConvertToSafeExpressionForBinary(methodInvocationExpression.Arguments[1]);
+                    var thirdParameter = ConvertToSafeExpressionForBinary(methodInvocationExpression.Arguments[2]);
+
+                    var multiply = new BinaryExpression(BinaryOperator.Multiply, firstParameter, secondParameter);
+                    var add = new BinaryExpression(BinaryOperator.Plus, multiply, thirdParameter);
+
+                    return new ParenthesizedExpression(add);
+                }
+
                 if (methodName == "lit")
                 {
                     // http://msdn.microsoft.com/en-us/library/bb509619%28v=vs.85%29.aspx
@@ -1389,7 +1410,7 @@ public override Node Visit(MethodInvocationExpression methodInvocationExpression
             var memberReferenceExpression = methodInvocationExpression.Target as MemberReferenceExpression;
             if (memberReferenceExpression != null)
             {
-                var targetVariable = FindGlobalVariableFromExpression(memberReferenceExpression.Target);
+                var targetVariable = FindParameterOrGlobalVariableFromExpression(memberReferenceExpression.Target);
                 if (targetVariable == null)
                 {
                     parserResult.Error("Unable to find target variable for expression [{0}]", methodInvocationExpression.Span, methodInvocationExpression);
@@ -1428,7 +1449,7 @@ public override Node Visit(MethodInvocationExpression methodInvocationExpression
                             // texture.Load() doesn't require a sampler
                             if (!isLoad)
                             {
-                                sampler = this.FindGlobalVariableFromExpression(methodInvocationExpression.Arguments[0]);
+                                sampler = FindParameterOrGlobalVariableFromExpression(methodInvocationExpression.Arguments[0]);
                             }
                             var glslSampler = GetGLSampler(sampler, targetVariable, true);
 
@@ -2477,6 +2498,7 @@ public override Node Visit(IndexerExpression indexerExpression)
                         "RWBuffer" => ScalarType.Int,
                         "RWTexture2D" => VectorType.Int2,
                         "RWTexture3D" => VectorType.Int3,
+                        "RWTexture2DArray" => VectorType.Int3,
                         _ => throw new NotSupportedException($"imageLoad not supported for {variable.Name.Text}")
                     };
 
@@ -2485,6 +2507,16 @@ public override Node Visit(IndexerExpression indexerExpression)
 
                     return new MethodInvocationExpression("imageLoad", indexerExpression.Target, new MethodInvocationExpression(new TypeReferenceExpression(indexerType), indexerExpression.Index));
                 }
+                else if (classType != null && (classType.Name.Text.StartsWith("StructuredBuffer") || classType.Name.Text.StartsWith("RWStructuredBuffer")))
+                {
+                    // Convert to TargetName.Buffer[index]
+                    indexerExpression.Target = (Expression)VisitDynamic(indexerExpression.Target);
+                    indexerExpression.Index = (Expression)VisitDynamic(indexerExpression.Index);
+
+                    indexerExpression.Target = new MemberReferenceExpression(indexerExpression.Target, "Buffer");
+
+                    return indexerExpression;
+                }
             }
 
             base.Visit(indexerExpression);
@@ -3683,6 +3715,24 @@ private void FlattenArrayCreationExpression(ArrayInitializerExpression from, Lis
             }
         }
 
+        private Variable FindParameterOrGlobalVariableFromExpression(Expression expression)
+        {
+            var variableRef = expression as VariableReferenceExpression;
+            if (variableRef != null)
+            {
+                // Check if present in parameter list first.
+                var parameter = CurrentFunction.Parameters.FirstOrDefault(x => x is Stride.Core.Shaders.Ast.Parameter param && param.Name == variableRef.Name);
+                if (parameter != null)
+                {
+                    return parameter;
+                }
+
+                return FindGlobalVariableFromExpression(expression);
+            }
+
+            return null;
+        }
+
         private Variable FindGlobalVariableFromExpression(Expression expression)
         {
             var variableRef = expression as VariableReferenceExpression;
@@ -3695,7 +3745,7 @@ private Variable FindGlobalVariableFromExpression(Expression expression)
                     // If a variable has an initial value, find the global variable
                     if (!shader.Declarations.Contains(variable) && variable.InitialValue != null)
                     {
-                        return this.FindGlobalVariableFromExpression(variable.InitialValue);
+                        return FindGlobalVariableFromExpression(variable.InitialValue);
                     }
 
                     // Is this a global variable?
@@ -4290,6 +4340,29 @@ private TypeBase ConvertType(TypeBase targetType)
         {
             var targetTypeName = targetType.Name.Text;
 
+            if ((targetTypeName.Equals("StructuredBuffer", StringComparison.Ordinal) || targetTypeName.Equals("RWStructuredBuffer", StringComparison.Ordinal)) 
+                && targetType is IGenerics structuredBufferGenericType)
+            {
+                // Convert to "readonly buffer Name { GenericType Buffer; };
+                var structuredBufferType = structuredBufferGenericType.GenericArguments[0];
+
+                var name = $"Stride_Internal_{structuredBufferType.Name.Text}_{++structedBufferCounter}";
+                var bufferType = new Ast.Glsl.InterfaceType(name)
+                {
+                    Qualifiers = Qualifier.None, // Assign buffer qualifier later as we want the ordering to be correct (readonly should come first)
+                    Fields = [new Variable(new ArrayType(structuredBufferType, new EmptyExpression()), "Buffer")]
+                };
+
+                if (targetTypeName.Equals("StructuredBuffer", StringComparison.Ordinal))
+                {
+                    bufferType.Qualifiers |= StorageQualifier.ReadOnly;
+                }
+
+                bufferType.Qualifiers |= StorageQualifier.Buffer;
+
+                return bufferType;
+            }
+
             if (targetTypeName.StartsWith("Texture", StringComparison.Ordinal))
                 targetTypeName = "texture" + targetTypeName["Texture".Length..];
             else if (targetTypeName.StartsWith("RWTexture", StringComparison.Ordinal))
@@ -4584,18 +4657,32 @@ private void ReorderVariableQualifiers()
             }
         }
 
+        /// <summary>
+        /// Apply std140 layout to all constant and storage buffers.
+        /// </summary>
         private void ApplyStd140Layout()
         {
             foreach (var constantBuffer in shader.Declarations.OfType<ConstantBuffer>())
             {
-                var layoutQualifier = constantBuffer.Qualifiers.OfType<Stride.Core.Shaders.Ast.Glsl.LayoutQualifier>().FirstOrDefault();
+                var layoutQualifier = constantBuffer.Qualifiers.OfType<LayoutQualifier>().FirstOrDefault();
                 if (layoutQualifier == null)
                 {
-                    layoutQualifier = new Stride.Core.Shaders.Ast.Glsl.LayoutQualifier();
+                    layoutQualifier = new LayoutQualifier();
                     constantBuffer.Qualifiers |= layoutQualifier;
                 }
                 layoutQualifier.Layouts.Add(new LayoutKeyValue("std140"));
             }
+
+            foreach (var variable in shader.Declarations.OfType<Variable>().Where(x => x.Type.Qualifiers.Contains(StorageQualifier.Buffer)))
+            {
+                var layoutQualifier = variable.Qualifiers.OfType<LayoutQualifier>().FirstOrDefault();
+                if (layoutQualifier == null)
+                {
+                    layoutQualifier = new LayoutQualifier();
+                    variable.Qualifiers |= layoutQualifier;
+                }
+                layoutQualifier.Layouts.Add(new LayoutKeyValue("std430")); // But this is not std140? You are very much correct.
+            }
         }
 
         private class StructMemberReference
diff --git a/sources/shaders/Stride.Core.Shaders/Convertor/SamplerMappingVisitor.cs b/sources/shaders/Stride.Core.Shaders/Convertor/SamplerMappingVisitor.cs
@@ -64,6 +64,36 @@ public override void Run(MethodDefinition methodEntry)
             }
         }
 
+        private Variable FindParameterOrGlobalVariable(Expression expression)
+        {
+            var variableRef = expression as VariableReferenceExpression;
+            if (variableRef != null)
+            {
+                // Check if present in parameter list first.
+                MethodDeclaration currentFunction = null;
+                for (var i = NodeStack.Count - 1; i >= 0; i--)
+                {
+                    if (NodeStack[i] is MethodDeclaration function)
+                    {
+                        currentFunction = function;
+                        break;
+                    }
+                }
+                if (currentFunction != null)
+                {
+                    var parameter = currentFunction.Parameters.FirstOrDefault(x => x is Stride.Core.Shaders.Ast.Parameter param && param.Name == variableRef.Name);
+                    if (parameter != null)
+                    {
+                        return parameter;
+                    }
+                }
+
+                return FindGlobalVariable(expression);
+            }
+
+            return null;
+        }
+
         private Variable FindGlobalVariable(Expression expression)
         {
             var variableRef = expression as VariableReferenceExpression;
@@ -108,7 +138,7 @@ public override Node Visit(MethodInvocationExpression methodInvocationExpression
             if (memberRef != null)
             {
                 // TODO handle Texture2D<float> 
-                var textureVariable = this.FindGlobalVariable(memberRef.Target);
+                var textureVariable = FindParameterOrGlobalVariable(memberRef.Target);
 
                 if (textureVariable != null)
                 {
diff --git a/sources/shared/Stride.NuGetResolver.Targets/Stride.NuGetResolver.Targets.projitems b/sources/shared/Stride.NuGetResolver.Targets/Stride.NuGetResolver.Targets.projitems
@@ -22,7 +22,7 @@
       <NuGetResolverModuleInitializerFile>$(IntermediateOutputPath)$(MSBuildProjectName).NuGetResolverEntryPoint$(DefaultLanguageSourceExtension)</NuGetResolverModuleInitializerFile>
       <NuGetResolverTargetFramework>$(TargetFramework)</NuGetResolverTargetFramework>
       <NuGetResolverTargetFramework Condition="'$(TargetPlatformVersion)' != '' and !$(TargetFramework.EndsWith(TargetPlatformVersion))">$(TargetFramework)$(TargetPlatformVersion)</NuGetResolverTargetFramework>
-	  <DefineConstants Condition="'$(StrideNuGetResolverUI)' == 'true'">STRIDE_NUGET_RESOLVER_UI;$(DefineConstants)</DefineConstants>
+      <DefineConstants Condition="'$(StrideNuGetResolverUI)' == 'true'">STRIDE_NUGET_RESOLVER_UI;$(DefineConstants)</DefineConstants>
     </PropertyGroup>
     <WriteLinesToFile File="$(NuGetResolverModuleInitializerFile)" Overwrite="true" Lines="$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)NuGetResolverModuleInitializer.cs').Replace('STRIDE_NUGET_RESOLVER_TARGET_FRAMEWORK','&quot;$(NuGetResolverTargetFramework)&quot;').Replace('STRIDE_NUGET_RESOLVER_PACKAGE_NAME','&quot;$(PackageId)&quot;').Replace('STRIDE_NUGET_RESOLVER_PACKAGE_VERSION','&quot;$(PackageVersion)&quot;').Replace('STRIDE_NUGET_RESOLVER_UI_AVALONIA_VERSION','&quot;$(AvaloniaVersion)&quot;'))" />
     <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -344,6 +344,12 @@ private string Compile(string shaderSource, string entryPoint, ShaderStage stage`
`344`	`344`	`layoutQualifier.Layouts.Add(new LayoutKeyValue("binding", layoutBindingIndex + 1));`
`345`	`345`
`346`	`346`	`resourceBindings.Add(bindings[layoutBindingIndex].Key.KeyName, layoutBindingIndex + 1);`
	`347`	`+`
	`348`	`+ // Buffer should not be marked with uniform, this probably should not be here but it works and does not mess anything up.`
	`349`	`+ if (variable.Type.Qualifiers.Contains(StorageQualifier.Buffer))`
	`350`	`+ {`
	`351`	`+ variable.Qualifiers.Values.Remove(StorageQualifier.Uniform);`
	`352`	`+ }`
`347`	`353`	`}`
`348`	`354`	`}`
`349`	`355`	`}`