AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Add missing mix(genIType, genIType, genBType) to sksl_public."

Browse Source 
This reverts commit d33334d44e.

Reason for revert: this isn't available in ES3! Only 4.5.
http://screen/9VstoY9RQkufqm3

Original change's description:
> Add missing mix(genIType, genIType, genBType) to sksl_public.
>
> Change-Id: I8d4816f726196e6f4a5fbb0940b5dd1b2d7db7f5
> Bug: skia:11209
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/503821
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
> Auto-Submit: John Stiles <johnstiles@google.com>

Bug: skia:11209
Change-Id: Iad4e95ca89b79066d3a1be42605b4338b542638f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/503831
Auto-Submit: John Stiles <johnstiles@google.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
This commit is contained in:
John Stiles 2022-02-03 20:42:59 +00:00 committed by SkCQ
parent 7cb61889c5
commit 9cce961d3b
3 changed files with 799 additions and 821 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1617
src/sksl/generated/sksl_public.dehydrated.sksl
View File

File diff suppressed because it is too large Load Diff

1
src/sksl/sksl_public.sksl
View File

@ -121,7 +121,6 @@ $es3 $genUType clamp($genUType x, $genUType minVal, $genUType maxVal);
$es3 $genUType clamp($genUType x, uint minVal, uint maxVal); $es3 $genUType clamp($genUType x, uint minVal, uint maxVal);
$es3 $genType mix($genType x, $genType y, $genBType a); $es3 $genType mix($genType x, $genType y, $genBType a);
$es3 $genHType mix($genHType x, $genHType y, $genBType a); $es3 $genHType mix($genHType x, $genHType y, $genBType a);
$es3 $genIType mix($genIType x, $genIType y, $genBType a);
// 8.3 : Common Functions (GLSL ES 3.0) -- cannot be used in constant-expressions // 8.3 : Common Functions (GLSL ES 3.0) -- cannot be used in constant-expressions
$es3 $genBType isnan($genType x); $es3 $genBType isnan($genType x);

2
tests/SkSLTest.cpp
View File

@ -328,7 +328,6 @@ SKSL_TEST(SkSLIntrinsicMaxFloat, "intrinsics/MaxFloat.sksl")
SKSL_TEST(SkSLIntrinsicMinFloat, "intrinsics/MinFloat.sksl") SKSL_TEST(SkSLIntrinsicMinFloat, "intrinsics/MinFloat.sksl")
// Fails on Adreno + Vulkan (skia:11919) // Fails on Adreno + Vulkan (skia:11919)
SKSL_TEST_CPU(SkSLIntrinsicMixFloat, "intrinsics/MixFloat.sksl") SKSL_TEST_CPU(SkSLIntrinsicMixFloat, "intrinsics/MixFloat.sksl")
SKSL_TEST_ES3(SkSLIntrinsicMixBool, "intrinsics/MixBool.sksl")
SKSL_TEST_ES3(SkSLIntrinsicModf, "intrinsics/Modf.sksl") SKSL_TEST_ES3(SkSLIntrinsicModf, "intrinsics/Modf.sksl")
SKSL_TEST_ES3(SkSLIntrinsicOuterProduct, "intrinsics/OuterProduct.sksl") SKSL_TEST_ES3(SkSLIntrinsicOuterProduct, "intrinsics/OuterProduct.sksl")
// Fails on Mac OpenGL + Radeon 5300M (skia:12434) // Fails on Mac OpenGL + Radeon 5300M (skia:12434)
@ -445,4 +444,5 @@ TODO(skia:11209): enable these tests when Runtime Effects have support for ES3
SKSL_TEST(SkSLIntrinsicAbsInt, "intrinsics/AbsInt.sksl") SKSL_TEST(SkSLIntrinsicAbsInt, "intrinsics/AbsInt.sksl")
SKSL_TEST(SkSLIntrinsicMaxInt, "intrinsics/MaxInt.sksl") SKSL_TEST(SkSLIntrinsicMaxInt, "intrinsics/MaxInt.sksl")
SKSL_TEST(SkSLIntrinsicMinInt, "intrinsics/MinInt.sksl") SKSL_TEST(SkSLIntrinsicMinInt, "intrinsics/MinInt.sksl")
SKSL_TEST(SkSLIntrinsicMixBool, "intrinsics/MixBool.sksl")
*/ */