commit e0ba27a28ad621c56f7ce5b514ad0fa2da9ab760
author Nicolas Capens <nicolas@transgaming.com> Mon Jun 24 16:10:52 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:05:14 2013 -0400
tree 4bedb8af77206018aaad6623c6c968b0897254d5
parent 9fe6f9849d42a941fdcd5875ef50d47a95ec3cd0

Construct texture functions from stored characteristics.

TRAC #23377
Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
Author: Nicolas Capens

src/compiler/OutputHLSL.h

diff --git a/src/compiler/OutputHLSL.h b/src/compiler/OutputHLSL.h
index 6607357..fd32811 100644
--- a/src/compiler/OutputHLSL.h
+++ b/src/compiler/OutputHLSL.h
@@ -94,32 +94,30 @@
     ReferencedSymbols mReferencedVaryings;
     ReferencedSymbols mReferencedOutputVariables;
 
+    struct TextureFunction
+    {
+        enum Mipmap
+        {
+            IMPLICIT,
+            BIAS,
+            LOD,
+            LOD0
+        };
+
+        TBasicType sampler;
+        int coords;
+        bool proj;
+        Mipmap mipmap;
+
+        TString name() const;
+
+        bool operator<(const TextureFunction &rhs) const;
+    };
+
+    typedef std::set<TextureFunction> TextureFunctionSet;
+
     // Parameters determining what goes in the header output
-    bool mUsesTexture2D;
-    bool mUsesTexture2D_bias;
-    bool mUsesTexture2DLod;
-    bool mUsesTexture2DProj;
-    bool mUsesTexture2DProj_bias;
-    bool mUsesTexture2DProjLod;
-    bool mUsesTexture3D;
-    bool mUsesTexture3D_bias;
-    bool mUsesTexture3DLod;
-    bool mUsesTexture3DProj;
-    bool mUsesTexture3DProj_bias;
-    bool mUsesTexture3DProjLod;
-    bool mUsesTextureCube;
-    bool mUsesTextureCube_bias;
-    bool mUsesTextureCubeLod;
-    bool mUsesTexture2DLod0;
-    bool mUsesTexture2DLod0_bias;
-    bool mUsesTexture2DProjLod0;
-    bool mUsesTexture2DProjLod0_bias;
-    bool mUsesTexture3DLod0;
-    bool mUsesTexture3DLod0_bias;
-    bool mUsesTexture3DProjLod0;
-    bool mUsesTexture3DProjLod0_bias;
-    bool mUsesTextureCubeLod0;
-    bool mUsesTextureCubeLod0_bias;
+    TextureFunctionSet mUsesTexture;
     bool mUsesFragColor;
     bool mUsesFragData;
     bool mUsesDepthRange;