Support tex2D swizzle

BytecodeParser.cs

@@ -42,11 +42,7 @@ private static Dictionary<RegisterKey, HlslTreeNode> GetConstantOutputs(ShaderMo
                         RegisterType = RegisterType.Const,
                         ComponentIndex = i
                     };
-                    var shaderInput = new HlslShaderInput()
-                    {
-                        InputDecl = destinationKey,
-                        ComponentIndex = i
-                    };
+                    var shaderInput = new RegisterInputNode(destinationKey, i);
                     constantOutputs.Add(destinationKey, shaderInput);
                 }
             }
@@ -58,47 +54,43 @@ private void ParseInstruction(Instruction instruction)
         {
             if (instruction.HasDestination)
             {
-                IEnumerable<RegisterKey> destinationKeys = GetDestinationKeys(instruction);
-
-                if (instruction.Opcode == Opcode.Tex)
-                {
-                    var node1 = new HlslConstant(0);
-                    var node2 = new HlslConstant(1);
-                    var textureLoad = new TextureLoadOperation(node1, node2);
-                    foreach (RegisterKey destinationKey in destinationKeys)
-                    {
-                        _activeOutputs[destinationKey] = textureLoad;
-                    }
-                }
-                else
+                foreach (RegisterKey destinationKey in GetDestinationKeys(instruction))
                 {
-                    foreach (RegisterKey destinationKey in destinationKeys)
-                    {
-                        HlslTreeNode instructionTree = CreateInstructionTree(instruction, destinationKey);
-                        _activeOutputs[destinationKey] = instructionTree;
-                    }
+                    HlslTreeNode instructionTree = CreateInstructionTree(instruction, destinationKey);
+                    _activeOutputs[destinationKey] = instructionTree;
                 }
             }
         }
 
         private IEnumerable<RegisterKey> GetDestinationKeys(Instruction instruction)
         {
-            int destIndex = instruction.GetDestinationParamIndex();
-            var destRegisterType = instruction.GetParamRegisterType(destIndex);
-            int destRegisterNumber = instruction.GetParamRegisterNumber(destIndex);
-            int destMask = instruction.GetDestinationWriteMask();
+            int index = instruction.GetDestinationParamIndex();
+            RegisterType registerType = instruction.GetParamRegisterType(index);
+            int registerNumber = instruction.GetParamRegisterNumber(index);
 
-            for (int i = 0; i < 4; i++)
+            if (registerType == RegisterType.Sampler)
             {
-                if ((destMask & (1 << i)) == 0) continue;
-
                 yield return new RegisterKey()
                 {
-                    RegisterNumber = destRegisterNumber,
-                    RegisterType = destRegisterType,
-                    ComponentIndex = i
+                    RegisterNumber = registerNumber,
+                    RegisterType = RegisterType.Sampler
                 };
             }
+            else
+            {
+                int mask = instruction.GetDestinationWriteMask();
+                for (int component = 0; component < 4; component++)
+                {
+                    if ((mask & (1 << component)) == 0) continue;
+
+                    yield return new RegisterKey()
+                    {
+                        RegisterNumber = registerNumber,
+                        RegisterType = registerType,
+                        ComponentIndex = component
+                    };
+                }
+            }
         }
 
         private HlslTreeNode CreateInstructionTree(Instruction instruction, RegisterKey destinationKey)
@@ -109,11 +101,7 @@ private HlslTreeNode CreateInstructionTree(Instruction instruction, RegisterKey
             {
                 case Opcode.Dcl:
                     {
-                        var shaderInput = new HlslShaderInput()
-                        {
-                            InputDecl = destinationKey,
-                            ComponentIndex = componentIndex
-                        };
+                        var shaderInput = new RegisterInputNode(destinationKey, componentIndex);
                         return shaderInput;
                     }
                 case Opcode.Def:
@@ -126,7 +114,6 @@ private HlslTreeNode CreateInstructionTree(Instruction instruction, RegisterKey
                 case Opcode.Mad:
                 case Opcode.Mov:
                 case Opcode.Mul:
-                case Opcode.Tex:
                     {
                         HlslTreeNode[] inputs = GetInputs(instruction, componentIndex);
                         switch (instruction.Opcode)
@@ -141,12 +128,12 @@ private HlslTreeNode CreateInstructionTree(Instruction instruction, RegisterKey
                                 return new MultiplyOperation(inputs[0], inputs[1]);
                             case Opcode.Mad:
                                 return new MultiplyAddOperation(inputs[0], inputs[1], inputs[2]);
-                            case Opcode.Tex:
-                                return new TextureLoadOperation(inputs[0], inputs[1]);
                             default:
                                 throw new NotImplementedException();
                         }
                     }
+                case Opcode.Tex:
+                    return new TextureLoadOutputNode(GetTextureLoadInputs(instruction), componentIndex);
                 default:
                     throw new NotImplementedException($"{instruction.Opcode} not implemented");
             }
@@ -159,9 +146,8 @@ private HlslTreeNode[] GetInputs(Instruction instruction, int componentIndex)
             for (int i = 0; i < numInputs; i++)
             {
                 int inputParameterIndex = i + 1;
-                var inputKey = GetParamRegisterKey(instruction, inputParameterIndex, componentIndex);
-                HlslTreeNode input;
-                if (_activeOutputs.TryGetValue(inputKey, out input))
+                RegisterKey inputKey = GetParamRegisterKey(instruction, inputParameterIndex, componentIndex);
+                if (_activeOutputs.TryGetValue(inputKey, out HlslTreeNode input))
                 {
                     var modifier = instruction.GetSourceModifier(inputParameterIndex);
                     input = ApplyModifier(input, modifier);
@@ -175,6 +161,31 @@ private HlslTreeNode[] GetInputs(Instruction instruction, int componentIndex)
             return inputs;
         }
 
+        private IList<HlslTreeNode> GetTextureLoadInputs(Instruction instruction)
+        {
+            const int TextureCoordsIndex = 1;
+            const int SamplerIndex = 2;
+
+            var inputs = new List<HlslTreeNode>();
+
+            for (int component = 0; component < 4; component++)
+            {
+                RegisterKey textureCoordsKey = GetParamRegisterKey(instruction, TextureCoordsIndex, component);
+                if (_activeOutputs.TryGetValue(textureCoordsKey, out HlslTreeNode textureCoord))
+                {
+                    inputs.Add(textureCoord);
+                }
+            }
+
+            RegisterKey samplerKey = GetParamRegisterKey(instruction, SamplerIndex, 0);
+            if (_activeOutputs.TryGetValue(samplerKey, out HlslTreeNode input))
+            {
+                inputs.Add(input);
+            }
+
+            return inputs;
+        }
+
         private static HlslTreeNode ApplyModifier(HlslTreeNode input, SourceModifier modifier)
         {
             switch (modifier)

Hlsl/AbsoluteOperation.cs

@@ -3,7 +3,6 @@
     public class AbsoluteOperation : Operation
     {
         public AbsoluteOperation(HlslTreeNode value)
-            : base(OperationType.Absolute)
         {
             AddChild(value);
         }

Hlsl/AddOperation.cs

@@ -3,7 +3,6 @@
     public class AddOperation : Operation
     {
         public AddOperation(HlslTreeNode addend1, HlslTreeNode addend2)
-            : base(OperationType.Add)
         {
             AddChild(addend1);
             AddChild(addend2);

Hlsl/MoveOperation.cs

@@ -3,7 +3,6 @@
     public class MoveOperation : Operation
     {
         public MoveOperation(HlslTreeNode value)
-            : base(OperationType.Move)
         {
             AddChild(value);
         }

Hlsl/MultiplyAddOperation.cs

@@ -3,7 +3,6 @@
     public class MultiplyAddOperation : Operation
     {
         public MultiplyAddOperation(HlslTreeNode factor1, HlslTreeNode factor2, HlslTreeNode addend)
-             : base(OperationType.MultiplyAdd)
         {
             AddChild(factor1);
             AddChild(factor2);

Hlsl/MultiplyOperation.cs

@@ -3,7 +3,6 @@
     public class MultiplyOperation : Operation
     {
         public MultiplyOperation(HlslTreeNode factor1, HlslTreeNode factor2)
-             : base(OperationType.Multiply)
         {
             AddChild(factor1);
             AddChild(factor2);

Hlsl/NegateOperation.cs

@@ -3,7 +3,6 @@
     public class NegateOperation : Operation
     {
         public NegateOperation(HlslTreeNode value)
-            : base(OperationType.Negate)
         {
             AddChild(value);
         }

Hlsl/Operation.cs

@@ -2,16 +2,5 @@
 {
     public class Operation : HlslTreeNode
     {
-        public OperationType Type { get; }
-
-        public Operation(OperationType type)
-        {
-            Type = type;
-        }
-
-        public override string ToString()
-        {
-            return Type.ToString();
-        }
     }
 }

Hlsl/RegisterInputNode.cs

@@ -0,0 +1,19 @@
+namespace HlslDecompiler.Hlsl
+{
+    public class RegisterInputNode : HlslTreeNode, IHasComponentIndex
+    {
+        public RegisterInputNode(RegisterKey inputDecl, int componentIndex)
+        {
+            InputDecl = inputDecl;
+            ComponentIndex = componentIndex;
+        }
+
+        public RegisterKey InputDecl { get; }
+        public int ComponentIndex { get; }
+
+        public override string ToString()
+        {
+            return $"{InputDecl} ({ComponentIndex})";
+        }
+    }
+}

Hlsl/SubtractOperation.cs

@@ -3,10 +3,12 @@
     public class SubtractOperation : Operation
     {
         public SubtractOperation(HlslTreeNode minuend, HlslConstant subtrahend)
-            : base(OperationType.Subtract)
         {
             AddChild(minuend);
             AddChild(subtrahend);
         }
+
+        public HlslTreeNode Minuend => Children[0];
+        public HlslTreeNode Subtrahend => Children[1];
     }
 }

Hlsl/TextureLoadOutputNode.cs

@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace HlslDecompiler.Hlsl
+{
+    public class TextureLoadOutputNode : HlslTreeNode, IHasComponentIndex
+    {
+        public TextureLoadOutputNode(IEnumerable<HlslTreeNode> inputNodes, int componentIndex)
+        {
+            foreach (HlslTreeNode inputNode in inputNodes)
+            {
+                AddChild(inputNode);
+            }
+
+            ComponentIndex = componentIndex;
+        }
+
+        public IEnumerable<HlslTreeNode> TextureCoordinateInputs => Children.Where(c => !IsSamplerInput(c));
+        public RegisterInputNode SamplerInput => (RegisterInputNode)Children.Single(IsSamplerInput);
+        public int ComponentIndex { get; }
+
+        private static bool IsSamplerInput(HlslTreeNode node)
+        {
+            if (node is RegisterInputNode registerInput)
+            {
+                return registerInput.InputDecl.RegisterType == RegisterType.Sampler;
+            }
+            return false;
+        }
+    }
+}

HlslDecompiler.Tests/CompileShaders.ps1

@@ -8,7 +8,8 @@ $shaderSources = @(
     "ps_multiply_subtract",
     "ps_absolute_multiply",
     "ps_negate_absolute",
-    "ps_tex2d"
+    "ps_tex2d",
+    "ps_tex2d_swizzle"
 );
 
 $fxc_paths = @(

HlslDecompiler.Tests/DecompileTests.cs

@@ -16,6 +16,7 @@ public class DecompileTests
         [TestCase("ps_absolute_multiply")]
         [TestCase("ps_negate_absolute")]
         [TestCase("ps_tex2d")]
+        [TestCase("ps_tex2d_swizzle")]
         public void DecompileTest(string baseFilename)
         {
             string compiledShaderFilename = $"CompiledShaders{Path.DirectorySeparatorChar}{baseFilename}.fxc";

HlslDecompiler.Tests/HlslDecompiler.Tests.csproj

@@ -61,6 +61,9 @@
     <None Include="CompiledShaders\ps_constant.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="CompiledShaders\ps_tex2d_swizzle.fxc">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="CompiledShaders\ps_tex2d.fxc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -89,6 +92,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="packages.config" />
+    <Content Include="ShaderAssembly\ps_tex2d_swizzle.asm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="ShaderSources\ps_negate_absolute.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -98,6 +104,9 @@
     <Content Include="ShaderSources\ps_tex2d.fx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="ShaderSources\ps_tex2d_swizzle.fx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="ShaderAssembly\ps_tex2d.asm">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

HlslDecompiler.Tests/ShaderAssembly/ps_tex2d_swizzle.asm

@@ -0,0 +1,5 @@
+ps_3_0
+dcl_texcoord v0.xy
+dcl_2d s0
+texld r0, v0, s0
+mov oC0, r0.wzyx

HlslDecompiler.Tests/ShaderSources/ps_tex2d_swizzle.fx

@@ -0,0 +1,6 @@
+sampler sampler0;
+
+float4 main(float2 texcoord : TEXCOORD) : COLOR
+{
+	return tex2D(sampler0, texcoord).wzyx;
+}