Refactor DynamicHLSL geometry shader code more.

This refactor adds a typed iterator class for helping to iterate over varying registers from packed varyings. We use the same iteration logic in several places and it has a triple loop, so encapsulating this into an iterator class keeps it cleaner. The other change is to use std::stringstream in places where we would return a std::string. These refactorings will aid in subsequent work to implement provoking vertex fixes and to refactor our varying packing algorithm. BUG=angleproject:754 Change-Id: Id44a1f68ccd4edc3458f1cf514f5eab4b8cd4151 Reviewed-on: https://chromium-review.googlesource.com/309811Reviewed-by: Corentin Wallez <cwallez@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Refactor DynamicHLSL geometry shader code more.
f4b2c4fd · Jamie Madill · 62c49f5d · f4b2c4fd · f4b2c4fd
Commit f4b2c4fd authored Oct 29, 2015 by Jamie Madill
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 7 deletions

DynamicHLSL.cpp src/libANGLE/renderer/d3d/DynamicHLSL.cpp +0 -0

DynamicHLSL.h src/libANGLE/renderer/d3d/DynamicHLSL.h +11 -7

No files found.
--- a/src/libANGLE/renderer/d3d/DynamicHLSL.cpp
+++ b/src/libANGLE/renderer/d3d/DynamicHLSL.cpp
--- a/src/libANGLE/renderer/d3d/DynamicHLSL.h
+++ b/src/libANGLE/renderer/d3d/DynamicHLSL.h
@@ -115,20 +115,24 @@ class DynamicHLSL : angle::NonCopyable

    struct SemanticInfo;

-    std::string getVaryingSemantic(bool pointSize) const;
+    std::string getVaryingSemantic(bool programUsesPointSize) const;
    SemanticInfo getSemanticInfo(unsigned int startRegisters,
                                 bool position,
                                 bool fragCoord,
                                 bool pointCoord,
                                 bool pointSize,
                                 bool pixelShader) const;
-    std::string generateVaryingLinkHLSL(const SemanticInfo &info,
-                                        const std::string &varyingHLSL) const;
-    std::string generateVaryingHLSL(const gl::Caps &caps,
-                                    const std::vector<PackedVarying> &varyings,
-                                    bool shaderUsesPointSize) const;
+    void generateVaryingLinkHLSL(const gl::Caps &caps,
+                                 bool programUsesPointSize,
+                                 const SemanticInfo &info,
+                                 const std::vector<PackedVarying> &packedVaryings,
+                                 std::stringstream &linkStream) const;
+    void generateVaryingHLSL(const gl::Caps &caps,
+                             const std::vector<PackedVarying> &varyings,
+                             bool programUsesPointSize,
+                             std::stringstream &hlslStream) const;
    void storeUserLinkedVaryings(const std::vector<PackedVarying> &packedVaryings,
-                                 bool shaderUsesPointSize,
+                                 bool programUsesPointSize,
                                 std::vector<gl::LinkedVarying> *linkedVaryings) const;
    void storeBuiltinLinkedVaryings(const SemanticInfo &info,
                                    std::vector<gl::LinkedVarying> *linkedVaryings) const;