aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sksl/SkSLContext.h
diff options
context:
space:
mode:
authorGravatar Ethan Nicholas <ethannicholas@google.com>2017-09-18 14:10:39 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-09-18 18:32:13 +0000
commitf7b8820dc813d1eb0b6b43fe4581dded0da38caf (patch)
tree518d313a9fa571a9f9ca26af7c381664694a4706 /src/sksl/SkSLContext.h
parent47a540f503bc722393b61c4b822e95b17f200125 (diff)
re-land of new SkSL precisions
Bug: skia: Change-Id: Ic1deb3db2cbda6ca45f93dee99832971a36a2119 Reviewed-on: https://skia-review.googlesource.com/47841 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLContext.h')
-rw-r--r--src/sksl/SkSLContext.h40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/sksl/SkSLContext.h b/src/sksl/SkSLContext.h
index e421695f11..862a77730a 100644
--- a/src/sksl/SkSLContext.h
+++ b/src/sksl/SkSLContext.h
@@ -21,47 +21,47 @@ public:
Context()
: fInvalid_Type(new Type("<INVALID>"))
, fVoid_Type(new Type("void"))
- , fDouble_Type(new Type("double", Type::kFloat_NumberKind))
+ , fDouble_Type(new Type("double", Type::kFloat_NumberKind, 4))
, fDouble2_Type(new Type("double2", *fDouble_Type, 2))
, fDouble3_Type(new Type("double3", *fDouble_Type, 3))
, fDouble4_Type(new Type("double4", *fDouble_Type, 4))
- , fFloat_Type(new Type("float", Type::kFloat_NumberKind))
- , fFloat2_Type(new Type("float2", *fFloat_Type, 2))
- , fFloat3_Type(new Type("float3", *fFloat_Type, 3))
- , fFloat4_Type(new Type("float4", *fFloat_Type, 4))
- , fHalf_Type(new Type("half", Type::kFloat_NumberKind))
+ , fFloat_Type(new Type("highfloat", Type::kFloat_NumberKind, 3))
+ , fFloat2_Type(new Type("highfloat2", *fFloat_Type, 2))
+ , fFloat3_Type(new Type("highfloat3", *fFloat_Type, 3))
+ , fFloat4_Type(new Type("highfloat4", *fFloat_Type, 4))
+ , fHalf_Type(new Type("half", Type::kFloat_NumberKind, 2))
, fHalf2_Type(new Type("half2", *fHalf_Type, 2))
, fHalf3_Type(new Type("half3", *fHalf_Type, 3))
, fHalf4_Type(new Type("half4", *fHalf_Type, 4))
- , fUInt_Type(new Type("uint", Type::kUnsigned_NumberKind))
+ , fUInt_Type(new Type("uint", Type::kUnsigned_NumberKind, 1))
, fUInt2_Type(new Type("uint2", *fUInt_Type, 2))
, fUInt3_Type(new Type("uint3", *fUInt_Type, 3))
, fUInt4_Type(new Type("uint4", *fUInt_Type, 4))
- , fInt_Type(new Type("int", Type::kSigned_NumberKind))
+ , fInt_Type(new Type("int", Type::kSigned_NumberKind, 1))
, fInt2_Type(new Type("int2", *fInt_Type, 2))
, fInt3_Type(new Type("int3", *fInt_Type, 3))
, fInt4_Type(new Type("int4", *fInt_Type, 4))
- , fUShort_Type(new Type("ushort", Type::kUnsigned_NumberKind))
+ , fUShort_Type(new Type("ushort", Type::kUnsigned_NumberKind, 0))
, fUShort2_Type(new Type("ushort2", *fUShort_Type, 2))
, fUShort3_Type(new Type("ushort3", *fUShort_Type, 3))
, fUShort4_Type(new Type("ushort4", *fUShort_Type, 4))
- , fShort_Type(new Type("short", Type::kSigned_NumberKind))
+ , fShort_Type(new Type("short", Type::kSigned_NumberKind, 0))
, fShort2_Type(new Type("short2", *fShort_Type, 2))
, fShort3_Type(new Type("short3", *fShort_Type, 3))
, fShort4_Type(new Type("short4", *fShort_Type, 4))
- , fBool_Type(new Type("bool", Type::kNonnumeric_NumberKind))
+ , fBool_Type(new Type("bool", Type::kNonnumeric_NumberKind, -1))
, fBool2_Type(new Type("bool2", *fBool_Type, 2))
, fBool3_Type(new Type("bool3", *fBool_Type, 3))
, fBool4_Type(new Type("bool4", *fBool_Type, 4))
- , fFloat2x2_Type(new Type("float2x2", *fFloat_Type, 2, 2))
- , fFloat2x3_Type(new Type("float2x3", *fFloat_Type, 2, 3))
- , fFloat2x4_Type(new Type("float2x4", *fFloat_Type, 2, 4))
- , fFloat3x2_Type(new Type("float3x2", *fFloat_Type, 3, 2))
- , fFloat3x3_Type(new Type("float3x3", *fFloat_Type, 3, 3))
- , fFloat3x4_Type(new Type("float3x4", *fFloat_Type, 3, 4))
- , fFloat4x2_Type(new Type("float4x2", *fFloat_Type, 4, 2))
- , fFloat4x3_Type(new Type("float4x3", *fFloat_Type, 4, 3))
- , fFloat4x4_Type(new Type("float4x4", *fFloat_Type, 4, 4))
+ , fFloat2x2_Type(new Type("highfloat2x2", *fFloat_Type, 2, 2))
+ , fFloat2x3_Type(new Type("highfloat2x3", *fFloat_Type, 2, 3))
+ , fFloat2x4_Type(new Type("highfloat2x4", *fFloat_Type, 2, 4))
+ , fFloat3x2_Type(new Type("highfloat3x2", *fFloat_Type, 3, 2))
+ , fFloat3x3_Type(new Type("highfloat3x3", *fFloat_Type, 3, 3))
+ , fFloat3x4_Type(new Type("highfloat3x4", *fFloat_Type, 3, 4))
+ , fFloat4x2_Type(new Type("highfloat4x2", *fFloat_Type, 4, 2))
+ , fFloat4x3_Type(new Type("highfloat4x3", *fFloat_Type, 4, 3))
+ , fFloat4x4_Type(new Type("highfloat4x4", *fFloat_Type, 4, 4))
, fHalf2x2_Type(new Type("half2x2", *fHalf_Type, 2, 2))
, fHalf2x3_Type(new Type("half2x3", *fHalf_Type, 2, 3))
, fHalf2x4_Type(new Type("half2x4", *fHalf_Type, 2, 4))