Switched highp float to highfloat and mediump float to half.

The ultimate goal is to end up with "float" and "half", but this
intermediate step uses "highfloat" so that it is clear if I missed a
"float" somewhere. Once this lands, a subsequent CL will switch all
"highfloats" back to "floats".

Bug: skia:
Change-Id: Ia13225c7a0a0a2901e07665891c473d2500ddcca
Reviewed-on: https://skia-review.googlesource.com/31000
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

1 files changed, 20 insertions, 20 deletions

diff --git a/src/sksl/SkSLContext.h b/src/sksl/SkSLContext.h
index b132cec33d..fbd5146db2 100644
--- a/src/sksl/SkSLContext.h
+++ b/src/sksl/SkSLContext.h
@@ -21,47 +21,47 @@ public:
     Context()
     : fInvalid_Type(new Type(String("<INVALID>")))
     , fVoid_Type(new Type(String("void")))
-    , fDouble_Type(new Type(String("double"), Type::kFloat_NumberKind))
+    , fDouble_Type(new Type(String("double"), Type::kFloat_NumberKind, 4))
     , fDouble2_Type(new Type(String("double2"), *fDouble_Type, 2))
     , fDouble3_Type(new Type(String("double3"), *fDouble_Type, 3))
     , fDouble4_Type(new Type(String("double4"), *fDouble_Type, 4))
-    , fFloat_Type(new Type(String("float"), Type::kFloat_NumberKind))
-    , fFloat2_Type(new Type(String("float2"), *fFloat_Type, 2))
-    , fFloat3_Type(new Type(String("float3"), *fFloat_Type, 3))
-    , fFloat4_Type(new Type(String("float4"), *fFloat_Type, 4))
-    , fHalf_Type(new Type(String("half"), Type::kFloat_NumberKind))
+    , fFloat_Type(new Type(String("highfloat"), Type::kFloat_NumberKind, 3))
+    , fFloat2_Type(new Type(String("highfloat2"), *fFloat_Type, 2))
+    , fFloat3_Type(new Type(String("highfloat3"), *fFloat_Type, 3))
+    , fFloat4_Type(new Type(String("highfloat4"), *fFloat_Type, 4))
+    , fHalf_Type(new Type(String("half"), Type::kFloat_NumberKind, 2))
     , fHalf2_Type(new Type(String("half2"), *fHalf_Type, 2))
     , fHalf3_Type(new Type(String("half3"), *fHalf_Type, 3))
     , fHalf4_Type(new Type(String("half4"), *fHalf_Type, 4))
-    , fUInt_Type(new Type(String("uint"), Type::kUnsigned_NumberKind))
+    , fUInt_Type(new Type(String("uint"), Type::kUnsigned_NumberKind, 1))
     , fUInt2_Type(new Type(String("uint2"), *fUInt_Type, 2))
     , fUInt3_Type(new Type(String("uint3"), *fUInt_Type, 3))
     , fUInt4_Type(new Type(String("uint4"), *fUInt_Type, 4))
-    , fInt_Type(new Type(String("int"), Type::kSigned_NumberKind))
+    , fInt_Type(new Type(String("int"), Type::kSigned_NumberKind, 1))
     , fInt2_Type(new Type(String("int2"), *fInt_Type, 2))
     , fInt3_Type(new Type(String("int3"), *fInt_Type, 3))
     , fInt4_Type(new Type(String("int4"), *fInt_Type, 4))
-    , fUShort_Type(new Type(String("ushort"), Type::kUnsigned_NumberKind))
+    , fUShort_Type(new Type(String("ushort"), Type::kUnsigned_NumberKind, 0))
     , fUShort2_Type(new Type(String("ushort2"), *fUShort_Type, 2))
     , fUShort3_Type(new Type(String("ushort3"), *fUShort_Type, 3))
     , fUShort4_Type(new Type(String("ushort4"), *fUShort_Type, 4))
-    , fShort_Type(new Type(String("short"), Type::kSigned_NumberKind))
+    , fShort_Type(new Type(String("short"), Type::kSigned_NumberKind, 0))
     , fShort2_Type(new Type(String("short2"), *fShort_Type, 2))
     , fShort3_Type(new Type(String("short3"), *fShort_Type, 3))
     , fShort4_Type(new Type(String("short4"), *fShort_Type, 4))
-    , fBool_Type(new Type(String("bool"), Type::kNonnumeric_NumberKind))
+    , fBool_Type(new Type(String("bool"), Type::kNonnumeric_NumberKind, -1))
     , fBool2_Type(new Type(String("bool2"), *fBool_Type, 2))
     , fBool3_Type(new Type(String("bool3"), *fBool_Type, 3))
     , fBool4_Type(new Type(String("bool4"), *fBool_Type, 4))
-    , fFloat2x2_Type(new Type(String("float2x2"), *fFloat_Type, 2, 2))
-    , fFloat2x3_Type(new Type(String("float2x3"), *fFloat_Type, 2, 3))
-    , fFloat2x4_Type(new Type(String("float2x4"), *fFloat_Type, 2, 4))
-    , fFloat3x2_Type(new Type(String("float3x2"), *fFloat_Type, 3, 2))
-    , fFloat3x3_Type(new Type(String("float3x3"), *fFloat_Type, 3, 3))
-    , fFloat3x4_Type(new Type(String("float3x4"), *fFloat_Type, 3, 4))
-    , fFloat4x2_Type(new Type(String("float4x2"), *fFloat_Type, 4, 2))
-    , fFloat4x3_Type(new Type(String("float4x3"), *fFloat_Type, 4, 3))
-    , fFloat4x4_Type(new Type(String("float4x4"), *fFloat_Type, 4, 4))
+    , fFloat2x2_Type(new Type(String("highfloat2x2"), *fFloat_Type, 2, 2))
+    , fFloat2x3_Type(new Type(String("highfloat2x3"), *fFloat_Type, 2, 3))
+    , fFloat2x4_Type(new Type(String("highfloat2x4"), *fFloat_Type, 2, 4))
+    , fFloat3x2_Type(new Type(String("highfloat3x2"), *fFloat_Type, 3, 2))
+    , fFloat3x3_Type(new Type(String("highfloat3x3"), *fFloat_Type, 3, 3))
+    , fFloat3x4_Type(new Type(String("highfloat3x4"), *fFloat_Type, 3, 4))
+    , fFloat4x2_Type(new Type(String("highfloat4x2"), *fFloat_Type, 4, 2))
+    , fFloat4x3_Type(new Type(String("highfloat4x3"), *fFloat_Type, 4, 3))
+    , fFloat4x4_Type(new Type(String("highfloat4x4"), *fFloat_Type, 4, 4))
     , fHalf2x2_Type(new Type(String("half2x2"), *fHalf_Type, 2, 2))
     , fHalf2x3_Type(new Type(String("half2x3"), *fHalf_Type, 2, 3))
     , fHalf2x4_Type(new Type(String("half2x4"), *fHalf_Type, 2, 4))