aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sksl/SkSLContext.h
diff options
context:
space:
mode:
authorGravatar Ethan Nicholas <ethannicholas@google.com>2017-09-20 11:24:15 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-09-22 13:54:38 +0000
commit8aa4569c139a7a7ac38c62b25e3af40309cc2ee2 (patch)
tree7a26824983b55df440a1c369798936da7f872351 /src/sksl/SkSLContext.h
parentb7d42e3c11a6e1d89e8b1af030511e935ee065ba (diff)
switched SkSL's temporary 'highfloat' type back to 'float'
Bug: skia: Change-Id: If0debae7318b6b5b4a7cb85d458996a09931127e Reviewed-on: https://skia-review.googlesource.com/48760 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/sksl/SkSLContext.h')
-rw-r--r--src/sksl/SkSLContext.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/sksl/SkSLContext.h b/src/sksl/SkSLContext.h
index 862a77730a..5061b61fd3 100644
--- a/src/sksl/SkSLContext.h
+++ b/src/sksl/SkSLContext.h
@@ -25,10 +25,10 @@ public:
, 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("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))
+ , fFloat_Type(new Type("float", Type::kFloat_NumberKind, 3))
+ , 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, 2))
, fHalf2_Type(new Type("half2", *fHalf_Type, 2))
, fHalf3_Type(new Type("half3", *fHalf_Type, 3))
@@ -53,15 +53,15 @@ public:
, 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("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))
+ , 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))
, 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))