Needle Shader updates (#49)

* Fixed terminator logic in global shader variable class

* Updated Shader Compute buffer to be UAVs

* Unified UAV and Texture structure

Author: Justin113D

Source/SharpNeedle/Framework/HedgehogEngine/Needle/Shader/ShaderGlobalVariables.cs

@@ -7,7 +7,7 @@ public class ShaderGlobalVariables : IBinarySerializable
 {
     public bool IncludeTerminator { get; set; }
 
-    public List<Texture> Textures { get; set; } = [];
+    public List<Resource> Textures { get; set; } = [];
 
     public List<Sampler> Samplers { get; set; } = [];
 
@@ -19,7 +19,7 @@ public class ShaderGlobalVariables : IBinarySerializable
 
     public List<ConstantBufferField> CBFloats { get; set; } = [];
 
-    public List<ComputeBuffer> ComputeBuffers { get; set; } = [];
+    public List<Resource> UnorderedAccessViews { get; set; } = [];
 
 
     public void Read(BinaryObjectReader reader)
@@ -30,14 +30,14 @@ public void Read(BinaryObjectReader reader)
         CBBooleans = [];
         CBIntegers = [];
         CBFloats = [];
-        ComputeBuffers = [];
+        UnorderedAccessViews = [];
 
         long start = reader.Position;
         int size = reader.ReadInt32();
         long end = start + size;
 
         // In games before SXSG, the lists seem to terminate
-        // on the type "9", aka ComputeBuffer. This is easily
+        // on the type "9", aka UAVs. This is easily
         // checkable by comparing pos + 4 to the end
 
         while (reader.Position + 4 < end)
@@ -56,7 +56,7 @@ public void Read(BinaryObjectReader reader)
                     case VariantVariableType.Float:
                         throw new NotImplementedException("Not implemented yet (if this occured with a vanilla file, please open a github issue for it!!!)");
                     case VariantVariableType.Texture:
-                        Textures.Add(reader.ReadObject<Texture>());
+                        Textures.Add(reader.ReadObject<Resource>());
                         break;
                     case VariantVariableType.Sampler:
                         Samplers.Add(reader.ReadObject<Sampler>());
@@ -73,8 +73,8 @@ public void Read(BinaryObjectReader reader)
                     case VariantVariableType.CBFloat:
                         CBFloats.Add(reader.ReadObject<ConstantBufferField>());
                         break;
-                    case VariantVariableType.ComputeBuffer:
-                        ComputeBuffers.Add(reader.ReadObject<ComputeBuffer>());
+                    case VariantVariableType.UnorderedAccessView:
+                        UnorderedAccessViews.Add(reader.ReadObject<Resource>());
                         break;
                     default:
                         throw new InvalidDataException("Unknown variable type!");
@@ -123,12 +123,15 @@ void WriteArray<T>(List<T> list, VariantVariableType type) where T : IBinarySeri
         WriteArray(CBBooleans, VariantVariableType.CBBoolean);
         WriteArray(CBIntegers, VariantVariableType.CBInteger);
         WriteArray(CBFloats, VariantVariableType.CBFloat);
-        WriteArray(ComputeBuffers, VariantVariableType.ComputeBuffer);
 
         if (IncludeTerminator)
         {
             writer.WriteUInt32(9);
         }
+        else
+        {
+            WriteArray(UnorderedAccessViews, VariantVariableType.UnorderedAccessView);
+        }
 
         long endPosition = writer.Position;
         using (SeekToken temp = writer.At())

Source/SharpNeedle/Framework/HedgehogEngine/Needle/Shader/Variable/ComputeBuffer.cs

@@ -1,24 +1,25 @@
 namespace SharpNeedle.Framework.HedgehogEngine.Needle.Shader.Variable;
 
-public enum TextureType : int
+public enum ResourceType : int
 {
     Buffer = 0,
     Texture1D = 1,
     Texture1DArray = 2,
     Texture2D = 3,
     Texture2DArray = 4,
-    // 5,6 missing?
+    Texture2DMultisampled = 5,
+    Texture2DMultisampledArray = 6,
     Texture3D = 7,
     TextureCube = 8,
     TextureCubeArray = 9,
-    RWTexture = 10
+    BufferExtended = 10
 }
 
-public struct Texture : IBinarySerializable
+public struct Resource : IBinarySerializable
 {
     private string? _name;
 
-    public TextureType Type { get; set; }
+    public ResourceType Type { get; set; }
 
     public int ID { get; set; }
 
@@ -30,7 +31,7 @@ public string Name
 
     public void Read(BinaryObjectReader reader)
     {
-        Type = (TextureType)reader.ReadInt32();
+        Type = (ResourceType)reader.ReadInt32();
         ID = reader.ReadInt32();
         Name = reader.ReadString(StringBinaryFormat.NullTerminated);
         reader.Align(4);

…Engine/Needle/Shader/Variable/Texture.cs …ngine/Needle/Shader/Variable/Resource.csSource/SharpNeedle/Framework/HedgehogEngine/Needle/Shader/Variable/Texture.cs renamed to Source/SharpNeedle/Framework/HedgehogEngine/Needle/Shader/Variable/Resource.cs Source/SharpNeedle/Framework/HedgehogEngine/Needle/Shader/Variable/Texture.cs renamed to Source/SharpNeedle/Framework/HedgehogEngine/Needle/Shader/Variable/Resource.cs

@@ -17,5 +17,5 @@ public enum VariantVariableType : int
     CBFloat = 8,
 
     // Only used in compute buffers in SXSG, so likely just "compute buffer"
-    ComputeBuffer = 9
+    UnorderedAccessView = 9
 }