Expand GL sampler arguments to a texture and sampler argument for D3D11.

src/compiler/OutputHLSL.cpp

@@ -1735,8 +1735,6 @@ bool OutputHLSL::visitAggregate(Visit visit, TIntermAggregate *node)
         break;
       case EOpFunctionCall:
         {
-            if (visit == PreVisit)
-            {
             TString name = TFunction::unmangleName(node->getName());
             bool lod0 = mInsideDiscontinuousLoop || mOutputLod0Function;
 
@@ -1870,23 +1868,30 @@ bool OutputHLSL::visitAggregate(Visit visit, TIntermAggregate *node)
                     out << "gl_textureCubeLod(";
                 }
                 else UNREACHABLE();
+            }
 
-                    if (mOutputType == SH_HLSL11_OUTPUT)
+            TIntermSequence &arguments = node->getSequence();
+
+            for (TIntermSequence::iterator arg = arguments.begin(); arg != arguments.end(); arg++)
+            {
+                if (mOutputType == SH_HLSL11_OUTPUT && IsSampler((*arg)->getAsTyped()->getBasicType()))
                 {
                     out << "texture_";
-                        node->getSequence()[0]->traverse(this);
+                    (*arg)->traverse(this);
                     out << ", sampler_";
                 }
-                }
-            }
-            else if (visit == InVisit)
+
+                (*arg)->traverse(this);
+
+                if (arg < arguments.end() - 1)
                 {
                     out << ", ";
                 }
-            else
-            {
-                out << ")";
             }
+
+            out << ")";
+
+            return false;
         }
         break;
       case EOpParameters:       outputTriplet(visit, "(", ", ", ")\n{\n");             break;
@@ -2493,6 +2498,12 @@ TString OutputHLSL::argumentString(const TIntermSymbol *symbol)
         name = decorate(name);
     }
 
+    if (mOutputType == SH_HLSL11_OUTPUT && IsSampler(type.getBasicType()))
+    {
+       return qualifierString(qualifier) + " " + textureString(type) + " texture_" + name + arrayString(type) + ", " +
+              qualifierString(qualifier) + " SamplerState sampler_" + name + arrayString(type);
+    }
+
     return qualifierString(qualifier) + " " + typeString(type) + " " + name + arrayString(type);
 }