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>
diff --git a/tests/GrMeshTest.cpp b/tests/GrMeshTest.cpp
index dac9deb..223138b 100644
--- a/tests/GrMeshTest.cpp
+++ b/tests/GrMeshTest.cpp
@@ -328,17 +328,17 @@
GrGLSLVertexBuilder* v = args.fVertBuilder;
if (!mp.fInstanceLocation) {
- v->codeAppendf("highfloat2 vertex = %s;", mp.fVertex->fName);
+ v->codeAppendf("float2 vertex = %s;", mp.fVertex->fName);
} else {
if (mp.fVertex) {
- v->codeAppendf("highfloat2 offset = %s;", mp.fVertex->fName);
+ v->codeAppendf("float2 offset = %s;", mp.fVertex->fName);
} else {
- v->codeAppend ("highfloat2 offset = highfloat2(sk_VertexID / 2, sk_VertexID % 2);");
+ v->codeAppend ("float2 offset = float2(sk_VertexID / 2, sk_VertexID % 2);");
}
- v->codeAppendf("highfloat2 vertex = %s + offset * %i;",
+ v->codeAppendf("float2 vertex = %s + offset * %i;",
mp.fInstanceLocation->fName, kBoxSize);
}
- gpArgs->fPositionVar.set(kHighFloat2_GrSLType, "vertex");
+ gpArgs->fPositionVar.set(kFloat2_GrSLType, "vertex");
GrGLSLPPFragmentBuilder* f = args.fFragBuilder;
f->codeAppendf("%s = half4(1);", args.fOutputCoverage);
diff --git a/tests/GrPipelineDynamicStateTest.cpp b/tests/GrPipelineDynamicStateTest.cpp
index 1d148cf..475f8f3 100644
--- a/tests/GrPipelineDynamicStateTest.cpp
+++ b/tests/GrPipelineDynamicStateTest.cpp
@@ -91,8 +91,8 @@
varyingHandler->addPassThroughAttribute(&mp.fColor, args.fOutputColor);
GrGLSLVertexBuilder* v = args.fVertBuilder;
- v->codeAppendf("highfloat2 vertex = %s;", mp.fVertex.fName);
- gpArgs->fPositionVar.set(kHighFloat2_GrSLType, "vertex");
+ v->codeAppendf("float2 vertex = %s;", mp.fVertex.fName);
+ gpArgs->fPositionVar.set(kFloat2_GrSLType, "vertex");
GrGLSLPPFragmentBuilder* f = args.fFragBuilder;
f->codeAppendf("%s = half4(1);", args.fOutputCoverage);
diff --git a/tests/ImageStorageTest.cpp b/tests/ImageStorageTest.cpp
index 8a6023f..445a72f 100644
--- a/tests/ImageStorageTest.cpp
+++ b/tests/ImageStorageTest.cpp
@@ -58,7 +58,7 @@
const TestFP& tfp = args.fFp.cast<TestFP>();
GrGLSLFPFragmentBuilder* fb = args.fFragBuilder;
SkString imageLoadStr;
- fb->codeAppend("highfloat2 coord = sk_FragCoord.xy;");
+ fb->codeAppend("float2 coord = sk_FragCoord.xy;");
fb->appendImageStorageLoad(&imageLoadStr, args.fImageStorages[0],
"int2(coord)");
if (GrPixelConfigIsSint(tfp.fImageStorageAccess.peekTexture()->config())) {
diff --git a/tests/SkSLErrorTest.cpp b/tests/SkSLErrorTest.cpp
index 4943e10..575fd74 100644
--- a/tests/SkSLErrorTest.cpp
+++ b/tests/SkSLErrorTest.cpp
@@ -37,7 +37,7 @@
DEF_TEST(SkSLUndefinedSymbol, r) {
test_failure(r,
- "void main() { x = highfloat2(1); }",
+ "void main() { x = float2(1); }",
"error: 1: unknown identifier 'x'\n1 error\n");
}
@@ -49,27 +49,27 @@
DEF_TEST(SkSLGenericArgumentMismatch, r) {
test_failure(r,
- "void main() { highfloat x = sin(1, 2); }",
+ "void main() { float x = sin(1, 2); }",
"error: 1: call to 'sin' expected 1 argument, but found 2\n1 error\n");
test_failure(r,
- "void main() { highfloat x = sin(true); }",
+ "void main() { float x = sin(true); }",
"error: 1: no match for sin(bool)\n1 error\n");
test_success(r,
- "void main() { highfloat x = sin(1); }");
+ "void main() { float x = sin(1); }");
}
DEF_TEST(SkSLArgumentCountMismatch, r) {
test_failure(r,
- "highfloat foo(highfloat x) { return x * x; }"
- "void main() { highfloat x = foo(1, 2); }",
+ "float foo(float x) { return x * x; }"
+ "void main() { float x = foo(1, 2); }",
"error: 1: call to 'foo' expected 1 argument, but found 2\n1 error\n");
}
DEF_TEST(SkSLArgumentMismatch, r) {
test_failure(r,
- "highfloat foo(highfloat x) { return x * x; }"
- "void main() { highfloat x = foo(true); }",
- "error: 1: expected 'highfloat', but found 'bool'\n1 error\n");
+ "float foo(float x) { return x * x; }"
+ "void main() { float x = foo(true); }",
+ "error: 1: expected 'float', but found 'bool'\n1 error\n");
}
DEF_TEST(SkSLIfTypeMismatch, r) {
@@ -80,14 +80,14 @@
DEF_TEST(SkSLDoTypeMismatch, r) {
test_failure(r,
- "void main() { do { } while (highfloat2(1)); }",
- "error: 1: expected 'bool', but found 'highfloat2'\n1 error\n");
+ "void main() { do { } while (float2(1)); }",
+ "error: 1: expected 'bool', but found 'float2'\n1 error\n");
}
DEF_TEST(SkSLWhileTypeMismatch, r) {
test_failure(r,
- "void main() { while (highfloat3(1)) { } }",
- "error: 1: expected 'bool', but found 'highfloat3'\n1 error\n");
+ "void main() { while (float3(1)) { } }",
+ "error: 1: expected 'bool', but found 'float3'\n1 error\n");
}
DEF_TEST(SkSLForTypeMismatch, r) {
@@ -98,14 +98,14 @@
DEF_TEST(SkSLConstructorTypeMismatch, r) {
test_failure(r,
- "void main() { highfloat2 x = highfloat2(1.0, false); }",
- "error: 1: expected 'highfloat', but found 'bool'\n1 error\n");
+ "void main() { float2 x = float2(1.0, false); }",
+ "error: 1: expected 'float', but found 'bool'\n1 error\n");
test_failure(r,
- "void main() { highfloat2 x = highfloat2(bool2(false)); }",
- "error: 1: 'bool2' is not a valid parameter to 'highfloat2' constructor\n1 error\n");
+ "void main() { float2 x = float2(bool2(false)); }",
+ "error: 1: 'bool2' is not a valid parameter to 'float2' constructor\n1 error\n");
test_failure(r,
- "void main() { bool2 x = bool2(highfloat2(1)); }",
- "error: 1: 'highfloat2' is not a valid parameter to 'bool2' constructor\n1 error\n");
+ "void main() { bool2 x = bool2(float2(1)); }",
+ "error: 1: 'float2' is not a valid parameter to 'bool2' constructor\n1 error\n");
test_failure(r,
"void main() { bool x = bool(1.0); }",
"error: 1: cannot construct 'bool'\n1 error\n");
@@ -113,69 +113,69 @@
"struct foo { int x; }; void main() { foo x = foo(5); }",
"error: 1: cannot construct 'foo'\n1 error\n");
test_failure(r,
- "struct foo { int x; } foo; void main() { highfloat x = highfloat(foo); }",
- "error: 1: invalid argument to 'highfloat' constructor (expected a number or bool, but found 'foo')\n1 error\n");
+ "struct foo { int x; } foo; void main() { float x = float(foo); }",
+ "error: 1: invalid argument to 'float' constructor (expected a number or bool, but found 'foo')\n1 error\n");
test_failure(r,
- "struct foo { int x; } foo; void main() { highfloat2 x = highfloat2(foo); }",
- "error: 1: 'foo' is not a valid parameter to 'highfloat2' constructor\n1 error\n");
+ "struct foo { int x; } foo; void main() { float2 x = float2(foo); }",
+ "error: 1: 'foo' is not a valid parameter to 'float2' constructor\n1 error\n");
test_failure(r,
- "void main() { highfloat2x2 x = highfloat2x2(true); }",
- "error: 1: expected 'highfloat', but found 'bool'\n1 error\n");
+ "void main() { float2x2 x = float2x2(true); }",
+ "error: 1: expected 'float', but found 'bool'\n1 error\n");
}
DEF_TEST(SkSLConstructorArgumentCount, r) {
test_failure(r,
- "void main() { highfloat3 x = highfloat3(1.0, 2.0); }",
- "error: 1: invalid arguments to 'highfloat3' constructor (expected 3 scalars, but "
+ "void main() { float3 x = float3(1.0, 2.0); }",
+ "error: 1: invalid arguments to 'float3' constructor (expected 3 scalars, but "
"found 2)\n1 error\n");
test_failure(r,
- "void main() { highfloat3 x = highfloat3(1.0, 2.0, 3.0, 4.0); }",
- "error: 1: invalid arguments to 'highfloat3' constructor (expected 3 scalars, but found "
+ "void main() { float3 x = float3(1.0, 2.0, 3.0, 4.0); }",
+ "error: 1: invalid arguments to 'float3' constructor (expected 3 scalars, but found "
"4)\n1 error\n");
}
DEF_TEST(SkSLSwizzleScalar, r) {
test_failure(r,
- "void main() { highfloat x = 1; highfloat y = x.y; }",
- "error: 1: cannot swizzle value of type 'highfloat'\n1 error\n");
+ "void main() { float x = 1; float y = x.y; }",
+ "error: 1: cannot swizzle value of type 'float'\n1 error\n");
}
DEF_TEST(SkSLSwizzleMatrix, r) {
test_failure(r,
- "void main() { highfloat2x2 x = highfloat2x2(1); highfloat y = x.y; }",
- "error: 1: cannot swizzle value of type 'highfloat2x2'\n1 error\n");
+ "void main() { float2x2 x = float2x2(1); float y = x.y; }",
+ "error: 1: cannot swizzle value of type 'float2x2'\n1 error\n");
}
DEF_TEST(SkSLSwizzleOutOfBounds, r) {
test_failure(r,
- "void main() { highfloat3 test = highfloat2(1).xyz; }",
+ "void main() { float3 test = float2(1).xyz; }",
"error: 1: invalid swizzle component 'z'\n1 error\n");
}
DEF_TEST(SkSLSwizzleTooManyComponents, r) {
test_failure(r,
- "void main() { highfloat4 test = highfloat2(1).xxxxx; }",
+ "void main() { float4 test = float2(1).xxxxx; }",
"error: 1: too many components in swizzle mask 'xxxxx'\n1 error\n");
}
DEF_TEST(SkSLSwizzleDuplicateOutput, r) {
test_failure(r,
- "void main() { highfloat4 test = highfloat4(1); test.xyyz = highfloat4(1); }",
+ "void main() { float4 test = float4(1); test.xyyz = float4(1); }",
"error: 1: cannot write to the same swizzle field more than once\n1 error\n");
}
DEF_TEST(SkSLAssignmentTypeMismatch, r) {
test_failure(r,
"void main() { int x = 1.0; }",
- "error: 1: expected 'int', but found 'highfloat'\n1 error\n");
+ "error: 1: expected 'int', but found 'float'\n1 error\n");
test_failure(r,
"void main() { int x; x = 1.0; }",
- "error: 1: type mismatch: '=' cannot operate on 'int', 'highfloat'\n1 error\n");
+ "error: 1: type mismatch: '=' cannot operate on 'int', 'float'\n1 error\n");
test_success(r,
- "void main() { highfloat3 x = highfloat3(0); x *= 1.0; }");
+ "void main() { float3 x = float3(0); x *= 1.0; }");
test_failure(r,
"void main() { int3 x = int3(0); x *= 1.0; }",
- "error: 1: type mismatch: '*=' cannot operate on 'int3', 'highfloat'\n1 error\n");
+ "error: 1: type mismatch: '*=' cannot operate on 'int3', 'float'\n1 error\n");
}
DEF_TEST(SkSLReturnFromVoid, r) {
@@ -193,7 +193,7 @@
DEF_TEST(SkSLReturnTypeMismatch, r) {
test_failure(r,
"int foo() { return 1.0; } void main() { }",
- "error: 1: expected 'int', but found 'highfloat'\n1 error\n");
+ "error: 1: expected 'int', but found 'float'\n1 error\n");
}
DEF_TEST(SkSLDuplicateFunction, r) {
@@ -240,32 +240,32 @@
DEF_TEST(SkSLBinaryTypeMismatch, r) {
test_failure(r,
- "void main() { highfloat x = 3 * true; }",
+ "void main() { float x = 3 * true; }",
"error: 1: type mismatch: '*' cannot operate on 'int', 'bool'\n1 error\n");
test_failure(r,
"void main() { bool x = 1 || 2.0; }",
- "error: 1: type mismatch: '||' cannot operate on 'int', 'highfloat'\n1 error\n");
+ "error: 1: type mismatch: '||' cannot operate on 'int', 'float'\n1 error\n");
}
DEF_TEST(SkSLCallNonFunction, r) {
test_failure(r,
- "void main() { highfloat x = 3; x(); }",
+ "void main() { float x = 3; x(); }",
"error: 1: 'x' is not a function\n1 error\n");
}
DEF_TEST(SkSLInvalidUnary, r) {
test_failure(r,
- "void main() { highfloat4x4 x = highfloat4x4(1); ++x; }",
- "error: 1: '++' cannot operate on 'highfloat4x4'\n1 error\n");
+ "void main() { float4x4 x = float4x4(1); ++x; }",
+ "error: 1: '++' cannot operate on 'float4x4'\n1 error\n");
test_failure(r,
- "void main() { highfloat3 x = highfloat3(1); --x; }",
- "error: 1: '--' cannot operate on 'highfloat3'\n1 error\n");
+ "void main() { float3 x = float3(1); --x; }",
+ "error: 1: '--' cannot operate on 'float3'\n1 error\n");
test_failure(r,
- "void main() { highfloat4x4 x = highfloat4x4(1); x++; }",
- "error: 1: '++' cannot operate on 'highfloat4x4'\n1 error\n");
+ "void main() { float4x4 x = float4x4(1); x++; }",
+ "error: 1: '++' cannot operate on 'float4x4'\n1 error\n");
test_failure(r,
- "void main() { highfloat3 x = highfloat3(1); x--; }",
- "error: 1: '--' cannot operate on 'highfloat3'\n1 error\n");
+ "void main() { float3 x = float3(1); x--; }",
+ "error: 1: '--' cannot operate on 'float3'\n1 error\n");
test_failure(r,
"void main() { int x = !12; }",
"error: 1: '!' cannot operate on 'int'\n1 error\n");
@@ -276,7 +276,7 @@
"struct foo { } bar; void main() { foo x = -bar; }",
"error: 1: '-' cannot operate on 'foo'\n1 error\n");
test_success(r,
- "void main() { highfloat2 x = highfloat2(1, 1); x = +x; x = -x; }");
+ "void main() { float2 x = float2(1, 1); x = +x; x = -x; }");
}
DEF_TEST(SkSLInvalidAssignment, r) {
@@ -296,17 +296,17 @@
"void main() { int x = 2[0]; }",
"error: 1: expected array, but found 'int'\n1 error\n");
test_failure(r,
- "void main() { highfloat2 x = highfloat2(0); int y = x[0][0]; }",
- "error: 1: expected array, but found 'highfloat'\n1 error\n");
+ "void main() { float2 x = float2(0); int y = x[0][0]; }",
+ "error: 1: expected array, but found 'float'\n1 error\n");
}
DEF_TEST(SkSLTernaryMismatch, r) {
test_failure(r,
"void main() { int x = 5 > 2 ? true : 1.0; }",
- "error: 1: ternary operator result mismatch: 'bool', 'highfloat'\n1 error\n");
+ "error: 1: ternary operator result mismatch: 'bool', 'float'\n1 error\n");
test_failure(r,
- "void main() { int x = 5 > 2 ? highfloat3(1) : 1.0; }",
- "error: 1: ternary operator result mismatch: 'highfloat3', 'highfloat'\n1 error\n");
+ "void main() { int x = 5 > 2 ? float3(1) : 1.0; }",
+ "error: 1: ternary operator result mismatch: 'float3', 'float'\n1 error\n");
}
DEF_TEST(SkSLInterfaceBlockStorageModifiers, r) {
@@ -333,7 +333,7 @@
"error: 1: 'x' has not been assigned\n1 error\n");
test_failure(r,
"void main() { int x; switch (3) { case 0: x = 0; case 1: x = 1; }"
- "sk_FragColor = highfloat4(x); }",
+ "sk_FragColor = float4(x); }",
"error: 1: 'x' has not been assigned\n1 error\n");
}
@@ -403,32 +403,32 @@
"int x = 1 / 0;",
"error: 1: division by zero\n1 error\n");
test_failure(r,
- "highfloat x = 1 / 0;",
+ "float x = 1 / 0;",
"error: 1: division by zero\n1 error\n");
test_failure(r,
- "highfloat x = 1.0 / 0.0;",
+ "float x = 1.0 / 0.0;",
"error: 1: division by zero\n1 error\n");
test_failure(r,
- "highfloat x = -67.0 / (3.0 - 3);",
+ "float x = -67.0 / (3.0 - 3);",
"error: 1: division by zero\n1 error\n");
}
DEF_TEST(SkSLUnsupportedGLSLIdentifiers, r) {
test_failure(r,
- "void main() { highfloat x = gl_FragCoord.x; };",
+ "void main() { float x = gl_FragCoord.x; };",
"error: 1: unknown identifier 'gl_FragCoord'\n1 error\n");
test_failure(r,
- "void main() { highfloat r = gl_FragColor.r; };",
+ "void main() { float r = gl_FragColor.r; };",
"error: 1: unknown identifier 'gl_FragColor'\n1 error\n");
}
DEF_TEST(SkSLWrongSwitchTypes, r) {
test_failure(r,
- "void main() { switch (highfloat2(1)) { case 1: break; } }",
- "error: 1: expected 'int', but found 'highfloat2'\n1 error\n");
+ "void main() { switch (float2(1)) { case 1: break; } }",
+ "error: 1: expected 'int', but found 'float2'\n1 error\n");
test_failure(r,
- "void main() { switch (1) { case highfloat2(1): break; } }",
- "error: 1: expected 'int', but found 'highfloat2'\n1 error\n");
+ "void main() { switch (1) { case float2(1): break; } }",
+ "error: 1: expected 'int', but found 'float2'\n1 error\n");
}
DEF_TEST(SkSLNonConstantCase, r) {
@@ -445,18 +445,18 @@
DEF_TEST(SkSLFieldAfterRuntimeArray, r) {
test_failure(r,
- "buffer broken { highfloat x[]; highfloat y; };",
+ "buffer broken { float x[]; float y; };",
"error: 1: only the last entry in an interface block may be a runtime-sized "
"array\n1 error\n");
}
DEF_TEST(SkSLStaticIf, r) {
test_success(r,
- "void main() { highfloat x = 5; highfloat y = 10;"
- "@if (x < y) { sk_FragColor = highfloat4(1); } }");
+ "void main() { float x = 5; float y = 10;"
+ "@if (x < y) { sk_FragColor = float4(1); } }");
test_failure(r,
- "void main() { highfloat x = sqrt(25); highfloat y = 10;"
- "@if (x < y) { sk_FragColor = highfloat4(1); } }",
+ "void main() { float x = sqrt(25); float y = 10;"
+ "@if (x < y) { sk_FragColor = float4(1); } }",
"error: 1: static if has non-static test\n1 error\n");
}
@@ -465,16 +465,16 @@
"void main() {"
"int x = 1;"
"@switch (x) {"
- "case 1: sk_FragColor = highfloat4(1); break;"
- "default: sk_FragColor = highfloat4(0);"
+ "case 1: sk_FragColor = float4(1); break;"
+ "default: sk_FragColor = float4(0);"
"}"
"}");
test_failure(r,
"void main() {"
"int x = int(sqrt(1));"
"@switch (x) {"
- "case 1: sk_FragColor = highfloat4(1); break;"
- "default: sk_FragColor = highfloat4(0);"
+ "case 1: sk_FragColor = float4(1); break;"
+ "default: sk_FragColor = float4(0);"
"}"
"}",
"error: 1: static switch has non-static test\n1 error\n");
@@ -482,8 +482,8 @@
"void main() {"
"int x = 1;"
"@switch (x) {"
- "case 1: sk_FragColor = highfloat4(1); if (sqrt(0) < sqrt(1)) break;"
- "default: sk_FragColor = highfloat4(0);"
+ "case 1: sk_FragColor = float4(1); if (sqrt(0) < sqrt(1)) break;"
+ "default: sk_FragColor = float4(0);"
"}"
"}",
"error: 1: static switch contains non-static conditional break\n1 error\n");
diff --git a/tests/SkSLFPTest.cpp b/tests/SkSLFPTest.cpp
index 266169f..dc92795 100644
--- a/tests/SkSLFPTest.cpp
+++ b/tests/SkSLFPTest.cpp
@@ -250,9 +250,9 @@
{"cpp section"});
test(r,
"@constructorParams { int x, float y, std::vector<float> z }"
- "in highfloat w;"
+ "in float w;"
"void main() {"
- "sk_OutColor = highfloat4(1);"
+ "sk_OutColor = float4(1);"
"}",
*SkSL::ShaderCapsFactory::Default(),
{
@@ -353,7 +353,7 @@
"in uniform sampler2D image;"
"in uniform colorSpaceXform colorXform;"
"void main() {"
- "sk_OutColor = sk_InColor * texture(image, highfloat2(0, 0), colorXform);"
+ "sk_OutColor = sk_InColor * texture(image, float2(0, 0), colorXform);"
"}",
*SkSL::ShaderCapsFactory::Default(),
{
@@ -364,7 +364,7 @@
},
{
"fragBuilder->codeAppendf(\"half4 _tmpVar1;%s = %s * %stexture(%s, "
- "highfloat2(0.0, 0.0)).%s%s;\\n\", args.fOutputColor, args.fInputColor ? args.fInputColor : "
+ "float2(0.0, 0.0)).%s%s;\\n\", args.fOutputColor, args.fInputColor ? args.fInputColor : "
"\"half4(1)\", fColorSpaceHelper.isValid() ? \"(_tmpVar1 = \" : \"\", "
"fragBuilder->getProgramBuilder()->samplerVariable(args.fTexSamplers[0]).c_str(), "
"fragBuilder->getProgramBuilder()->samplerSwizzle(args.fTexSamplers[0]).c_str(), "
diff --git a/tests/SkSLGLSLTest.cpp b/tests/SkSLGLSLTest.cpp
index bfcedac..6d0e534 100644
--- a/tests/SkSLGLSLTest.cpp
+++ b/tests/SkSLGLSLTest.cpp
@@ -51,7 +51,7 @@
DEF_TEST(SkSLHelloWorld, r) {
test(r,
- "void main() { sk_FragColor = highfloat4(0.75); }",
+ "void main() { sk_FragColor = float4(0.75); }",
*SkSL::ShaderCapsFactory::Default(),
"#version 400\n"
"out vec4 sk_FragColor;\n"
@@ -63,7 +63,7 @@
DEF_TEST(SkSLControl, r) {
test(r,
"void main() {"
- "if (sqrt(2) > 5) { sk_FragColor = highfloat4(0.75); } else { discard; }"
+ "if (sqrt(2) > 5) { sk_FragColor = float4(0.75); } else { discard; }"
"int i = 0;"
"while (i < 10) { sk_FragColor *= 0.5; i++; }"
"do { sk_FragColor += 0.01; } while (sk_FragColor.x < 0.75);"
@@ -98,9 +98,9 @@
DEF_TEST(SkSLFunctions, r) {
test(r,
- "highfloat foo(highfloat v[2]) { return v[0] * v[1]; }"
- "void bar(inout highfloat x) { highfloat y[2], z; y[0] = x; y[1] = x * 2; z = foo(y); x = z; }"
- "void main() { highfloat x = 10; bar(x); sk_FragColor = highfloat4(x); }",
+ "float foo(float v[2]) { return v[0] * v[1]; }"
+ "void bar(inout float x) { float y[2], z; y[0] = x; y[1] = x * 2; z = foo(y); x = z; }"
+ "void main() { float x = 10; bar(x); sk_FragColor = float4(x); }",
*SkSL::ShaderCapsFactory::Default(),
"#version 400\n"
"out vec4 sk_FragColor;\n"
@@ -124,7 +124,7 @@
DEF_TEST(SkSLOperators, r) {
test(r,
"void main() {"
- "highfloat x = 1, y = 2;"
+ "float x = 1, y = 2;"
"int z = 3;"
"x = x - x + y * z * x * (y - z);"
"y = x / y / z;"
@@ -142,8 +142,8 @@
"z >>= 2;"
"z <<= 4;"
"z %= 5;"
- "x = (highfloat2(sqrt(1)) , 6);"
- "z = (highfloat2(sqrt(1)) , 6);"
+ "x = (float2(sqrt(1)) , 6);"
+ "z = (float2(sqrt(1)) , 6);"
"}",
*SkSL::ShaderCapsFactory::Default(),
"#version 400\n"
@@ -175,12 +175,12 @@
DEF_TEST(SkSLMatrices, r) {
test(r,
"void main() {"
- "highfloat2x4 x = highfloat2x4(1);"
- "highfloat3x2 y = highfloat3x2(1, 0, 0, 1, highfloat2(2, 2));"
- "highfloat3x4 z = x * y;"
- "highfloat3 v1 = highfloat3x3(1) * highfloat3(2);"
- "highfloat3 v2 = highfloat3(2) * highfloat3x3(1);"
- "sk_FragColor = highfloat4(z[0].x, v1 + v2);"
+ "float2x4 x = float2x4(1);"
+ "float3x2 y = float3x2(1, 0, 0, 1, float2(2, 2));"
+ "float3x4 z = x * y;"
+ "float3 v1 = float3x3(1) * float3(2);"
+ "float3 v2 = float3(2) * float3x3(1);"
+ "sk_FragColor = float4(z[0].x, v1 + v2);"
"}",
*SkSL::ShaderCapsFactory::Default(),
"#version 400\n"
@@ -218,7 +218,7 @@
"}\n");
test(r,
"uniform testBlock {"
- "highfloat x;"
+ "float x;"
"} test;"
"void main() {"
" sk_FragColor = half4(test.x);"
@@ -234,7 +234,7 @@
"}\n");
test(r,
"uniform testBlock {"
- "highfloat x;"
+ "float x;"
"} test[2];"
"void main() {"
" sk_FragColor = half4(test[1].x);"
@@ -258,8 +258,8 @@
"} a1, a2;"
"A a3;"
"struct B {"
- "highfloat x;"
- "highfloat y[2];"
+ "float x;"
+ "float y[2];"
"layout(binding=1) A z;"
"};"
"B b1, b2, b3;"
@@ -284,7 +284,7 @@
DEF_TEST(SkSLVersion, r) {
test(r,
- "in highfloat test; void main() { sk_FragColor = highfloat4(0.75); }",
+ "in float test; void main() { sk_FragColor = float4(0.75); }",
*SkSL::ShaderCapsFactory::Version450Core(),
"#version 450 core\n"
"out vec4 sk_FragColor;\n"
@@ -293,7 +293,7 @@
" sk_FragColor = vec4(0.75);\n"
"}\n");
test(r,
- "in highfloat test; void main() { sk_FragColor = highfloat4(0.75); }",
+ "in float test; void main() { sk_FragColor = float4(0.75); }",
*SkSL::ShaderCapsFactory::Version110(),
"#version 110\n"
"varying float test;\n"
@@ -304,7 +304,7 @@
DEF_TEST(SkSLUsesPrecisionModifiers, r) {
test(r,
- "void main() { half x = 0.75; highfloat y = 1; x++; y++;"
+ "void main() { half x = 0.75; float y = 1; x++; y++;"
"sk_FragColor.rg = half2(x, y); }",
*SkSL::ShaderCapsFactory::Default(),
"#version 400\n"
@@ -317,7 +317,7 @@
" sk_FragColor.xy = vec2(x, y);\n"
"}\n");
test(r,
- "void main() { half x = 0.75; highfloat y = 1; x++; y++;"
+ "void main() { half x = 0.75; float y = 1; x++; y++;"
"sk_FragColor.rg = half2(x, y); }",
*SkSL::ShaderCapsFactory::UsesPrecisionModifiers(),
"#version 400\n"
@@ -335,7 +335,7 @@
DEF_TEST(SkSLMinAbs, r) {
test(r,
"void main() {"
- "highfloat x = -5;"
+ "float x = -5;"
"sk_FragColor.r = min(abs(x), 6);"
"}",
*SkSL::ShaderCapsFactory::Default(),
@@ -347,7 +347,7 @@
test(r,
"void main() {"
- "highfloat x = -5.0;"
+ "float x = -5.0;"
"sk_FragColor.r = min(abs(x), 6.0);"
"}",
*SkSL::ShaderCapsFactory::CannotUseMinAndAbsTogether(),
@@ -364,7 +364,7 @@
DEF_TEST(SkSLFractNegative, r) {
static constexpr char input[] =
"void main() {"
- "highfloat x = -42.0;"
+ "float x = -42.0;"
"sk_FragColor.r = fract(x);"
"}";
static constexpr char output_default[] =
@@ -386,7 +386,7 @@
DEF_TEST(SkSLNegatedAtan, r) {
test(r,
- "void main() { highfloat2 x = highfloat2(sqrt(2)); sk_FragColor.r = atan(x.x, -x.y); }",
+ "void main() { float2 x = float2(sqrt(2)); sk_FragColor.r = atan(x.x, -x.y); }",
*SkSL::ShaderCapsFactory::Default(),
"#version 400\n"
"out vec4 sk_FragColor;\n"
@@ -395,7 +395,7 @@
" sk_FragColor.x = atan(x.x, -x.y);\n"
"}\n");
test(r,
- "void main() { highfloat2 x = highfloat2(sqrt(2)); sk_FragColor.r = atan(x.x, -x.y); }",
+ "void main() { float2 x = float2(sqrt(2)); sk_FragColor.r = atan(x.x, -x.y); }",
*SkSL::ShaderCapsFactory::MustForceNegatedAtanParamToFloat(),
"#version 400\n"
"out vec4 sk_FragColor;\n"
@@ -466,13 +466,13 @@
DEF_TEST(SkSLVectorConstructors, r) {
test(r,
- "highfloat2 v1 = highfloat2(1);"
- "highfloat2 v2 = highfloat2(1, 2);"
- "highfloat2 v3 = highfloat2(highfloat2(1));"
- "highfloat3 v4 = highfloat3(highfloat2(1), 1.0);"
+ "float2 v1 = float2(1);"
+ "float2 v2 = float2(1, 2);"
+ "float2 v3 = float2(float2(1));"
+ "float3 v4 = float3(float2(1), 1.0);"
"int2 v5 = int2(1);"
- "int2 v6 = int2(highfloat2(1, 2));"
- "highfloat2 v7 = highfloat2(int2(1, 2));",
+ "int2 v6 = int2(float2(1, 2));"
+ "float2 v7 = float2(int2(1, 2));",
*SkSL::ShaderCapsFactory::Default(),
"#version 400\n"
"out vec4 sk_FragColor;\n"
@@ -487,9 +487,9 @@
DEF_TEST(SkSLArrayConstructors, r) {
test(r,
- "highfloat test1[] = highfloat[](1, 2, 3, 4);"
- "highfloat2 test2[] = highfloat2[](highfloat2(1, 2), highfloat2(3, 4));"
- "highfloat4x4 test3[] = highfloat4x4[]();",
+ "float test1[] = float[](1, 2, 3, 4);"
+ "float2 test2[] = float2[](float2(1, 2), float2(3, 4));"
+ "float4x4 test3[] = float4x4[]();",
*SkSL::ShaderCapsFactory::Default(),
"#version 400\n"
"out vec4 sk_FragColor;\n"
@@ -717,55 +717,55 @@
DEF_TEST(SkSLVecFolding, r) {
test(r,
"void main() {"
- "sk_FragColor.r = highfloat4(0.5, 1, 1, 1).x;"
- "sk_FragColor = highfloat4(highfloat2(1), highfloat2(2, 3)) + highfloat4(5, 6, 7, 8);"
- "sk_FragColor = highfloat4(8, highfloat3(10)) - highfloat4(1);"
- "sk_FragColor = highfloat4(2) * highfloat4(1, 2, 3, 4);"
- "sk_FragColor = highfloat4(12) / highfloat4(1, 2, 3, 4);"
- "sk_FragColor.r = (highfloat4(12) / highfloat4(1, 2, 3, 4)).y;"
- "sk_FragColor.x = highfloat4(1) == highfloat4(1) ? 1.0 : -1.0;"
- "sk_FragColor.x = highfloat4(1) == highfloat4(2) ? 2.0 : -2.0;"
- "sk_FragColor.x = highfloat2(1) == highfloat2(1, 1) ? 3.0 : -3.0;"
- "sk_FragColor.x = highfloat2(1, 1) == highfloat2(1, 1) ? 4.0 : -4.0;"
- "sk_FragColor.x = highfloat2(1) == highfloat2(1, 0) ? 5.0 : -5.0;"
- "sk_FragColor.x = highfloat4(1) == highfloat4(highfloat2(1), highfloat2(1)) ? 6.0 : -6.0;"
- "sk_FragColor.x = highfloat4(highfloat3(1), 1) == highfloat4(highfloat2(1), highfloat2(1)) ? 7.0 : -7.0;"
- "sk_FragColor.x = highfloat4(highfloat3(1), 1) == highfloat4(highfloat2(1), 1, 0) ? 8.0 : -8.0;"
- "sk_FragColor.x = highfloat2(1) != highfloat2(1, 0) ? 9.0 : -9.0;"
- "sk_FragColor.x = highfloat4(1) != highfloat4(highfloat2(1), highfloat2(1)) ? 10.0 : -10.0;"
- "sk_FragColor = highfloat4(sqrt(1)) * highfloat4(1);"
- "sk_FragColor = highfloat4(1) * highfloat4(sqrt(2));"
- "sk_FragColor = highfloat4(0) * highfloat4(sqrt(3));"
- "sk_FragColor = highfloat4(sqrt(4)) * highfloat4(0);"
- "sk_FragColor = highfloat4(0) / highfloat4(sqrt(5));"
- "sk_FragColor = highfloat4(0) + highfloat4(sqrt(6));"
- "sk_FragColor = highfloat4(sqrt(7)) + highfloat4(0);"
- "sk_FragColor = highfloat4(sqrt(8)) - highfloat4(0);"
- "sk_FragColor = highfloat4(0) + sqrt(9);"
- "sk_FragColor = highfloat4(0) * sqrt(10);"
- "sk_FragColor = highfloat4(0) / sqrt(11);"
- "sk_FragColor = highfloat4(1) * sqrt(12);"
- "sk_FragColor = 0 + highfloat4(sqrt(13));"
- "sk_FragColor = 0 * highfloat4(sqrt(14));"
- "sk_FragColor = 0 / highfloat4(sqrt(15));"
- "sk_FragColor = 1 * highfloat4(sqrt(16));"
- "sk_FragColor = highfloat4(sqrt(17)) + 0;"
- "sk_FragColor = highfloat4(sqrt(18)) * 0;"
- "sk_FragColor = highfloat4(sqrt(19)) * 1;"
- "sk_FragColor = highfloat4(sqrt(19.5)) - 0;"
- "sk_FragColor = sqrt(20) * highfloat4(1);"
- "sk_FragColor = sqrt(21) + highfloat4(0);"
- "sk_FragColor = sqrt(22) - highfloat4(0);"
- "sk_FragColor = sqrt(23) / highfloat4(1);"
- "sk_FragColor = highfloat4(sqrt(24)) / 1;"
- "sk_FragColor += highfloat4(1);"
- "sk_FragColor += highfloat4(0);"
- "sk_FragColor -= highfloat4(1);"
- "sk_FragColor -= highfloat4(0);"
- "sk_FragColor *= highfloat4(1);"
- "sk_FragColor *= highfloat4(2);"
- "sk_FragColor /= highfloat4(1);"
- "sk_FragColor /= highfloat4(2);"
+ "sk_FragColor.r = float4(0.5, 1, 1, 1).x;"
+ "sk_FragColor = float4(float2(1), float2(2, 3)) + float4(5, 6, 7, 8);"
+ "sk_FragColor = float4(8, float3(10)) - float4(1);"
+ "sk_FragColor = float4(2) * float4(1, 2, 3, 4);"
+ "sk_FragColor = float4(12) / float4(1, 2, 3, 4);"
+ "sk_FragColor.r = (float4(12) / float4(1, 2, 3, 4)).y;"
+ "sk_FragColor.x = float4(1) == float4(1) ? 1.0 : -1.0;"
+ "sk_FragColor.x = float4(1) == float4(2) ? 2.0 : -2.0;"
+ "sk_FragColor.x = float2(1) == float2(1, 1) ? 3.0 : -3.0;"
+ "sk_FragColor.x = float2(1, 1) == float2(1, 1) ? 4.0 : -4.0;"
+ "sk_FragColor.x = float2(1) == float2(1, 0) ? 5.0 : -5.0;"
+ "sk_FragColor.x = float4(1) == float4(float2(1), float2(1)) ? 6.0 : -6.0;"
+ "sk_FragColor.x = float4(float3(1), 1) == float4(float2(1), float2(1)) ? 7.0 : -7.0;"
+ "sk_FragColor.x = float4(float3(1), 1) == float4(float2(1), 1, 0) ? 8.0 : -8.0;"
+ "sk_FragColor.x = float2(1) != float2(1, 0) ? 9.0 : -9.0;"
+ "sk_FragColor.x = float4(1) != float4(float2(1), float2(1)) ? 10.0 : -10.0;"
+ "sk_FragColor = float4(sqrt(1)) * float4(1);"
+ "sk_FragColor = float4(1) * float4(sqrt(2));"
+ "sk_FragColor = float4(0) * float4(sqrt(3));"
+ "sk_FragColor = float4(sqrt(4)) * float4(0);"
+ "sk_FragColor = float4(0) / float4(sqrt(5));"
+ "sk_FragColor = float4(0) + float4(sqrt(6));"
+ "sk_FragColor = float4(sqrt(7)) + float4(0);"
+ "sk_FragColor = float4(sqrt(8)) - float4(0);"
+ "sk_FragColor = float4(0) + sqrt(9);"
+ "sk_FragColor = float4(0) * sqrt(10);"
+ "sk_FragColor = float4(0) / sqrt(11);"
+ "sk_FragColor = float4(1) * sqrt(12);"
+ "sk_FragColor = 0 + float4(sqrt(13));"
+ "sk_FragColor = 0 * float4(sqrt(14));"
+ "sk_FragColor = 0 / float4(sqrt(15));"
+ "sk_FragColor = 1 * float4(sqrt(16));"
+ "sk_FragColor = float4(sqrt(17)) + 0;"
+ "sk_FragColor = float4(sqrt(18)) * 0;"
+ "sk_FragColor = float4(sqrt(19)) * 1;"
+ "sk_FragColor = float4(sqrt(19.5)) - 0;"
+ "sk_FragColor = sqrt(20) * float4(1);"
+ "sk_FragColor = sqrt(21) + float4(0);"
+ "sk_FragColor = sqrt(22) - float4(0);"
+ "sk_FragColor = sqrt(23) / float4(1);"
+ "sk_FragColor = float4(sqrt(24)) / 1;"
+ "sk_FragColor += float4(1);"
+ "sk_FragColor += float4(0);"
+ "sk_FragColor -= float4(1);"
+ "sk_FragColor -= float4(0);"
+ "sk_FragColor *= float4(1);"
+ "sk_FragColor *= float4(2);"
+ "sk_FragColor /= float4(1);"
+ "sk_FragColor /= float4(2);"
"}",
*SkSL::ShaderCapsFactory::Default(),
"#version 400\n"
@@ -822,24 +822,24 @@
DEF_TEST(SkSLMatFolding, r) {
test(r,
"void main() {"
- "sk_FragColor.x = highfloat2x2(highfloat2(1.0, 0.0), highfloat2(0.0, 1.0)) == "
- "highfloat2x2(highfloat2(1.0, 0.0), highfloat2(0.0, 1.0)) ? 1 : -1;"
- "sk_FragColor.x = highfloat2x2(highfloat2(1.0, 0.0), highfloat2(1.0, 1.0)) == "
- "highfloat2x2(highfloat2(1.0, 0.0), highfloat2(0.0, 1.0)) ? 2 : -2;"
- "sk_FragColor.x = highfloat2x2(1) == highfloat2x2(1) ? 3 : -3;"
- "sk_FragColor.x = highfloat2x2(1) == highfloat2x2(0) ? 4 : -4;"
- "sk_FragColor.x = highfloat2x2(1) == highfloat2x2(highfloat2(1.0, 0.0), highfloat2(0.0, 1.0)) ? 5 : -5;"
- "sk_FragColor.x = highfloat2x2(2) == highfloat2x2(highfloat2(1.0, 0.0), highfloat2(0.0, 1.0)) ? 6 : -6;"
- "sk_FragColor.x = highfloat3x2(2) == highfloat3x2(highfloat2(2.0, 0.0), highfloat2(0.0, 2.0), highfloat2(0.0))"
+ "sk_FragColor.x = float2x2(float2(1.0, 0.0), float2(0.0, 1.0)) == "
+ "float2x2(float2(1.0, 0.0), float2(0.0, 1.0)) ? 1 : -1;"
+ "sk_FragColor.x = float2x2(float2(1.0, 0.0), float2(1.0, 1.0)) == "
+ "float2x2(float2(1.0, 0.0), float2(0.0, 1.0)) ? 2 : -2;"
+ "sk_FragColor.x = float2x2(1) == float2x2(1) ? 3 : -3;"
+ "sk_FragColor.x = float2x2(1) == float2x2(0) ? 4 : -4;"
+ "sk_FragColor.x = float2x2(1) == float2x2(float2(1.0, 0.0), float2(0.0, 1.0)) ? 5 : -5;"
+ "sk_FragColor.x = float2x2(2) == float2x2(float2(1.0, 0.0), float2(0.0, 1.0)) ? 6 : -6;"
+ "sk_FragColor.x = float3x2(2) == float3x2(float2(2.0, 0.0), float2(0.0, 2.0), float2(0.0))"
"? 7 : -7;"
- "sk_FragColor.x = highfloat2x2(1) != highfloat2x2(1) ? 8 : -8;"
- "sk_FragColor.x = highfloat2x2(1) != highfloat2x2(0) ? 9 : -9;"
- "sk_FragColor.x = highfloat3x3(highfloat3(1.0, 0.0, 0.0), highfloat3(0.0, 1.0, 0.0), "
- "highfloat3(0.0, 0.0, 0.0)) == highfloat3x3(highfloat2x2(1.0)) ? 10 : -10;"
- "sk_FragColor.x = highfloat2x2(highfloat3x3(1.0)) == highfloat2x2(1.0) ? 11 : -11;"
- "sk_FragColor.x = highfloat2x2(highfloat4(1.0, 0.0, 0.0, 1.0)) == highfloat2x2(1.0) ? 12 : -12;"
- "sk_FragColor.x = highfloat2x2(1.0, 0.0, highfloat2(0.0, 1.0)) == highfloat2x2(1.0) ? 13 : -13;"
- "sk_FragColor.x = highfloat2x2(highfloat2(1.0, 0.0), 0.0, 1.0) == highfloat2x2(1.0) ? 14 : -14;"
+ "sk_FragColor.x = float2x2(1) != float2x2(1) ? 8 : -8;"
+ "sk_FragColor.x = float2x2(1) != float2x2(0) ? 9 : -9;"
+ "sk_FragColor.x = float3x3(float3(1.0, 0.0, 0.0), float3(0.0, 1.0, 0.0), "
+ "float3(0.0, 0.0, 0.0)) == float3x3(float2x2(1.0)) ? 10 : -10;"
+ "sk_FragColor.x = float2x2(float3x3(1.0)) == float2x2(1.0) ? 11 : -11;"
+ "sk_FragColor.x = float2x2(float4(1.0, 0.0, 0.0, 1.0)) == float2x2(1.0) ? 12 : -12;"
+ "sk_FragColor.x = float2x2(1.0, 0.0, float2(0.0, 1.0)) == float2x2(1.0) ? 13 : -13;"
+ "sk_FragColor.x = float2x2(float2(1.0, 0.0), 0.0, 1.0) == float2x2(1.0) ? 14 : -14;"
"}",
*SkSL::ShaderCapsFactory::Default(),
"#version 400\n"
@@ -906,10 +906,10 @@
"uniform sampler1D one;"
"uniform sampler2D two;"
"void main() {"
- "highfloat4 a = texture(one, 0);"
- "highfloat4 b = texture(two, highfloat2(0));"
- "highfloat4 c = texture(one, highfloat2(0));"
- "highfloat4 d = texture(two, highfloat3(0));"
+ "float4 a = texture(one, 0);"
+ "float4 b = texture(two, float2(0));"
+ "float4 c = texture(one, float2(0));"
+ "float4 d = texture(two, float3(0));"
"sk_FragColor = half4(a.x, b.x, c.x, d.x);"
"}",
*SkSL::ShaderCapsFactory::Default(),
@@ -928,10 +928,10 @@
"uniform sampler1D one;"
"uniform sampler2D two;"
"void main() {"
- "highfloat4 a = texture(one, 0);"
- "highfloat4 b = texture(two, highfloat2(0));"
- "highfloat4 c = texture(one, highfloat2(0));"
- "highfloat4 d = texture(two, highfloat3(0));"
+ "float4 a = texture(one, 0);"
+ "float4 b = texture(two, float2(0));"
+ "float4 c = texture(one, float2(0));"
+ "float4 d = texture(two, float3(0));"
"sk_FragColor = half4(a.x, b.x, c.x, d.x);"
"}",
*SkSL::ShaderCapsFactory::Version110(),
@@ -1058,9 +1058,9 @@
DEF_TEST(SkSLArrayTypes, r) {
test(r,
- "void main() { highfloat2 x[2] = highfloat2[2](highfloat2(1), highfloat2(2));"
- "highfloat2[2] y = highfloat2[2](highfloat2(3), highfloat2(4));"
- "sk_FragColor = highfloat4(x[0], y[1]); }",
+ "void main() { float2 x[2] = float2[2](float2(1), float2(2));"
+ "float2[2] y = float2[2](float2(3), float2(4));"
+ "sk_FragColor = float4(x[0], y[1]); }",
*SkSL::ShaderCapsFactory::Default(),
"#version 400\n"
"out vec4 sk_FragColor;\n"
@@ -1076,9 +1076,9 @@
"layout(invocations = 2) in;"
"layout(line_strip, max_vertices = 2) out;"
"void main() {"
- "gl_Position = sk_in[0].gl_Position + highfloat4(-0.5, 0, 0, sk_InvocationID);"
+ "gl_Position = sk_in[0].gl_Position + float4(-0.5, 0, 0, sk_InvocationID);"
"EmitVertex();"
- "gl_Position = sk_in[0].gl_Position + highfloat4(0.5, 0, 0, sk_InvocationID);"
+ "gl_Position = sk_in[0].gl_Position + float4(0.5, 0, 0, sk_InvocationID);"
"EmitVertex();"
"EndPrimitive();"
"}",
@@ -1101,7 +1101,7 @@
// basic "does a switch even work" test
test(r,
"void main() {"
- " highfloat x;"
+ " float x;"
" switch (int(sqrt(1))) {"
" case 0:"
" x = 0.0;"
@@ -1112,7 +1112,7 @@
" default:"
" x = 2.0;"
" }"
- " sk_FragColor = highfloat4(x);"
+ " sk_FragColor = float4(x);"
"}",
*SkSL::ShaderCapsFactory::Default(),
"#version 400\n"
@@ -1134,7 +1134,7 @@
// dead code inside of switch
test(r,
"void main() {"
- " highfloat x;"
+ " float x;"
" switch (int(sqrt(2))) {"
" case 0:"
" x = 0.0;"
@@ -1162,7 +1162,7 @@
// non-static test w/ fallthrough
test(r,
"void main() {"
- " highfloat x = 0.0;"
+ " float x = 0.0;"
" switch (int(sqrt(3))) {"
" case 0:"
" x = 0.0;"
@@ -1187,7 +1187,7 @@
// static test w/ fallthrough
test(r,
"void main() {"
- " highfloat x = 0.0;"
+ " float x = 0.0;"
" switch (0) {"
" case 0:"
" x = 0.0;"
@@ -1205,7 +1205,7 @@
// static test w/ fallthrough, different entry point
test(r,
"void main() {"
- " highfloat x = 0.0;"
+ " float x = 0.0;"
" switch (1) {"
" case 0:"
" x = 0.0;"
@@ -1223,7 +1223,7 @@
// static test w/ break
test(r,
"void main() {"
- " highfloat x = 0.0;"
+ " float x = 0.0;"
" switch (0) {"
" case 0:"
" x = 0.0;"
@@ -1242,7 +1242,7 @@
// static test w/ static conditional break
test(r,
"void main() {"
- " highfloat x = 0.0;"
+ " float x = 0.0;"
" switch (0) {"
" case 0:"
" x = 0.0;"
@@ -1261,7 +1261,7 @@
// static test w/ non-static conditional break
test(r,
"void main() {"
- " highfloat x = 0.0;"
+ " float x = 0.0;"
" switch (0) {"
" case 0:"
" x = 0.0;"
@@ -1291,7 +1291,7 @@
test(r,
"uniform sampler2D test;"
"void main() {"
- " sk_FragColor = texture(test, highfloat2(0.5));"
+ " sk_FragColor = texture(test, float2(0.5));"
"}",
*SkSL::ShaderCapsFactory::Default(),
"#version 400\n"
@@ -1303,7 +1303,7 @@
test(r,
"uniform sampler2DRect test;"
"void main() {"
- " sk_FragColor = texture(test, highfloat2(0.5));"
+ " sk_FragColor = texture(test, float2(0.5));"
"}",
*SkSL::ShaderCapsFactory::Default(),
"#version 400\n"
@@ -1315,7 +1315,7 @@
test(r,
"uniform sampler2DRect test;"
"void main() {"
- " sk_FragColor = texture(test, highfloat3(0.5));"
+ " sk_FragColor = texture(test, float3(0.5));"
"}",
*SkSL::ShaderCapsFactory::Default(),
"#version 400\n"
@@ -1329,12 +1329,12 @@
DEF_TEST(SkSLUnusedVars, r) {
test(r,
"void main() {"
- "highfloat a = 1, b = 2, c = 3;"
- "highfloat d = c;"
- "highfloat e = d;"
+ "float a = 1, b = 2, c = 3;"
+ "float d = c;"
+ "float e = d;"
"b++;"
"d++;"
- "sk_FragColor = highfloat4(b, b, d, d);"
+ "sk_FragColor = float4(b, b, d, d);"
"}",
*SkSL::ShaderCapsFactory::Default(),
"#version 400\n"
@@ -1351,11 +1351,11 @@
DEF_TEST(SkSLMultipleAssignments, r) {
test(r,
"void main() {"
- "highfloat x;"
- "highfloat y;"
+ "float x;"
+ "float y;"
"int z;"
"x = y = z = 1;"
- "sk_FragColor = highfloat4(z);"
+ "sk_FragColor = float4(z);"
"}",
*SkSL::ShaderCapsFactory::Default(),
"#version 400\n"
@@ -1367,13 +1367,13 @@
DEF_TEST(SkSLComplexDelete, r) {
test(r,
- "uniform highfloat4x4 colorXform;"
+ "uniform float4x4 colorXform;"
"uniform sampler2D sampler;"
"void main() {"
- "highfloat4 tmpColor;"
- "sk_FragColor = highfloat4(1.0) * (tmpColor = texture(sampler, highfloat2(1)) , "
- "colorXform != highfloat4x4(1.0) ? highfloat4(clamp((highfloat4x4(colorXform) * "
- "highfloat4(tmpColor.xyz, 1.0)).xyz, "
+ "float4 tmpColor;"
+ "sk_FragColor = float4(1.0) * (tmpColor = texture(sampler, float2(1)) , "
+ "colorXform != float4x4(1.0) ? float4(clamp((float4x4(colorXform) * "
+ "float4(tmpColor.xyz, 1.0)).xyz, "
"0.0, tmpColor.w), tmpColor.w) : tmpColor);"
"}",
*SkSL::ShaderCapsFactory::Default(),
@@ -1392,8 +1392,8 @@
DEF_TEST(SkSLDependentInitializers, r) {
test(r,
"void main() {"
- "highfloat x = 0.5, y = x * 2;"
- "sk_FragColor = highfloat4(y);"
+ "float x = 0.5, y = x * 2;"
+ "sk_FragColor = float4(y);"
"}",
*SkSL::ShaderCapsFactory::Default(),
"#version 400\n"
@@ -1427,11 +1427,11 @@
"layout(invocations = 2) in;"
"layout(line_strip, max_vertices = 2) out;"
"void test() {"
- "gl_Position = sk_in[0].gl_Position + highfloat4(0.5, 0, 0, sk_InvocationID);"
+ "gl_Position = sk_in[0].gl_Position + float4(0.5, 0, 0, sk_InvocationID);"
"EmitVertex();"
"}"
"void main() {"
- "gl_Position = sk_in[0].gl_Position + highfloat4(-0.5, 0, 0, sk_InvocationID);"
+ "gl_Position = sk_in[0].gl_Position + float4(-0.5, 0, 0, sk_InvocationID);"
"EmitVertex();"
"}",
*SkSL::ShaderCapsFactory::MustImplementGSInvocationsWithLoop(),
@@ -1458,13 +1458,13 @@
DEF_TEST(SkSLTypePrecision, r) {
test(r,
- "highfloat f = 1;"
+ "float f = 1;"
"half h = 2;"
"double d = 3;"
- "highfloat2 f2 = highfloat2(1, 2);"
+ "float2 f2 = float2(1, 2);"
"half3 h3 = half3(1, 2, 3);"
"double4 d4 = double4(1, 2, 3, 4);"
- "highfloat2x2 f22 = highfloat2x2(1, 2, 3, 4);"
+ "float2x2 f22 = float2x2(1, 2, 3, 4);"
"half2x4 h24 = half2x4(1, 2, 3, 4, 5, 6, 7, 8);"
"double4x2 d42 = double4x2(1, 2, 3, 4, 5, 6, 7, 8);",
*SkSL::ShaderCapsFactory::Default(),
@@ -1480,11 +1480,11 @@
"mat2x4 h24 = mat2x4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0);\n"
"dmat4x2 d42 = dmat4x2(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0);\n");
test(r,
- "highfloat f = 1;"
+ "float f = 1;"
"half h = 2;"
- "highfloat2 f2 = highfloat2(1, 2);"
+ "float2 f2 = float2(1, 2);"
"half3 h3 = half3(1, 2, 3);"
- "highfloat2x2 f22 = highfloat2x2(1, 2, 3, 4);"
+ "float2x2 f22 = float2x2(1, 2, 3, 4);"
"half2x4 h24 = half2x4(1, 2, 3, 4, 5, 6, 7, 8);",
*SkSL::ShaderCapsFactory::UsesPrecisionModifiers(),
"#version 400\n"
@@ -1505,7 +1505,7 @@
"ushort us = ushort(sqrt(1));"
"uint ui = uint(sqrt(1));"
"half h = sqrt(1);"
- "highfloat f = sqrt(1);"
+ "float f = sqrt(1);"
"short s2s = s;"
"short i2s = i;"
"short us2s = short(us);"
@@ -1530,12 +1530,12 @@
"uint ui2ui = ui;"
"uint h2ui = uint(h);"
"uint f2ui = uint(f);"
- "highfloat s2f = s;"
- "highfloat i2f = i;"
- "highfloat us2f = us;"
- "highfloat ui2f = ui;"
- "highfloat h2f = h;"
- "highfloat f2f = f;",
+ "float s2f = s;"
+ "float i2f = i;"
+ "float us2f = us;"
+ "float ui2f = ui;"
+ "float h2f = h;"
+ "float f2f = f;",
*SkSL::ShaderCapsFactory::Default(),
"#version 400\n"
"out vec4 sk_FragColor;\n"