diff --git a/src/sksl/generated/sksl_public.dehydrated.sksl b/src/sksl/generated/sksl_public.dehydrated.sksl
index c2e4fb7cf4..22c3f4acd0 100644
--- a/src/sksl/generated/sksl_public.dehydrated.sksl
+++ b/src/sksl/generated/sksl_public.dehydrated.sksl
@@ -143,7 +143,7 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {5,0,227,3,
 3,100,115,116,
 1,98,
 7,98,108,101,110,100,101,114,
-49,1,139,2,
+49,1,144,2,
 53,1,0,
 17,2,0,
 50,2,0,10,0,3,
@@ -1256,27 +1256,31 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {5,0,227,3,
 48,90,1,
 53,91,1,
 17,55,0,
-48,2,0,3,
-29,92,1,
-38,
-16,0,2,0,0,145,1,1,91,1,
-48,83,1,
+48,12,1,3,
+53,92,1,
+17,67,0,
+48,12,1,3,
 53,93,1,
-17,55,0,
-48,5,0,3,
-52,94,1,2,
-48,92,1,
+17,233,0,
+48,83,1,3,
+52,94,1,7,
+48,217,0,
+48,222,0,
+48,227,0,
+48,232,0,
+48,85,1,
+48,90,1,
 29,95,1,
 38,
-16,0,2,0,0,145,1,1,93,1,
-48,83,1,
+16,0,2,0,0,235,0,3,91,1,92,1,93,1,
+48,12,1,
 48,95,1,
 53,96,1,
 17,55,0,
 48,2,0,3,
 29,97,1,
 38,
-16,0,2,0,0,151,1,1,96,1,
+16,0,2,0,0,145,1,1,96,1,
 48,83,1,
 53,98,1,
 17,55,0,
@@ -1285,259 +1289,261 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {5,0,227,3,
 48,97,1,
 29,100,1,
 38,
-16,0,2,0,0,151,1,1,98,1,
+16,0,2,0,0,145,1,1,98,1,
 48,83,1,
 48,100,1,
 53,101,1,
 17,55,0,
 48,2,0,3,
-53,102,1,
+29,102,1,
+38,
+16,0,2,0,0,151,1,1,101,1,
+48,83,1,
+53,103,1,
+17,55,0,
+48,5,0,3,
+52,104,1,2,
+48,102,1,
+29,105,1,
+38,
+16,0,2,0,0,151,1,1,103,1,
+48,83,1,
+48,105,1,
+53,106,1,
+17,55,0,
+48,2,0,3,
+53,107,1,
 37,
 16,32,157,1,
 48,2,0,3,
-29,103,1,
+29,108,1,
 38,
-16,0,2,0,0,159,1,2,101,1,102,1,
+16,0,2,0,0,159,1,2,106,1,107,1,
 48,2,0,
-53,104,1,
+53,109,1,
 17,55,0,
 48,5,0,3,
-53,105,1,
+53,110,1,
 37,
 16,32,157,1,
 48,5,0,3,
-52,106,1,2,
-48,103,1,
-29,107,1,
-38,
-16,0,2,0,0,159,1,2,104,1,105,1,
-48,5,0,
-48,107,1,
-53,108,1,
-17,164,1,
-50,109,1,166,1,3,
-29,110,1,
-38,
-16,0,2,0,0,173,1,1,108,1,
-48,76,1,
-53,111,1,
-17,187,1,
-48,76,1,3,
+52,111,1,2,
+48,108,1,
 29,112,1,
 38,
-16,0,2,0,0,189,1,1,111,1,
-48,109,1,
+16,0,2,0,0,159,1,2,109,1,110,1,
+48,5,0,
+48,112,1,
 53,113,1,
-17,55,0,
-48,2,0,3,
-29,114,1,
-17,205,1,1,113,1,
-48,145,0,
-53,115,1,
-17,55,0,
-48,5,0,3,
-52,116,1,2,
-48,114,1,
+17,164,1,
+50,114,1,166,1,3,
+29,115,1,
+38,
+16,0,2,0,0,173,1,1,113,1,
+48,76,1,
+53,116,1,
+17,187,1,
+48,76,1,3,
 29,117,1,
-17,205,1,1,115,1,
-48,153,0,
-48,117,1,
+38,
+16,0,2,0,0,189,1,1,116,1,
+48,114,1,
 53,118,1,
-17,212,1,
-48,2,0,3,
-53,119,1,
-17,215,1,
-48,2,0,3,
-29,120,1,
-17,218,1,2,118,1,119,1,
-48,145,0,
-53,121,1,
-17,212,1,
-48,5,0,3,
-53,122,1,
-17,215,1,
-48,5,0,3,
-52,123,1,2,
-48,120,1,
-29,124,1,
-17,218,1,2,121,1,122,1,
-48,153,0,
-48,124,1,
-53,125,1,
 17,55,0,
 48,2,0,3,
+29,119,1,
+17,205,1,1,118,1,
+48,145,0,
+53,120,1,
+17,55,0,
+48,5,0,3,
+52,121,1,2,
+48,119,1,
+29,122,1,
+17,205,1,1,120,1,
+48,153,0,
+48,122,1,
+53,123,1,
+17,212,1,
+48,2,0,3,
+53,124,1,
+17,215,1,
+48,2,0,3,
+29,125,1,
+17,218,1,2,123,1,124,1,
+48,145,0,
 53,126,1,
+17,212,1,
+48,5,0,3,
+53,127,1,
+17,215,1,
+48,5,0,3,
+52,128,1,2,
+48,125,1,
+29,129,1,
+17,218,1,2,126,1,127,1,
+48,153,0,
+48,129,1,
+53,130,1,
+17,55,0,
+48,2,0,3,
+53,131,1,
 17,67,0,
 48,2,0,3,
-29,127,1,
-17,227,1,2,125,1,126,1,
+29,132,1,
+17,227,1,2,130,1,131,1,
 48,145,0,
-53,128,1,
+53,133,1,
 17,55,0,
 48,5,0,3,
-53,129,1,
-17,67,0,
-48,5,0,3,
-52,130,1,2,
-48,127,1,
-29,131,1,
-17,227,1,2,128,1,129,1,
-48,153,0,
-48,131,1,
-53,132,1,
-17,55,0,
-50,133,1,231,1,3,
 53,134,1,
 17,67,0,
-48,133,1,3,
-29,135,1,
-17,238,1,2,132,1,134,1,
-48,133,1,
-53,136,1,
+48,5,0,3,
+52,135,1,2,
+48,132,1,
+29,136,1,
+17,227,1,2,133,1,134,1,
+48,153,0,
+48,136,1,
+53,137,1,
 17,55,0,
-50,137,1,244,1,3,
-53,138,1,
+50,138,1,231,1,3,
+53,139,1,
 17,67,0,
-48,137,1,3,
-52,139,1,2,
-48,135,1,
+48,138,1,3,
 29,140,1,
-17,238,1,2,136,1,138,1,
-48,137,1,
-48,140,1,
+17,238,1,2,137,1,139,1,
+48,138,1,
 53,141,1,
 17,55,0,
-48,2,0,3,
-29,142,1,
-17,250,1,1,141,1,
-48,2,0,
+50,142,1,244,1,3,
 53,143,1,
-17,55,0,
-48,5,0,3,
+17,67,0,
+48,142,1,3,
 52,144,1,2,
-48,142,1,
+48,140,1,
 29,145,1,
-17,250,1,1,143,1,
-48,5,0,
+17,238,1,2,141,1,143,1,
+48,142,1,
 48,145,1,
 53,146,1,
-17,4,2,
-48,2,0,3,
-53,147,1,
-17,6,2,
+17,55,0,
 48,2,0,3,
+29,147,1,
+17,250,1,1,146,1,
+48,2,0,
 53,148,1,
-17,8,2,
-48,2,0,3,
-29,149,1,
-17,13,2,3,146,1,147,1,148,1,
-48,2,0,
-53,150,1,
-17,4,2,
+17,55,0,
 48,5,0,3,
+52,149,1,2,
+48,147,1,
+29,150,1,
+17,250,1,1,148,1,
+48,5,0,
+48,150,1,
 53,151,1,
+17,4,2,
+48,2,0,3,
+53,152,1,
+17,6,2,
+48,2,0,3,
+53,153,1,
+17,8,2,
+48,2,0,3,
+29,154,1,
+17,13,2,3,151,1,152,1,153,1,
+48,2,0,
+53,155,1,
+17,4,2,
+48,5,0,3,
+53,156,1,
 17,6,2,
 48,5,0,3,
-53,152,1,
+53,157,1,
 17,8,2,
 48,5,0,3,
-52,153,1,2,
-48,149,1,
-29,154,1,
-17,13,2,3,150,1,151,1,152,1,
-48,5,0,
+52,158,1,2,
 48,154,1,
-53,155,1,
-17,6,2,
-48,2,0,3,
-53,156,1,
-17,4,2,
-48,2,0,3,
-29,157,1,
-17,25,2,2,155,1,156,1,
-48,2,0,
-53,158,1,
-17,6,2,
-48,5,0,3,
-53,159,1,
-17,4,2,
-48,5,0,3,
-52,160,1,2,
-48,157,1,
-29,161,1,
-17,25,2,2,158,1,159,1,
+29,159,1,
+17,13,2,3,155,1,156,1,157,1,
 48,5,0,
-48,161,1,
-53,162,1,
+48,159,1,
+53,160,1,
 17,6,2,
 48,2,0,3,
-53,163,1,
+53,161,1,
 17,4,2,
 48,2,0,3,
+29,162,1,
+17,25,2,2,160,1,161,1,
+48,2,0,
+53,163,1,
+17,6,2,
+48,5,0,3,
 53,164,1,
+17,4,2,
+48,5,0,3,
+52,165,1,2,
+48,162,1,
+29,166,1,
+17,25,2,2,163,1,164,1,
+48,5,0,
+48,166,1,
+53,167,1,
+17,6,2,
+48,2,0,3,
+53,168,1,
+17,4,2,
+48,2,0,3,
+53,169,1,
 17,33,2,
 48,145,0,3,
-29,165,1,
-17,37,2,3,162,1,163,1,164,1,
+29,170,1,
+17,37,2,3,167,1,168,1,169,1,
 48,2,0,
-53,166,1,
+53,171,1,
 17,6,2,
 48,5,0,3,
-53,167,1,
+53,172,1,
 17,4,2,
 48,5,0,3,
-53,168,1,
+53,173,1,
 17,33,2,
 48,153,0,3,
-52,169,1,2,
-48,165,1,
-29,170,1,
-17,37,2,3,166,1,167,1,168,1,
-48,5,0,
+52,174,1,2,
 48,170,1,
-53,171,1,
+29,175,1,
+17,37,2,3,171,1,172,1,173,1,
+48,5,0,
+48,175,1,
+53,176,1,
 17,55,0,
-50,172,1,45,2,3,
-53,173,1,
+50,177,1,45,2,3,
+53,178,1,
 17,67,0,
-48,172,1,3,
-29,174,1,
-17,56,2,2,171,1,173,1,
-48,172,1,
-53,175,1,
-17,55,0,
-50,176,1,71,2,3,
-53,177,1,
-17,67,0,
-48,176,1,3,
-52,178,1,2,
-48,174,1,
+48,177,1,3,
 29,179,1,
-17,56,2,2,175,1,177,1,
-48,176,1,
-48,179,1,
+17,56,2,2,176,1,178,1,
+48,177,1,
 53,180,1,
 17,55,0,
-50,181,1,83,2,3,
+50,181,1,71,2,3,
 53,182,1,
 17,67,0,
 48,181,1,3,
-52,183,1,3,
-48,174,1,
+52,183,1,2,
 48,179,1,
 29,184,1,
-38,
-16,0,2,0,0,56,2,2,180,1,182,1,
+17,56,2,2,180,1,182,1,
 48,181,1,
 48,184,1,
 53,185,1,
 17,55,0,
-50,186,1,88,2,3,
+50,186,1,83,2,3,
 53,187,1,
 17,67,0,
 48,186,1,3,
-52,188,1,4,
-48,174,1,
+52,188,1,3,
 48,179,1,
 48,184,1,
 29,189,1,
@@ -1546,368 +1552,364 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {5,0,227,3,
 48,186,1,
 48,189,1,
 53,190,1,
-17,94,2,
-48,172,1,3,
-29,191,1,
-17,96,2,1,190,1,
-48,172,1,
+17,55,0,
+50,191,1,88,2,3,
 53,192,1,
-17,94,2,
-48,176,1,3,
-52,193,1,2,
-48,191,1,
+17,67,0,
+48,191,1,3,
+52,193,1,4,
+48,179,1,
+48,184,1,
+48,189,1,
 29,194,1,
-17,96,2,1,192,1,
-48,176,1,
+38,
+16,0,2,0,0,56,2,2,190,1,192,1,
+48,191,1,
 48,194,1,
 53,195,1,
 17,94,2,
-48,172,1,3,
+48,177,1,3,
 29,196,1,
-38,
-16,0,2,0,0,104,2,1,195,1,
-48,145,0,
+17,96,2,1,195,1,
+48,177,1,
 53,197,1,
 17,94,2,
-48,176,1,3,
+48,181,1,3,
 52,198,1,2,
 48,196,1,
 29,199,1,
-38,
-16,0,2,0,0,104,2,1,197,1,
-48,153,0,
+17,96,2,1,197,1,
+48,181,1,
 48,199,1,
 53,200,1,
 17,94,2,
-48,172,1,3,
+48,177,1,3,
 29,201,1,
 38,
-16,0,2,0,0,116,2,1,200,1,
-48,172,1,
+16,0,2,0,0,104,2,1,200,1,
+48,145,0,
 53,202,1,
 17,94,2,
-48,176,1,3,
+48,181,1,3,
 52,203,1,2,
 48,201,1,
 29,204,1,
 38,
-16,0,2,0,0,116,2,1,202,1,
-48,176,1,
+16,0,2,0,0,104,2,1,202,1,
+48,153,0,
 48,204,1,
 53,205,1,
 17,94,2,
-50,206,1,126,2,3,
-52,207,1,3,
-48,201,1,
-48,204,1,
-29,208,1,
+48,177,1,3,
+29,206,1,
 38,
 16,0,2,0,0,116,2,1,205,1,
-50,209,1,135,2,
-48,208,1,
+48,177,1,
+53,207,1,
+17,94,2,
+48,181,1,3,
+52,208,1,2,
+48,206,1,
+29,209,1,
+38,
+16,0,2,0,0,116,2,1,207,1,
+48,181,1,
+48,209,1,
 53,210,1,
 17,94,2,
-50,211,1,144,2,3,
-52,212,1,4,
-48,201,1,
-48,204,1,
-48,208,1,
+50,211,1,126,2,3,
+52,212,1,3,
+48,206,1,
+48,209,1,
 29,213,1,
 38,
 16,0,2,0,0,116,2,1,210,1,
-50,214,1,152,2,
+50,214,1,135,2,
 48,213,1,
 53,215,1,
 17,94,2,
-50,216,1,160,2,3,
-52,217,1,5,
-48,201,1,
-48,204,1,
-48,208,1,
+50,216,1,144,2,3,
+52,217,1,4,
+48,206,1,
+48,209,1,
 48,213,1,
 29,218,1,
 38,
 16,0,2,0,0,116,2,1,215,1,
-50,219,1,169,2,
+50,219,1,152,2,
 48,218,1,
 53,220,1,
 17,94,2,
-50,221,1,178,2,3,
-52,222,1,6,
-48,201,1,
-48,204,1,
-48,208,1,
+50,221,1,160,2,3,
+52,222,1,5,
+48,206,1,
+48,209,1,
 48,213,1,
 48,218,1,
 29,223,1,
 38,
 16,0,2,0,0,116,2,1,220,1,
-50,224,1,186,2,
+50,224,1,169,2,
 48,223,1,
 53,225,1,
 17,94,2,
-48,209,1,3,
-52,226,1,7,
-48,201,1,
-48,204,1,
-48,208,1,
+50,226,1,178,2,3,
+52,227,1,6,
+48,206,1,
+48,209,1,
 48,213,1,
 48,218,1,
 48,223,1,
-29,227,1,
+29,228,1,
 38,
 16,0,2,0,0,116,2,1,225,1,
-48,206,1,
-48,227,1,
-53,228,1,
+50,229,1,186,2,
+48,228,1,
+53,230,1,
 17,94,2,
 48,214,1,3,
-52,229,1,8,
-48,201,1,
-48,204,1,
-48,208,1,
+52,231,1,7,
+48,206,1,
+48,209,1,
 48,213,1,
 48,218,1,
 48,223,1,
-48,227,1,
-29,230,1,
+48,228,1,
+29,232,1,
 38,
-16,0,2,0,0,116,2,1,228,1,
+16,0,2,0,0,116,2,1,230,1,
 48,211,1,
-48,230,1,
-53,231,1,
+48,232,1,
+53,233,1,
 17,94,2,
-50,232,1,194,2,3,
-52,233,1,9,
-48,201,1,
-48,204,1,
-48,208,1,
+48,219,1,3,
+52,234,1,8,
+48,206,1,
+48,209,1,
 48,213,1,
 48,218,1,
 48,223,1,
-48,227,1,
-48,230,1,
-29,234,1,
+48,228,1,
+48,232,1,
+29,235,1,
 38,
-16,0,2,0,0,116,2,1,231,1,
-50,235,1,203,2,
-48,234,1,
+16,0,2,0,0,116,2,1,233,1,
+48,216,1,
+48,235,1,
 53,236,1,
 17,94,2,
-50,237,1,212,2,3,
-52,238,1,10,
-48,201,1,
-48,204,1,
-48,208,1,
+50,237,1,194,2,3,
+52,238,1,9,
+48,206,1,
+48,209,1,
 48,213,1,
 48,218,1,
 48,223,1,
-48,227,1,
-48,230,1,
-48,234,1,
+48,228,1,
+48,232,1,
+48,235,1,
 29,239,1,
 38,
 16,0,2,0,0,116,2,1,236,1,
-50,240,1,220,2,
+50,240,1,203,2,
 48,239,1,
 53,241,1,
 17,94,2,
-48,219,1,3,
-52,242,1,11,
-48,201,1,
-48,204,1,
-48,208,1,
+50,242,1,212,2,3,
+52,243,1,10,
+48,206,1,
+48,209,1,
 48,213,1,
 48,218,1,
 48,223,1,
-48,227,1,
-48,230,1,
-48,234,1,
+48,228,1,
+48,232,1,
+48,235,1,
 48,239,1,
-29,243,1,
+29,244,1,
 38,
 16,0,2,0,0,116,2,1,241,1,
-48,216,1,
-48,243,1,
-53,244,1,
+50,245,1,220,2,
+48,244,1,
+53,246,1,
 17,94,2,
 48,224,1,3,
-52,245,1,12,
-48,201,1,
-48,204,1,
-48,208,1,
+52,247,1,11,
+48,206,1,
+48,209,1,
 48,213,1,
 48,218,1,
 48,223,1,
-48,227,1,
-48,230,1,
-48,234,1,
-48,239,1,
-48,243,1,
-29,246,1,
-38,
-16,0,2,0,0,116,2,1,244,1,
-48,221,1,
-48,246,1,
-53,247,1,
-17,94,2,
-48,235,1,3,
-52,248,1,13,
-48,201,1,
-48,204,1,
-48,208,1,
-48,213,1,
-48,218,1,
-48,223,1,
-48,227,1,
-48,230,1,
-48,234,1,
-48,239,1,
-48,243,1,
-48,246,1,
-29,249,1,
-38,
-16,0,2,0,0,116,2,1,247,1,
+48,228,1,
 48,232,1,
-48,249,1,
-53,250,1,
+48,235,1,
+48,239,1,
+48,244,1,
+29,248,1,
+38,
+16,0,2,0,0,116,2,1,246,1,
+48,221,1,
+48,248,1,
+53,249,1,
+17,94,2,
+48,229,1,3,
+52,250,1,12,
+48,206,1,
+48,209,1,
+48,213,1,
+48,218,1,
+48,223,1,
+48,228,1,
+48,232,1,
+48,235,1,
+48,239,1,
+48,244,1,
+48,248,1,
+29,251,1,
+38,
+16,0,2,0,0,116,2,1,249,1,
+48,226,1,
+48,251,1,
+53,252,1,
 17,94,2,
 48,240,1,3,
-52,251,1,14,
-48,201,1,
-48,204,1,
-48,208,1,
+52,253,1,13,
+48,206,1,
+48,209,1,
 48,213,1,
 48,218,1,
 48,223,1,
-48,227,1,
-48,230,1,
-48,234,1,
+48,228,1,
+48,232,1,
+48,235,1,
 48,239,1,
-48,243,1,
-48,246,1,
-48,249,1,
-29,252,1,
+48,244,1,
+48,248,1,
+48,251,1,
+29,254,1,
 38,
-16,0,2,0,0,116,2,1,250,1,
+16,0,2,0,0,116,2,1,252,1,
 48,237,1,
-48,252,1,
-53,253,1,
-17,228,2,
-50,254,1,230,2,3,
+48,254,1,
 53,255,1,
-17,235,2,
-48,254,1,3,
-29,0,2,
+17,94,2,
+48,245,1,3,
+52,0,2,14,
+48,206,1,
+48,209,1,
+48,213,1,
+48,218,1,
+48,223,1,
+48,228,1,
+48,232,1,
+48,235,1,
+48,239,1,
+48,244,1,
+48,248,1,
+48,251,1,
+48,254,1,
+29,1,2,
 38,
-16,0,2,0,0,237,2,2,253,1,255,1,
-48,172,1,
-53,1,2,
+16,0,2,0,0,116,2,1,255,1,
+48,242,1,
+48,1,2,
+53,2,2,
 17,228,2,
-50,2,2,250,2,3,
-53,3,2,
+50,3,2,230,2,3,
+53,4,2,
 17,235,2,
-48,2,2,3,
-52,4,2,2,
-48,0,2,
+48,3,2,3,
 29,5,2,
 38,
-16,0,2,0,0,237,2,2,1,2,3,2,
-48,176,1,
-48,5,2,
+16,0,2,0,0,237,2,2,2,2,4,2,
+48,177,1,
 53,6,2,
 17,228,2,
-48,133,1,3,
-53,7,2,
+50,7,2,250,2,3,
+53,8,2,
 17,235,2,
-48,109,1,3,
-52,8,2,3,
-48,0,2,
+48,7,2,3,
+52,9,2,2,
 48,5,2,
-29,9,2,
+29,10,2,
 38,
-16,0,2,0,0,237,2,2,6,2,7,2,
-48,209,1,
-48,9,2,
-53,10,2,
-17,228,2,
-48,137,1,3,
+16,0,2,0,0,237,2,2,6,2,8,2,
+48,181,1,
+48,10,2,
 53,11,2,
+17,228,2,
+48,138,1,3,
+53,12,2,
 17,235,2,
-50,12,2,0,3,3,
-52,13,2,4,
-48,0,2,
+48,114,1,3,
+52,13,2,3,
 48,5,2,
-48,9,2,
+48,10,2,
 29,14,2,
 38,
-16,0,2,0,0,237,2,2,10,2,11,2,
+16,0,2,0,0,237,2,2,11,2,12,2,
 48,214,1,
 48,14,2,
 53,15,2,
 17,228,2,
-48,109,1,3,
+48,142,1,3,
 53,16,2,
 17,235,2,
-48,133,1,3,
-52,17,2,5,
-48,0,2,
+50,17,2,0,3,3,
+52,18,2,4,
 48,5,2,
-48,9,2,
+48,10,2,
 48,14,2,
-29,18,2,
+29,19,2,
 38,
 16,0,2,0,0,237,2,2,15,2,16,2,
-48,206,1,
-48,18,2,
-53,19,2,
-17,228,2,
-48,12,2,3,
+48,219,1,
+48,19,2,
 53,20,2,
-17,235,2,
-48,137,1,3,
-52,21,2,6,
-48,0,2,
-48,5,2,
-48,9,2,
-48,14,2,
-48,18,2,
-29,22,2,
-38,
-16,0,2,0,0,237,2,2,19,2,20,2,
-48,211,1,
-48,22,2,
-53,23,2,
 17,228,2,
-50,24,2,6,3,3,
+48,114,1,3,
+53,21,2,
+17,235,2,
+48,138,1,3,
+52,22,2,5,
+48,5,2,
+48,10,2,
+48,14,2,
+48,19,2,
+29,23,2,
+38,
+16,0,2,0,0,237,2,2,20,2,21,2,
+48,211,1,
+48,23,2,
+53,24,2,
+17,228,2,
+48,17,2,3,
 53,25,2,
 17,235,2,
-48,109,1,3,
-52,26,2,7,
-48,0,2,
+48,142,1,3,
+52,26,2,6,
 48,5,2,
-48,9,2,
+48,10,2,
 48,14,2,
-48,18,2,
-48,22,2,
+48,19,2,
+48,23,2,
 29,27,2,
 38,
-16,0,2,0,0,237,2,2,23,2,25,2,
-48,219,1,
+16,0,2,0,0,237,2,2,24,2,25,2,
+48,216,1,
 48,27,2,
 53,28,2,
 17,228,2,
-50,29,2,13,3,3,
+50,29,2,6,3,3,
 53,30,2,
 17,235,2,
-48,12,2,3,
-52,31,2,8,
-48,0,2,
+48,114,1,3,
+52,31,2,7,
 48,5,2,
-48,9,2,
+48,10,2,
 48,14,2,
-48,18,2,
-48,22,2,
+48,19,2,
+48,23,2,
 48,27,2,
 29,32,2,
 38,
@@ -1916,510 +1918,529 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {5,0,227,3,
 48,32,2,
 53,33,2,
 17,228,2,
-48,109,1,3,
-53,34,2,
+50,34,2,13,3,3,
+53,35,2,
 17,235,2,
-48,24,2,3,
-52,35,2,9,
-48,0,2,
+48,17,2,3,
+52,36,2,8,
 48,5,2,
-48,9,2,
+48,10,2,
 48,14,2,
-48,18,2,
-48,22,2,
+48,19,2,
+48,23,2,
 48,27,2,
 48,32,2,
-29,36,2,
+29,37,2,
 38,
-16,0,2,0,0,237,2,2,33,2,34,2,
-48,216,1,
-48,36,2,
-53,37,2,
-17,228,2,
-48,12,2,3,
+16,0,2,0,0,237,2,2,33,2,35,2,
+48,229,1,
+48,37,2,
 53,38,2,
+17,228,2,
+48,114,1,3,
+53,39,2,
 17,235,2,
 48,29,2,3,
-52,39,2,10,
-48,0,2,
+52,40,2,9,
 48,5,2,
-48,9,2,
+48,10,2,
 48,14,2,
-48,18,2,
-48,22,2,
+48,19,2,
+48,23,2,
 48,27,2,
 48,32,2,
-48,36,2,
-29,40,2,
+48,37,2,
+29,41,2,
 38,
-16,0,2,0,0,237,2,2,37,2,38,2,
+16,0,2,0,0,237,2,2,38,2,39,2,
 48,221,1,
-48,40,2,
-53,41,2,
-17,228,2,
-48,24,2,3,
+48,41,2,
 53,42,2,
+17,228,2,
+48,17,2,3,
+53,43,2,
 17,235,2,
-48,133,1,3,
-52,43,2,11,
-48,0,2,
+48,34,2,3,
+52,44,2,10,
 48,5,2,
-48,9,2,
+48,10,2,
 48,14,2,
-48,18,2,
-48,22,2,
+48,19,2,
+48,23,2,
 48,27,2,
 48,32,2,
-48,36,2,
-48,40,2,
-29,44,2,
+48,37,2,
+48,41,2,
+29,45,2,
 38,
-16,0,2,0,0,237,2,2,41,2,42,2,
-48,235,1,
-48,44,2,
-53,45,2,
-17,228,2,
-48,29,2,3,
+16,0,2,0,0,237,2,2,42,2,43,2,
+48,226,1,
+48,45,2,
 53,46,2,
+17,228,2,
+48,29,2,3,
+53,47,2,
 17,235,2,
-48,137,1,3,
-52,47,2,12,
-48,0,2,
+48,138,1,3,
+52,48,2,11,
 48,5,2,
-48,9,2,
+48,10,2,
 48,14,2,
-48,18,2,
-48,22,2,
+48,19,2,
+48,23,2,
 48,27,2,
 48,32,2,
-48,36,2,
-48,40,2,
-48,44,2,
-29,48,2,
+48,37,2,
+48,41,2,
+48,45,2,
+29,49,2,
 38,
-16,0,2,0,0,237,2,2,45,2,46,2,
+16,0,2,0,0,237,2,2,46,2,47,2,
 48,240,1,
-48,48,2,
-53,49,2,
-17,228,2,
-48,133,1,3,
+48,49,2,
 53,50,2,
+17,228,2,
+48,34,2,3,
+53,51,2,
 17,235,2,
-48,24,2,3,
-52,51,2,13,
-48,0,2,
+48,142,1,3,
+52,52,2,12,
 48,5,2,
-48,9,2,
+48,10,2,
 48,14,2,
-48,18,2,
-48,22,2,
+48,19,2,
+48,23,2,
 48,27,2,
 48,32,2,
-48,36,2,
-48,40,2,
-48,44,2,
-48,48,2,
-29,52,2,
+48,37,2,
+48,41,2,
+48,45,2,
+48,49,2,
+29,53,2,
 38,
-16,0,2,0,0,237,2,2,49,2,50,2,
-48,232,1,
-48,52,2,
-53,53,2,
-17,228,2,
-48,137,1,3,
+16,0,2,0,0,237,2,2,50,2,51,2,
+48,245,1,
+48,53,2,
 53,54,2,
+17,228,2,
+48,138,1,3,
+53,55,2,
 17,235,2,
 48,29,2,3,
-52,55,2,14,
-48,0,2,
+52,56,2,13,
 48,5,2,
-48,9,2,
+48,10,2,
 48,14,2,
-48,18,2,
-48,22,2,
+48,19,2,
+48,23,2,
 48,27,2,
 48,32,2,
-48,36,2,
-48,40,2,
-48,44,2,
-48,48,2,
-48,52,2,
-29,56,2,
+48,37,2,
+48,41,2,
+48,45,2,
+48,49,2,
+48,53,2,
+29,57,2,
 38,
-16,0,2,0,0,237,2,2,53,2,54,2,
+16,0,2,0,0,237,2,2,54,2,55,2,
 48,237,1,
-48,56,2,
-53,57,2,
-17,55,0,
-48,254,1,3,
+48,57,2,
 53,58,2,
-17,67,0,
-48,254,1,3,
-29,59,2,
-17,19,3,2,57,2,58,2,
-50,60,2,28,3,
-53,61,2,
-17,55,0,
-48,2,2,3,
+17,228,2,
+48,142,1,3,
+53,59,2,
+17,235,2,
+48,34,2,3,
+52,60,2,14,
+48,5,2,
+48,10,2,
+48,14,2,
+48,19,2,
+48,23,2,
+48,27,2,
+48,32,2,
+48,37,2,
+48,41,2,
+48,45,2,
+48,49,2,
+48,53,2,
+48,57,2,
+29,61,2,
+38,
+16,0,2,0,0,237,2,2,58,2,59,2,
+48,242,1,
+48,61,2,
 53,62,2,
-17,67,0,
-48,2,2,3,
-52,63,2,2,
-48,59,2,
-29,64,2,
-17,19,3,2,61,2,62,2,
-48,60,2,
-48,64,2,
-53,65,2,
 17,55,0,
-50,66,2,34,3,3,
+48,3,2,3,
+53,63,2,
+17,67,0,
+48,3,2,3,
+29,64,2,
+17,19,3,2,62,2,63,2,
+50,65,2,28,3,
+53,66,2,
+17,55,0,
+48,7,2,3,
 53,67,2,
 17,67,0,
-48,66,2,3,
-52,68,2,3,
-48,59,2,
+48,7,2,3,
+52,68,2,2,
 48,64,2,
 29,69,2,
-17,19,3,2,65,2,67,2,
-48,60,2,
+17,19,3,2,66,2,67,2,
+48,65,2,
 48,69,2,
 53,70,2,
 17,55,0,
-48,254,1,3,
-53,71,2,
+50,71,2,34,3,3,
+53,72,2,
 17,67,0,
-48,254,1,3,
-29,72,2,
-17,40,3,2,70,2,71,2,
-48,60,2,
-53,73,2,
+48,71,2,3,
+52,73,2,3,
+48,64,2,
+48,69,2,
+29,74,2,
+17,19,3,2,70,2,72,2,
+48,65,2,
+48,74,2,
+53,75,2,
 17,55,0,
-48,2,2,3,
-53,74,2,
+48,3,2,3,
+53,76,2,
 17,67,0,
-48,2,2,3,
-52,75,2,2,
-48,72,2,
-29,76,2,
-17,40,3,2,73,2,74,2,
-48,60,2,
-48,76,2,
-53,77,2,
-17,55,0,
-48,66,2,3,
+48,3,2,3,
+29,77,2,
+17,40,3,2,75,2,76,2,
+48,65,2,
 53,78,2,
-17,67,0,
-48,66,2,3,
-52,79,2,3,
-48,72,2,
-48,76,2,
-29,80,2,
-17,40,3,2,77,2,78,2,
-48,60,2,
-48,80,2,
-53,81,2,
 17,55,0,
-48,254,1,3,
+48,7,2,3,
+53,79,2,
+17,67,0,
+48,7,2,3,
+52,80,2,2,
+48,77,2,
+29,81,2,
+17,40,3,2,78,2,79,2,
+48,65,2,
+48,81,2,
 53,82,2,
-17,67,0,
-48,254,1,3,
-29,83,2,
-17,54,3,2,81,2,82,2,
-48,60,2,
-53,84,2,
 17,55,0,
-48,2,2,3,
-53,85,2,
+48,71,2,3,
+53,83,2,
 17,67,0,
-48,2,2,3,
-52,86,2,2,
-48,83,2,
-29,87,2,
-17,54,3,2,84,2,85,2,
-48,60,2,
-48,87,2,
-53,88,2,
+48,71,2,3,
+52,84,2,3,
+48,77,2,
+48,81,2,
+29,85,2,
+17,40,3,2,82,2,83,2,
+48,65,2,
+48,85,2,
+53,86,2,
 17,55,0,
-48,66,2,3,
+48,3,2,3,
+53,87,2,
+17,67,0,
+48,3,2,3,
+29,88,2,
+17,54,3,2,86,2,87,2,
+48,65,2,
 53,89,2,
-17,67,0,
-48,66,2,3,
-52,90,2,3,
-48,83,2,
-48,87,2,
-29,91,2,
-17,54,3,2,88,2,89,2,
-48,60,2,
-48,91,2,
-53,92,2,
 17,55,0,
-48,254,1,3,
+48,7,2,3,
+53,90,2,
+17,67,0,
+48,7,2,3,
+52,91,2,2,
+48,88,2,
+29,92,2,
+17,54,3,2,89,2,90,2,
+48,65,2,
+48,92,2,
 53,93,2,
-17,67,0,
-48,254,1,3,
-29,94,2,
-17,66,3,2,92,2,93,2,
-48,60,2,
-53,95,2,
 17,55,0,
-48,2,2,3,
-53,96,2,
+48,71,2,3,
+53,94,2,
 17,67,0,
-48,2,2,3,
-52,97,2,2,
-48,94,2,
-29,98,2,
-17,66,3,2,95,2,96,2,
-48,60,2,
-48,98,2,
-53,99,2,
+48,71,2,3,
+52,95,2,3,
+48,88,2,
+48,92,2,
+29,96,2,
+17,54,3,2,93,2,94,2,
+48,65,2,
+48,96,2,
+53,97,2,
 17,55,0,
-48,66,2,3,
+48,3,2,3,
+53,98,2,
+17,67,0,
+48,3,2,3,
+29,99,2,
+17,66,3,2,97,2,98,2,
+48,65,2,
 53,100,2,
-17,67,0,
-48,66,2,3,
-52,101,2,3,
-48,94,2,
-48,98,2,
-29,102,2,
-17,66,3,2,99,2,100,2,
-48,60,2,
-48,102,2,
-53,103,2,
 17,55,0,
-48,254,1,3,
+48,7,2,3,
+53,101,2,
+17,67,0,
+48,7,2,3,
+52,102,2,2,
+48,99,2,
+29,103,2,
+17,66,3,2,100,2,101,2,
+48,65,2,
+48,103,2,
 53,104,2,
-17,67,0,
-48,254,1,3,
-29,105,2,
-17,83,3,2,103,2,104,2,
-48,60,2,
-53,106,2,
 17,55,0,
-48,2,2,3,
-53,107,2,
+48,71,2,3,
+53,105,2,
 17,67,0,
-48,2,2,3,
-52,108,2,2,
-48,105,2,
-29,109,2,
-17,83,3,2,106,2,107,2,
-48,60,2,
-48,109,2,
-53,110,2,
+48,71,2,3,
+52,106,2,3,
+48,99,2,
+48,103,2,
+29,107,2,
+17,66,3,2,104,2,105,2,
+48,65,2,
+48,107,2,
+53,108,2,
 17,55,0,
-48,66,2,3,
+48,3,2,3,
+53,109,2,
+17,67,0,
+48,3,2,3,
+29,110,2,
+17,83,3,2,108,2,109,2,
+48,65,2,
 53,111,2,
-17,67,0,
-48,66,2,3,
-52,112,2,3,
-48,105,2,
-48,109,2,
-29,113,2,
-17,83,3,2,110,2,111,2,
-48,60,2,
-48,113,2,
-53,114,2,
 17,55,0,
-48,60,2,3,
+48,7,2,3,
+53,112,2,
+17,67,0,
+48,7,2,3,
+52,113,2,2,
+48,110,2,
+29,114,2,
+17,83,3,2,111,2,112,2,
+48,65,2,
+48,114,2,
 53,115,2,
-17,67,0,
-48,60,2,3,
-52,116,2,4,
-48,105,2,
-48,109,2,
-48,113,2,
-29,117,2,
-17,83,3,2,114,2,115,2,
-48,60,2,
-48,117,2,
-53,118,2,
 17,55,0,
-48,254,1,3,
+48,71,2,3,
+53,116,2,
+17,67,0,
+48,71,2,3,
+52,117,2,3,
+48,110,2,
+48,114,2,
+29,118,2,
+17,83,3,2,115,2,116,2,
+48,65,2,
+48,118,2,
 53,119,2,
-17,67,0,
-48,254,1,3,
-29,120,2,
-17,89,3,2,118,2,119,2,
-48,60,2,
-53,121,2,
 17,55,0,
-48,2,2,3,
-53,122,2,
+48,65,2,3,
+53,120,2,
 17,67,0,
-48,2,2,3,
-52,123,2,2,
-48,120,2,
-29,124,2,
-17,89,3,2,121,2,122,2,
-48,60,2,
-48,124,2,
-53,125,2,
+48,65,2,3,
+52,121,2,4,
+48,110,2,
+48,114,2,
+48,118,2,
+29,122,2,
+17,83,3,2,119,2,120,2,
+48,65,2,
+48,122,2,
+53,123,2,
 17,55,0,
-48,66,2,3,
+48,3,2,3,
+53,124,2,
+17,67,0,
+48,3,2,3,
+29,125,2,
+17,89,3,2,123,2,124,2,
+48,65,2,
 53,126,2,
-17,67,0,
-48,66,2,3,
-52,127,2,3,
-48,120,2,
-48,124,2,
-29,128,2,
-17,89,3,2,125,2,126,2,
-48,60,2,
-48,128,2,
-53,129,2,
 17,55,0,
-48,60,2,3,
+48,7,2,3,
+53,127,2,
+17,67,0,
+48,7,2,3,
+52,128,2,2,
+48,125,2,
+29,129,2,
+17,89,3,2,126,2,127,2,
+48,65,2,
+48,129,2,
 53,130,2,
+17,55,0,
+48,71,2,3,
+53,131,2,
 17,67,0,
-48,60,2,3,
-52,131,2,4,
-48,120,2,
-48,124,2,
-48,128,2,
-29,132,2,
-17,89,3,2,129,2,130,2,
-48,60,2,
-48,132,2,
-53,133,2,
+48,71,2,3,
+52,132,2,3,
+48,125,2,
+48,129,2,
+29,133,2,
+17,89,3,2,130,2,131,2,
+48,65,2,
+48,133,2,
+53,134,2,
 17,55,0,
-48,60,2,3,
-29,134,2,
-17,98,3,1,133,2,
-50,135,2,102,3,
-53,136,2,
-17,55,0,
-48,60,2,3,
+48,65,2,3,
+53,135,2,
+17,67,0,
+48,65,2,3,
+52,136,2,4,
+48,125,2,
+48,129,2,
+48,133,2,
 29,137,2,
-17,107,3,1,136,2,
-48,135,2,
+17,89,3,2,134,2,135,2,
+48,65,2,
+48,137,2,
 53,138,2,
 17,55,0,
-48,60,2,3,
+48,65,2,3,
 29,139,2,
-17,111,3,1,138,2,
-48,60,2,
-53,140,2,
+17,98,3,1,138,2,
+50,140,2,102,3,
+53,141,2,
+17,55,0,
+48,65,2,3,
+29,142,2,
+17,107,3,1,141,2,
+48,140,2,
+53,143,2,
+17,55,0,
+48,65,2,3,
+29,144,2,
+17,111,3,1,143,2,
+48,65,2,
+53,145,2,
 17,187,1,
 48,2,0,3,
-29,141,2,
-38,
-16,0,2,0,0,115,3,1,140,2,
-48,2,0,
-53,142,2,
-17,187,1,
-48,2,0,3,
-29,143,2,
-38,
-16,0,2,0,0,120,3,1,142,2,
-48,2,0,
-53,144,2,
-17,187,1,
-48,5,0,3,
-52,145,2,2,
-48,141,2,
 29,146,2,
 38,
-16,0,2,0,0,115,3,1,144,2,
-48,5,0,
-48,146,2,
+16,0,2,0,0,115,3,1,145,2,
+48,2,0,
 53,147,2,
 17,187,1,
-48,5,0,3,
-52,148,2,2,
-48,143,2,
-29,149,2,
+48,2,0,3,
+29,148,2,
 38,
 16,0,2,0,0,120,3,1,147,2,
-48,5,0,
-48,149,2,
-53,150,2,
+48,2,0,
+53,149,2,
 17,187,1,
-48,2,0,3,
+48,5,0,3,
+52,150,2,2,
+48,146,2,
 29,151,2,
 38,
-16,0,2,0,0,125,3,1,150,2,
-48,2,0,
+16,0,2,0,0,115,3,1,149,2,
+48,5,0,
+48,151,2,
 53,152,2,
 17,187,1,
 48,5,0,3,
 52,153,2,2,
-48,151,2,
+48,148,2,
 29,154,2,
 38,
-16,0,2,0,0,125,3,1,152,2,
+16,0,2,0,0,120,3,1,152,2,
 48,5,0,
 48,154,2,
 53,155,2,
-17,132,3,
-48,29,2,3,
+17,187,1,
+48,2,0,3,
 29,156,2,
-17,138,3,1,155,2,
-48,29,2,
+38,
+16,0,2,0,0,125,3,1,155,2,
+48,2,0,
 53,157,2,
-17,132,3,
-48,24,2,3,
+17,187,1,
+48,5,0,3,
 52,158,2,2,
 48,156,2,
 29,159,2,
-17,138,3,1,157,2,
-48,24,2,
+38,
+16,0,2,0,0,125,3,1,157,2,
+48,5,0,
 48,159,2,
 53,160,2,
 17,132,3,
-48,137,1,3,
+48,34,2,3,
 29,161,2,
-17,147,3,1,160,2,
-48,137,1,
+17,138,3,1,160,2,
+48,34,2,
 53,162,2,
 17,132,3,
-48,137,1,3,
-29,163,2,
-17,160,3,1,162,2,
-48,137,1,
-53,164,2,
-17,175,3,
-48,109,1,3,
+48,29,2,3,
+52,163,2,2,
+48,161,2,
+29,164,2,
+17,138,3,1,162,2,
+48,29,2,
+48,164,2,
 53,165,2,
-17,182,3,
-50,166,2,184,3,3,
-29,167,2,
-17,191,3,2,164,2,165,2,
-48,29,2,
-53,168,2,
 17,132,3,
-48,29,2,3,
+48,142,1,3,
+29,166,2,
+17,147,3,1,165,2,
+48,142,1,
+53,167,2,
+17,132,3,
+48,142,1,3,
+29,168,2,
+17,160,3,1,167,2,
+48,142,1,
 53,169,2,
-17,197,3,
-50,170,2,199,3,3,
-52,171,2,2,
-48,167,2,
+17,175,3,
+48,114,1,3,
+53,170,2,
+17,182,3,
+50,171,2,184,3,3,
 29,172,2,
-17,191,3,2,168,2,169,2,
-48,29,2,
-48,172,2,
+17,191,3,2,169,2,170,2,
+48,34,2,
 53,173,2,
-17,211,3,
-48,29,2,3,
+17,132,3,
+48,34,2,3,
 53,174,2,
-17,215,3,
-48,29,2,3,
-53,175,2,
-17,219,3,
-50,176,2,221,3,3,
-52,177,2,3,
-48,167,2,
+17,197,3,
+50,175,2,199,3,3,
+52,176,2,2,
 48,172,2,
-29,178,2,
-17,191,3,3,173,2,174,2,175,2,
-48,29,2,
-48,178,2,75,0,
-137,2,
+29,177,2,
+17,191,3,2,173,2,174,2,
+48,34,2,
+48,177,2,
+53,178,2,
+17,211,3,
+48,34,2,3,
+53,179,2,
+17,215,3,
+48,34,2,3,
+53,180,2,
+17,219,3,
+50,181,2,221,3,3,
+52,182,2,3,
+48,172,2,
+48,177,2,
+29,183,2,
+17,191,3,3,178,2,179,2,180,2,
+48,34,2,
+48,183,2,75,0,
+142,2,
 7,1,
 33,0,
 71,0,
-100,2,
-98,2,
+105,2,
+103,2,
 28,0,
 66,0,
 46,0,
@@ -2428,50 +2449,50 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {5,0,227,3,
 69,1,
 18,0,
 56,0,
-126,1,
-108,2,
-111,2,
+131,1,
+113,2,
+116,2,
 8,0,
-181,1,
-112,1,
-119,1,
-80,2,
+186,1,
+117,1,
+124,1,
+85,2,
 88,0,
 98,0,
-140,1,
+145,1,
 13,1,
 15,1,
 128,0,
 138,0,
-126,2,
-116,2,
-54,2,
-65,2,
+131,2,
+121,2,
+59,2,
+70,2,
 17,1,
-176,1,
+181,1,
 113,0,
+94,1,
 89,1,
-84,1,
-105,1,
-32,2,
-43,2,
+110,1,
+37,2,
+48,2,
 93,0,
 103,0,
-171,1,
+176,1,
 49,1,
 41,1,
-79,1,
+84,1,
 153,0,
-96,1,
-131,1,
-102,2,
-95,2,
-21,2,
-99,1,
+101,1,
+136,1,
+107,2,
+100,2,
+26,2,
+104,1,
 83,0,
 3,0,
-147,1,
-156,1,
+152,1,
+161,1,
 28,1,
 33,1,
 207,0,
@@ -2483,14 +2504,31 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {5,0,227,3,
 241,0,
 23,0,
 61,0,
-124,2,
-222,1,
+129,2,
+227,1,
 23,1,
 19,1,
-101,1,
-121,2,
+106,1,
+126,2,
 20,
-28,156,2,
+28,161,2,
+2,
+49,1,0,0,0,0,1,
+42,
+8,
+48,34,2,2,
+1,
+47,
+56,160,2,0,3,0,1,2,52,
+27,
+48,153,0,185,0,2,
+47,
+56,160,2,0,1,3,
+25,
+48,153,0,23,183,209,56,
+47,
+56,160,2,0,1,3,1,
+28,164,2,
 2,
 49,1,0,0,0,0,1,
 42,
@@ -2498,31 +2536,14 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {5,0,227,3,
 48,29,2,2,
 1,
 47,
-56,155,2,0,3,0,1,2,52,
-27,
-48,153,0,185,0,2,
-47,
-56,155,2,0,1,3,
-25,
-48,153,0,23,183,209,56,
-47,
-56,155,2,0,1,3,1,
-28,159,2,
-2,
-49,1,0,0,0,0,1,
-42,
-8,
-48,24,2,2,
-1,
-47,
-56,157,2,0,3,0,1,2,52,
+56,162,2,0,3,0,1,2,52,
 27,
 48,145,0,177,0,2,
 47,
-56,157,2,0,1,3,
+56,162,2,0,1,3,
 25,
 48,145,0,23,183,209,56,
 47,
-56,157,2,0,1,3,1,
+56,162,2,0,1,3,1,
 21,};
 static constexpr size_t SKSL_INCLUDE_sksl_public_LENGTH = sizeof(SKSL_INCLUDE_sksl_public);
diff --git a/src/sksl/sksl_public.sksl b/src/sksl/sksl_public.sksl
index 9e4863d0d9..817e006d9a 100644
--- a/src/sksl/sksl_public.sksl
+++ b/src/sksl/sksl_public.sksl
@@ -121,6 +121,7 @@ $es3 $genUType clamp($genUType x, $genUType minVal, $genUType maxVal);
 $es3 $genUType clamp($genUType x, uint minVal, uint maxVal);
 $es3 $genType  mix($genType  x, $genType  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
 $es3 $genBType isnan($genType  x);
diff --git a/tests/SkSLTest.cpp b/tests/SkSLTest.cpp
index c75c089424..184010e92c 100644
--- a/tests/SkSLTest.cpp
+++ b/tests/SkSLTest.cpp
@@ -328,6 +328,7 @@ SKSL_TEST(SkSLIntrinsicMaxFloat,               "intrinsics/MaxFloat.sksl")
 SKSL_TEST(SkSLIntrinsicMinFloat,               "intrinsics/MinFloat.sksl")
 // Fails on Adreno + Vulkan (skia:11919)
 SKSL_TEST_CPU(SkSLIntrinsicMixFloat,           "intrinsics/MixFloat.sksl")
+SKSL_TEST_ES3(SkSLIntrinsicMixBool,            "intrinsics/MixBool.sksl")
 SKSL_TEST_ES3(SkSLIntrinsicModf,               "intrinsics/Modf.sksl")
 SKSL_TEST_ES3(SkSLIntrinsicOuterProduct,       "intrinsics/OuterProduct.sksl")
 // Fails on Mac OpenGL + Radeon 5300M (skia:12434)
@@ -444,5 +445,4 @@ TODO(skia:11209): enable these tests when Runtime Effects have support for ES3
 SKSL_TEST(SkSLIntrinsicAbsInt,                 "intrinsics/AbsInt.sksl")
 SKSL_TEST(SkSLIntrinsicMaxInt,                 "intrinsics/MaxInt.sksl")
 SKSL_TEST(SkSLIntrinsicMinInt,                 "intrinsics/MinInt.sksl")
-SKSL_TEST(SkSLIntrinsicMixBool,                "intrinsics/MixBool.sksl")
 */