Refactor position computation to enable device space "nudge"

include/gpu/GrShaderVar.h

Index: include/gpu/GrShaderVar.h
diff --git a/include/gpu/GrShaderVar.h b/include/gpu/GrShaderVar.h
index 53d0c0f2016dcb937d4d4d951c0e9a7e17c9803e..68ce34b8ef8d0520dee17d577711597eb5d740c4 100644
--- a/include/gpu/GrShaderVar.h
+++ b/include/gpu/GrShaderVar.h
@@ -67,7 +67,7 @@ public:
     }
 
     GrShaderVar(const char* name, GrSLType type, TypeModifier typeModifier,
-                  int arrayCount = kNonArray, GrSLPrecision precision = kDefault_GrSLPrecision)
+                int arrayCount = kNonArray, GrSLPrecision precision = kDefault_GrSLPrecision)
         : fType(type)
         , fTypeModifier(typeModifier)
         , fName(name)
@@ -85,46 +85,11 @@ public:
         kUnsizedArray = -1, // an unsized array (declared with [])
     };
 
-    /**
-     * Sets as a non-array.
-     */
-    void set(GrSLType type,
-             TypeModifier typeModifier,
-             const SkString& name,
-             GrSLPrecision precision = kDefault_GrSLPrecision) {
-        SkASSERT(kVoid_GrSLType != type);
-        SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
-        fType = type;
-        fTypeModifier = typeModifier;
-        fName = name;
-        fCount = kNonArray;
-        fPrecision = precision;
-    }
-
-    /**
-     * Sets as a non-array.
-     */
     void set(GrSLType type,
-             TypeModifier typeModifier,
-             const char* name,
-             GrSLPrecision precision = kDefault_GrSLPrecision) {
-        SkASSERT(kVoid_GrSLType != type);
-        SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
-        fType = type;
-        fTypeModifier = typeModifier;
-        fName = name;
-        fCount = kNonArray;
-        fPrecision = precision;
-    }
-
-    /**
-     * Set all var options
-     */
-    void set(GrSLType type,
-             TypeModifier typeModifier,
              const SkString& name,
-             int count,
-             GrSLPrecision precision = kDefault_GrSLPrecision) {
+             TypeModifier typeModifier = kNone_TypeModifier,
+             GrSLPrecision precision = kDefault_GrSLPrecision,
+             int count = kNonArray) {
         SkASSERT(kVoid_GrSLType != type);
         SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
         fType = type;
@@ -134,14 +99,11 @@ public:
         fPrecision = precision;
     }
 
-    /**
-     * Set all var options
-     */
     void set(GrSLType type,
-             TypeModifier typeModifier,
              const char* name,
-             int count,
-             GrSLPrecision precision = kDefault_GrSLPrecision) {
+             TypeModifier typeModifier = kNone_TypeModifier,
+             GrSLPrecision precision = kDefault_GrSLPrecision,
+             int count = kNonArray) {
         SkASSERT(kVoid_GrSLType != type);
         SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
         fType = type;