From e7ff4bc9b8b274aafc005d3d136bcfab7e198097 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Mon, 25 Jan 2021 11:58:09 -0500 Subject: [PATCH] Remove unused unpremul_float Change-Id: I59821d748768d74b251d9339787f193c23e3d4dc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/358526 Reviewed-by: John Stiles Reviewed-by: Brian Osman Commit-Queue: Ethan Nicholas Commit-Queue: Brian Osman Auto-Submit: Ethan Nicholas --- src/sksl/generated/sksl_gpu.dehydrated.sksl | 468 +++++++++--------- .../generated/sksl_public.dehydrated.sksl | 138 +++--- src/sksl/sksl_gpu.sksl | 1 - src/sksl/sksl_public.sksl | 1 - 4 files changed, 277 insertions(+), 331 deletions(-) diff --git a/src/sksl/generated/sksl_gpu.dehydrated.sksl b/src/sksl/generated/sksl_gpu.dehydrated.sksl index 86bebfa770..f612db97ed 100644 --- a/src/sksl/generated/sksl_gpu.dehydrated.sksl +++ b/src/sksl/generated/sksl_gpu.dehydrated.sksl @@ -1,4 +1,4 @@ -static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, +static uint8_t SKSL_INCLUDE_sksl_gpu[] = {41,10, 11,83,107,66,108,101,110,100,77,111,100,101, 7,100,101,103,114,101,101,115, 8,36,103,101,110,84,121,112,101, @@ -236,7 +236,6 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 4,109,111,100,101, 5,98,108,101,110,100, 8,117,110,112,114,101,109,117,108, -14,117,110,112,114,101,109,117,108,95,102,108,111,97,116, 4,112,114,111,106, 37,105,110,66,108,101,110,100,77,111,100,101,115,70,97,105,108,82,97,110,100,111,109,108,121,70,111,114,65,108,108,90,101,114,111,86,101,99, 6,114,101,115,117,108,116, @@ -281,7 +280,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 6,107,67,111,108,111,114, 11,107,76,117,109,105,110,111,115,105,116,121, 25,98,117,105,108,116,105,110,68,101,116,101,114,109,105,110,97,110,116,83,117,112,112,111,114,116, -42,236,3, +42,234,3, 15,1,0,2,0, 46,2,0, 9,14,0, @@ -3733,44 +3732,38 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 9,118,8,1,25,4, 40,15,2, 46,27,4, -9,102,7, -40,132,1,3, -23,28,4, -9,127,8,1,27,4, -40,132,1, -46,29,4, 9,10,2, 40,168,1,3, -23,30,4, -9,142,8,1,29,4, +23,28,4, +9,127,8,1,27,4, 40,126,1, -46,31,4, +46,29,4, 9,32,1, 40,126,1,3, -46,32,4, +46,30,4, 9,171,1, 40,126,1,3, -45,33,4,3, +45,31,4,3, 40,170,1, 40,175,1, -23,34,4, -9,135,2,2,31,4,32,4, +23,32,4, +9,135,2,2,29,4,30,4, 40,168,0, -40,34,4, -46,35,4, +40,32,4, +46,33,4, 9,32,1, 40,4,2,3, -46,36,4, +46,34,4, 9,171,1, 40,4,2,3, -45,37,4,4, +45,35,4,4, 40,170,1, 40,175,1, -40,34,4, -23,38,4, -9,135,2,2,35,4,36,4, +40,32,4, +23,36,4, +9,135,2,2,33,4,34,4, 40,176,0, -40,38,4,136,0, +40,36,4,135,0, 0,0, 193,3, 199,3, @@ -3826,7 +3819,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 1,1, 56,0, 78,0, -234,3, +232,3, 62,3, 65,3, 50,0, @@ -3879,7 +3872,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 117,1, 121,1, 94,0, -227,3, +225,3, 47,0, 181,1, 190,1, @@ -3906,7 +3899,6 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 125,1, 129,1, 223,3, -225,3, 12, 22,163,3, 2, @@ -3963,7 +3955,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 42,0,0,0,0,1, 34, 44, -35,147,8, +35,132,8, 40,14,3, 44, 1, @@ -4174,11 +4166,11 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 22,211,3, 2, 42,1,0, -46,39,4, -9,185,8, +46,37,4, +9,170,8, 40,15,2,2,1,0, 0,0,3, -47,39,4, +47,37,4, 40,15,2,0, 6, 40,15,2,4, @@ -4217,7 +4209,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 16, 1, 39, -49,39,4,2,3,0,1,2,81, +49,37,4,2,3,0,1,2,81, 1, 1, 39, @@ -4242,15 +4234,15 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 40,172,1, 40,172,1, 34, -49,39,4,0,1,1,208,3, +49,37,4,0,1,1,208,3, 22,214,3, 2, 42,1,0, -46,40,4, -9,185,8, +46,38,4, +9,170,8, 40,15,2,2,1,0, 0,0,3, -47,40,4, +47,38,4, 40,15,2,0, 21, 40,15,2,172,3,2, @@ -4259,11 +4251,11 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 16, 1, 39, -49,40,4,1,3,0,1,2,74, +49,38,4,1,3,0,1,2,74, 21, 40,172,1,200,0,2, 39, -49,40,4,0,3,0,1,2, +49,38,4,0,3,0,1,2, 1, 1, 1, @@ -4280,15 +4272,15 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 40,172,1, 40,172,1, 34, -49,40,4,0,1,1,172,3, +49,38,4,0,1,1,172,3, 22,217,3, 2, 42,1,0, -46,41,4, -9,185,8, +46,39,4, +9,170,8, 40,15,2,2,1,0, 0,0,3, -47,41,4, +47,39,4, 40,15,2,0, 21, 40,15,2,172,3,2, @@ -4297,11 +4289,11 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 16, 1, 39, -49,41,4,1,3,0,1,2,74, +49,39,4,1,3,0,1,2,74, 21, 40,172,1,224,0,2, 39, -49,41,4,0,3,0,1,2, +49,39,4,0,3,0,1,2, 1, 1, 1, @@ -4318,13 +4310,13 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 40,172,1, 40,172,1, 34, -49,41,4,0,1,1,172,3, +49,39,4,0,1,1,172,3, 22,220,3, 2, 42,0,0,0,0,1, 34, 44, -35,192,8, +35,177,8, 40,14,3, 1, 49,218,3,0,59, @@ -4363,11 +4355,11 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 40,176,0,1, 2, 42,1,0, -46,42,4, -9,236,8, +46,40,4, +9,221,8, 40,176,0,2,1,0, 0,0,2, -47,42,4, +47,40,4, 40,176,0,0, 1, 39, @@ -4377,7 +4369,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 40,176,0, 24,0, 1, -49,42,4,0,75, +49,40,4,0,75, 19, 40,176,0,0,0,0,0, 40,14,3, @@ -4418,7 +4410,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 42,0,0,0,0,2, 16, 1, -49,42,4,1,74, +49,40,4,1,74, 21, 40,176,0,200,0,2, 39, @@ -4431,13 +4423,13 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 39, 49,221,3,0,1,1, 40,176,0, -49,42,4,0, +49,40,4,0, 40,176,0, 34, 1, 1, 1, -49,42,4,0,58, +49,40,4,0,58, 39, 49,221,3,0,1,1, 40,176,0,56, @@ -4566,11 +4558,11 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 40,176,0,1, 2, 42,1,0, -46,43,4, -9,236,8, +46,41,4, +9,221,8, 40,176,0,2,1,0, 0,0,2, -47,43,4, +47,41,4, 40,176,0,0, 21, 40,176,0,224,0,2, @@ -4598,7 +4590,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 1, 1, 1, -49,43,4,0,58, +49,41,4,0,58, 39, 49,227,3,0,1,1, 40,176,0,56, @@ -4755,23 +4747,23 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 40,14,3, 2, 42,4,0, +46,42,4, +9,227,8, +40,176,0,2, +46,43,4, +9,232,8, +40,176,0,2, 46,44,4, -9,242,8, +9,237,8, 40,176,0,2, 46,45,4, -9,247,8, -40,176,0,2, -46,46,4, -9,252,8, -40,176,0,2, -46,47,4, -9,2,9, +9,243,8, 40,176,0,2,4,0, 1,0, 0,0, 3,0, 2,0,5, -47,44,4, +47,42,4, 40,176,0,0, 1, 39, @@ -4779,14 +4771,14 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 39, 49,237,3,0,1,0, 40,176,0, -47,45,4, +47,43,4, 40,176,0,0, 1, -49,44,4,0,58, +49,42,4,0,58, 39, 49,237,3,0,1,0, 40,176,0, -47,46,4, +47,44,4, 40,176,0,0, 1, 39, @@ -4794,10 +4786,10 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 39, 49,237,3,0,1,1, 40,176,0, -47,47,4, +47,45,4, 40,176,0,0, 1, -49,46,4,0,58, +49,44,4,0,58, 39, 49,237,3,0,1,1, 40,176,0, @@ -4808,7 +4800,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 1, 1, 1, -49,46,4,0,58, +49,44,4,0,58, 1, 39, 49,236,3,0,1,0,57, @@ -4844,7 +4836,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 39, 49,237,3,0,1,1, 40,176,0,58, -49,44,4,0, +49,42,4,0, 40,176,0,58, 1, 39, @@ -4862,7 +4854,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 1, 19, 40,176,0,0,0,128,65,58, -49,45,4,0, +49,43,4,0, 40,176,0,58, 1, 39, @@ -4877,12 +4869,12 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 40,176,0, 40,176,0,57, 1, -49,47,4,0,58, +49,45,4,0,58, 39, 49,236,3,0,1,0, 40,176,0, 40,176,0, -49,46,4,0,1, +49,44,4,0,1, 2, 42,0,0,0,0,1, 34, @@ -5136,92 +5128,92 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 22,0,4, 2, 42,4,0, +46,46,4, +9,249,8, +40,176,0,2, +46,47,4, +9,170,8, +40,172,1,2, 46,48,4, -9,8,9, +9,253,8, 40,176,0,2, 46,49,4, -9,185,8, -40,172,1,2, -46,50,4, -9,12,9, -40,176,0,2, -46,51,4, -9,20,9, +9,5,9, 40,176,0,2,4,0, 0,0, 3,0, 2,0, 1,0,6, -47,48,4, +47,46,4, 40,176,0,0, 21, 40,176,0,252,3,1, 49,255,3,0, -47,49,4, +47,47,4, 40,172,1,0, 1, 1, -49,48,4,0,57, +49,46,4,0,57, 21, 40,176,0,252,3,1, 49,253,3,0, 40,176,0,56, 49,253,3,0, 40,172,1, -47,50,4, +47,48,4, 40,176,0,0, 21, 40,176,0,200,0,2, 21, 40,176,0,200,0,2, 39, -49,49,4,0,1,0, +49,47,4,0,1,0, 39, -49,49,4,0,1,1, +49,47,4,0,1,1, 39, -49,49,4,0,1,2, -47,51,4, +49,47,4,0,1,2, +47,49,4, 40,176,0,0, 21, 40,176,0,224,0,2, 21, 40,176,0,224,0,2, 39, -49,49,4,0,1,0, +49,47,4,0,1,0, 39, -49,49,4,0,1,1, +49,47,4,0,1,1, 39, -49,49,4,0,1,2, +49,47,4,0,1,2, 24,0, 1, 1, -49,50,4,0,78, +49,48,4,0,78, 19, 40,176,0,0,0,0,0, 40,14,3,69, 1, -49,48,4,0,76, -49,50,4,0, +49,46,4,0,76, +49,48,4,0, 40,14,3, 40,14,3, 2, 42,0,0,0,0,1, 16, 1, -49,49,4,1,74, +49,47,4,1,74, 1, -49,48,4,0,56, +49,46,4,0,56, 1, 1, 1, -49,49,4,0,57, -49,48,4,0, +49,47,4,0,57, +49,46,4,0, 40,172,1,58, -49,48,4,0, +49,46,4,0, 40,172,1,59, 1, -49,48,4,0,57, -49,50,4,0, +49,46,4,0,57, +49,48,4,0, 40,176,0, 40,172,1, 40,172,1, @@ -5231,34 +5223,34 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 44, 1, 1, -49,51,4,0,77, +49,49,4,0,77, 49,254,3,0, 40,14,3,69, 1, -49,51,4,0,76, -49,48,4,0, +49,49,4,0,76, +49,46,4,0, 40,14,3, 40,14,3, 1, -49,48,4,0,56, +49,46,4,0,56, 1, 1, 1, -49,49,4,0,57, -49,48,4,0, +49,47,4,0,57, +49,46,4,0, 40,172,1,58, 1, 49,254,3,0,57, -49,48,4,0, +49,46,4,0, 40,176,0, 40,172,1,59, 1, -49,51,4,0,57, -49,48,4,0, +49,49,4,0,57, +49,46,4,0, 40,176,0, 40,172,1, 40,172,1, -49,49,4,0,1,1,252,3, +49,47,4,0,1,1,252,3, 22,2,4, 2, 42,0,0,0,0,1, @@ -5325,11 +5317,11 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 22,8,4, 2, 42,1,0, -46,52,4, +46,50,4, 9,219,7, 40,176,0,2,1,0, 0,0,2, -47,52,4, +47,50,4, 40,176,0,0, 21, 40,176,0,2,4,1, @@ -5357,7 +5349,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 40,172,1,5,4,2, 39, 49,6,4,0,3,0,1,2, -49,52,4,0,1, +49,50,4,0,1, 24,0, 1, 39, @@ -5373,7 +5365,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 40,172,1,5,4,2, 39, 49,6,4,0,3,0,2,1, -49,52,4,0,3,0,2,1,1, +49,50,4,0,3,0,2,1,1, 2, 42,0,0,0,0,1, 34, @@ -5382,7 +5374,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 40,172,1,5,4,2, 39, 49,6,4,0,3,2,0,1, -49,52,4,0,3,1,2,0,1,1, +49,50,4,0,3,1,2,0,1,1, 24,0, 1, 39, @@ -5398,7 +5390,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 40,172,1,5,4,2, 39, 49,6,4,0,3,1,0,2, -49,52,4,0,3,1,0,2,1, +49,50,4,0,3,1,0,2,1, 24,0, 1, 39, @@ -5414,7 +5406,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 40,172,1,5,4,2, 39, 49,6,4,0,3,1,2,0, -49,52,4,0,3,2,0,1,1, +49,50,4,0,3,2,0,1,1, 2, 42,0,0,0,0,1, 34, @@ -5423,23 +5415,23 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 40,172,1,5,4,2, 39, 49,6,4,0,3,2,1,0, -49,52,4,0,3,2,1,0,1,1,2,2,4,5,4, +49,50,4,0,3,2,1,0,1,1,2,2,4,5,4, 22,11,4, 2, 42,3,0, -46,53,4, +46,51,4, 9,143,7, 40,176,0,2, -46,54,4, -9,28,9, +46,52,4, +9,13,9, 40,172,1,2, -46,55,4, -9,32,9, +46,53,4, +9,17,9, 40,172,1,2,3,0, 0,0, 2,0, 1,0,4, -47,53,4, +47,51,4, 40,176,0,0, 1, 39, @@ -5447,7 +5439,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 39, 49,9,4,0,1,3, 40,176,0, -47,54,4, +47,52,4, 40,172,1,0, 1, 39, @@ -5455,7 +5447,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 39, 49,10,4,0,1,3, 40,172,1, -47,55,4, +47,53,4, 40,172,1,0, 1, 39, @@ -5474,19 +5466,19 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 40,172,1,0,4,3, 21, 40,172,1,8,4,2, -49,54,4,0, -49,55,4,0, +49,52,4,0, 49,53,4,0, -49,55,4,0,56, +49,51,4,0, +49,53,4,0,56, 39, 49,10,4,0,3,0,1,2, 40,172,1,57, -49,55,4,0, +49,53,4,0, 40,172,1,56, 39, 49,9,4,0,3,0,1,2, 40,172,1,57, -49,54,4,0, +49,52,4,0, 40,172,1, 1, 1, @@ -5495,24 +5487,24 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 39, 49,10,4,0,1,3, 40,176,0,57, -49,53,4,0, +49,51,4,0, 40,176,0,1,2,0,4,8,4, 22,14,4, 2, 42,3,0, -46,56,4, +46,54,4, 9,143,7, 40,176,0,2, -46,57,4, -9,28,9, +46,55,4, +9,13,9, 40,172,1,2, -46,58,4, -9,32,9, +46,56,4, +9,17,9, 40,172,1,2,3,0, 0,0, 2,0, 1,0,4, -47,56,4, +47,54,4, 40,176,0,0, 1, 39, @@ -5520,7 +5512,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 39, 49,12,4,0,1,3, 40,176,0, -47,57,4, +47,55,4, 40,172,1,0, 1, 39, @@ -5528,7 +5520,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 39, 49,13,4,0,1,3, 40,172,1, -47,58,4, +47,56,4, 40,172,1,0, 1, 39, @@ -5547,19 +5539,19 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 40,172,1,0,4,3, 21, 40,172,1,8,4,2, -49,58,4,0, -49,57,4,0, 49,56,4,0, -49,58,4,0,56, +49,55,4,0, +49,54,4,0, +49,56,4,0,56, 39, 49,13,4,0,3,0,1,2, 40,172,1,57, -49,58,4,0, +49,56,4,0, 40,172,1,56, 39, 49,12,4,0,3,0,1,2, 40,172,1,57, -49,57,4,0, +49,55,4,0, 40,172,1, 1, 1, @@ -5568,24 +5560,24 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 39, 49,13,4,0,1,3, 40,176,0,57, -49,56,4,0, +49,54,4,0, 40,176,0,1,2,0,4,8,4, 22,17,4, 2, 42,3,0, -46,59,4, +46,57,4, 9,143,7, 40,176,0,2, -46,60,4, -9,28,9, +46,58,4, +9,13,9, 40,172,1,2, -46,61,4, -9,32,9, +46,59,4, +9,17,9, 40,172,1,2,3,0, 0,0, 2,0, 1,0,4, -47,59,4, +47,57,4, 40,176,0,0, 1, 39, @@ -5593,7 +5585,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 39, 49,15,4,0,1,3, 40,176,0, -47,60,4, +47,58,4, 40,172,1,0, 1, 39, @@ -5601,7 +5593,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 39, 49,16,4,0,1,3, 40,172,1, -47,61,4, +47,59,4, 40,172,1,0, 1, 39, @@ -5618,18 +5610,18 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 1, 21, 40,172,1,0,4,3, -49,60,4,0, -49,59,4,0, -49,61,4,0,56, +49,58,4,0, +49,57,4,0, +49,59,4,0,56, 39, 49,16,4,0,3,0,1,2, 40,172,1,57, -49,61,4,0, +49,59,4,0, 40,172,1,56, 39, 49,15,4,0,3,0,1,2, 40,172,1,57, -49,60,4,0, +49,58,4,0, 40,172,1, 1, 1, @@ -5638,24 +5630,24 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 39, 49,16,4,0,1,3, 40,176,0,57, -49,59,4,0, +49,57,4,0, 40,176,0,1,1,0,4, 22,20,4, 2, 42,3,0, -46,62,4, +46,60,4, 9,143,7, 40,176,0,2, -46,63,4, -9,28,9, +46,61,4, +9,13,9, 40,172,1,2, -46,64,4, -9,32,9, +46,62,4, +9,17,9, 40,172,1,2,3,0, 0,0, 2,0, 1,0,4, -47,62,4, +47,60,4, 40,176,0,0, 1, 39, @@ -5663,7 +5655,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 39, 49,18,4,0,1,3, 40,176,0, -47,63,4, +47,61,4, 40,172,1,0, 1, 39, @@ -5671,7 +5663,7 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 39, 49,19,4,0,1,3, 40,172,1, -47,64,4, +47,62,4, 40,172,1,0, 1, 39, @@ -5688,18 +5680,18 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 1, 21, 40,172,1,0,4,3, -49,64,4,0, 49,62,4,0, -49,63,4,0,56, +49,60,4,0, +49,61,4,0,56, 39, 49,19,4,0,3,0,1,2, 40,172,1,57, -49,64,4,0, +49,62,4,0, 40,172,1,56, 39, 49,18,4,0,3,0,1,2, 40,172,1,57, -49,63,4,0, +49,61,4,0, 40,172,1, 1, 1, @@ -5708,33 +5700,41 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 39, 49,19,4,0,1,3, 40,176,0,57, -49,62,4,0, +49,60,4,0, 40,176,0,1,1,0,4, 14,2,0, 42,29,0, +46,63,4, +30, +8,1,21,9, +40,1,0,0, +46,64,4, +30, +8,1,28,9, +40,1,0,0, 46,65,4, 30, -8,1,36,9, +8,1,33,9, 40,1,0,0, 46,66,4, 30, -8,1,43,9, +8,1,38,9, 40,1,0,0, 46,67,4, 30, -8,1,48,9, +8,1,47,9, 40,1,0,0, 46,68,4, 30, -8,1,53,9, +8,1,56,9, 40,1,0,0, 46,69,4, 30, -8,1,62,9, +8,1,63,9, 40,1,0,0, 46,70,4, 30, -8,1,71,9, +8,1,70,9, 40,1,0,0, 46,71,4, 30, @@ -5742,71 +5742,71 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 40,1,0,0, 46,72,4, 30, -8,1,85,9, +8,1,86,9, 40,1,0,0, 46,73,4, 30, -8,1,93,9, +8,1,95,9, 40,1,0,0, 46,74,4, 30, -8,1,101,9, +8,1,104,9, 40,1,0,0, 46,75,4, 30, -8,1,110,9, +8,1,109,9, 40,1,0,0, 46,76,4, 30, -8,1,119,9, +8,1,115,9, 40,1,0,0, 46,77,4, 30, -8,1,124,9, +8,1,125,9, 40,1,0,0, 46,78,4, 30, -8,1,130,9, +8,1,133,9, 40,1,0,0, 46,79,4, 30, -8,1,140,9, +8,1,142,9, 40,1,0,0, 46,80,4, 30, -8,1,148,9, +8,1,150,9, 40,1,0,0, 46,81,4, 30, -8,1,157,9, +8,1,159,9, 40,1,0,0, 46,82,4, 30, -8,1,165,9, +8,1,171,9, 40,1,0,0, 46,83,4, 30, -8,1,174,9, +8,1,182,9, 40,1,0,0, 46,84,4, 30, -8,1,186,9, +8,1,193,9, 40,1,0,0, 46,85,4, 30, -8,1,197,9, +8,1,204,9, 40,1,0,0, 46,86,4, 30, -8,1,208,9, +8,1,216,9, 40,1,0,0, 46,87,4, 30, -8,1,219,9, +8,1,227,9, 40,1,0,0, 46,88,4, 30, -8,1,231,9, +8,1,237,9, 40,1,0,0, 46,89,4, 30, @@ -5814,19 +5814,11 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 40,1,0,0, 46,90,4, 30, -8,1,252,9, +8,1,254,9, 40,1,0,0, 46,91,4, 30, -8,1,1,10, -40,1,0,0, -46,92,4, -30, -8,1,13,10, -40,1,0,0, -46,93,4, -30, -8,1,20,10, +8,1,5,10, 40,1,0,0,29,0, 0,0, 27,0, @@ -6093,82 +6085,64 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,10, 2, 42,0,0,0,0,1, 34, -6, -40,132,1,2, 1, 39, -49,27,4,0,3,0,1,2,59, -21, -40,168,0,216,0,2, +49,27,4,0,2,0,1,59, 39, -49,27,4,0,1,3, -19, -40,168,0,23,183,209,56, -40,168,1, -39, -49,27,4,0,1,3,1,0, -22,30,4, -2, -42,0,0,0,0,1, -34, -1, -39, -49,29,4,0,2,0,1,59, -39, -49,29,4,0,1,2, +49,27,4,0,1,2, 40,126,1,1,0, -22,34,4, +22,32,4, 2, 42,0,0,0,0,1, 34, 44, -35,32,10, +35,17,10, 40,14,3, 21, 40,168,0,105,2,1, 6, 40,218,1,2, -49,31,4,0, -49,32,4,0, +49,29,4,0, +49,30,4,0, 1, 1, 39, -49,31,4,0,1,0,58, +49,29,4,0,1,0,58, 39, -49,32,4,0,1,1, +49,30,4,0,1,1, 40,168,0,57, 1, 39, -49,31,4,0,1,1,58, +49,29,4,0,1,1,58, 39, -49,32,4,0,1,0, +49,30,4,0,1,0, 40,168,0, 40,168,0,1,0, -22,38,4, +22,36,4, 2, 42,0,0,0,0,1, 34, 44, -35,32,10, +35,17,10, 40,14,3, 21, 40,176,0,109,2,1, 6, 40,8,2,2, -49,35,4,0, -49,36,4,0, +49,33,4,0, +49,34,4,0, 1, 1, 39, -49,35,4,0,1,0,58, +49,33,4,0,1,0,58, 39, -49,36,4,0,1,1, +49,34,4,0,1,1, 40,176,0,57, 1, 39, -49,35,4,0,1,1,58, +49,33,4,0,1,1,58, 39, -49,36,4,0,1,0, +49,34,4,0,1,0, 40,176,0, 40,176,0,1,0, 13,}; diff --git a/src/sksl/generated/sksl_public.dehydrated.sksl b/src/sksl/generated/sksl_public.dehydrated.sksl index 32bf474fa7..9595e79814 100644 --- a/src/sksl/generated/sksl_public.dehydrated.sksl +++ b/src/sksl/generated/sksl_public.dehydrated.sksl @@ -1,4 +1,4 @@ -static uint8_t SKSL_INCLUDE_sksl_public[] = {40,2, +static uint8_t SKSL_INCLUDE_sksl_public[] = {25,2, 3,100,101,103, 5,102,108,111,97,116, 7,114,97,100,105,97,110,115, @@ -83,11 +83,10 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {40,2, 5,99,111,108,111,114, 5,104,97,108,102,52, 8,117,110,112,114,101,109,117,108, -14,117,110,112,114,101,109,117,108,95,102,108,111,97,116, 1,118, 1,107, 5,104,97,108,102,51, -42,164,1, +42,162,1, 46,1,0, 9,2,0, 43,2,0,6,0,3, @@ -1403,13 +1402,7 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {40,2, 43,176,1,2,2,3, 23,177,1, 9,8,2,1,175,1, -40,176,1, -46,178,1, -9,252,1, -40,13,0,3, -23,179,1, -9,17,2,1,178,1, -40,13,0,49,0, +40,176,1,48,0, 100,0, 45,0, 157,1, @@ -1458,7 +1451,6 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {40,2, 223,0, 35,0, 161,1, -163,1, 12, 22,3,0, 2, @@ -1583,11 +1575,11 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {40,2, 22,26,1, 2, 42,1,0, -46,180,1, -9,32,2, +46,178,1, +9,17,2, 40,2,0,2,1,0, 0,0,2, -47,180,1, +47,178,1, 40,2,0,0, 44, 1, @@ -1602,15 +1594,15 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {40,2, 33,57, 49,23,1,0, 34, -49,180,1,0,1,0, +49,178,1,0,1,0, 22,31,1, 2, 42,1,0, -46,181,1, -9,32,2, +46,179,1, +9,17,2, 40,5,0,2,1,0, 0,0,2, -47,181,1, +47,179,1, 40,5,0,0, 44, 1, @@ -1625,15 +1617,15 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {40,2, 33,57, 49,27,1,0, 34, -49,181,1,0,1,0, +49,179,1,0,1,0, 22,36,1, 2, 42,1,0, -46,182,1, -9,32,2, +46,180,1, +9,17,2, 40,9,0,2,1,0, 0,0,2, -47,182,1, +47,180,1, 40,9,0,0, 44, 1, @@ -1648,15 +1640,15 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {40,2, 33,57, 49,32,1,0, 34, -49,182,1,0,1,0, +49,180,1,0,1,0, 22,41,1, 2, 42,1,0, -46,183,1, -9,32,2, +46,181,1, +9,17,2, 40,13,0,2,1,0, 0,0,2, -47,183,1, +47,181,1, 40,13,0,0, 44, 1, @@ -1671,7 +1663,7 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {40,2, 33,57, 49,37,1,0, 34, -49,183,1,0,1,0, +49,181,1,0,1,0, 22,44,1, 2, 42,0,0,0,0,1, @@ -1747,15 +1739,15 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {40,2, 22,60,1, 2, 42,2,0, -46,184,1, -9,34,2, +46,182,1, +9,19,2, 40,2,0,2, -46,185,1, -9,32,2, +46,183,1, +9,17,2, 40,2,0,2,2,0, 0,0, 1,0,3, -47,184,1, +47,182,1, 40,2,0,0, 1, 19, @@ -1781,11 +1773,11 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {40,2, 40,2,0, 40,2,0, 40,2,0, -47,185,1, +47,183,1, 40,2,0,0, 44, 1, -49,184,1,0,78, +49,182,1,0,78, 19, 40,2,0,0,0,0,0, 40,170,1, @@ -1807,25 +1799,25 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {40,2, 40,2,0,56, 21, 40,2,0,95,0,1, -49,184,1,0, +49,182,1,0, 40,2,0,58, 49,58,1,0, 40,2,0, 40,2,0, 34, -49,185,1,0,1,0, +49,183,1,0,1,0, 22,65,1, 2, 42,2,0, -46,186,1, -9,34,2, +46,184,1, +9,19,2, 40,2,0,2, -46,187,1, -9,32,2, +46,185,1, +9,17,2, 40,5,0,2,2,0, 0,0, 1,0,3, -47,186,1, +47,184,1, 40,2,0,0, 1, 19, @@ -1851,11 +1843,11 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {40,2, 40,2,0, 40,2,0, 40,2,0, -47,187,1, +47,185,1, 40,5,0,0, 44, 1, -49,186,1,0,78, +49,184,1,0,78, 19, 40,2,0,0,0,0,0, 40,170,1, @@ -1879,25 +1871,25 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {40,2, 40,2,0,56, 21, 40,2,0,95,0,1, -49,186,1,0, +49,184,1,0, 40,2,0,58, 49,62,1,0, 40,5,0, 40,5,0, 34, -49,187,1,0,1,0, +49,185,1,0,1,0, 22,70,1, 2, 42,2,0, -46,188,1, -9,34,2, +46,186,1, +9,19,2, 40,2,0,2, -46,189,1, -9,32,2, +46,187,1, +9,17,2, 40,9,0,2,2,0, 0,0, 1,0,3, -47,188,1, +47,186,1, 40,2,0,0, 1, 19, @@ -1923,11 +1915,11 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {40,2, 40,2,0, 40,2,0, 40,2,0, -47,189,1, +47,187,1, 40,9,0,0, 44, 1, -49,188,1,0,78, +49,186,1,0,78, 19, 40,2,0,0,0,0,0, 40,170,1, @@ -1951,25 +1943,25 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {40,2, 40,2,0,56, 21, 40,2,0,95,0,1, -49,188,1,0, +49,186,1,0, 40,2,0,58, 49,67,1,0, 40,9,0, 40,9,0, 34, -49,189,1,0,1,0, +49,187,1,0,1,0, 22,75,1, 2, 42,2,0, -46,190,1, -9,34,2, +46,188,1, +9,19,2, 40,2,0,2, -46,191,1, -9,32,2, +46,189,1, +9,17,2, 40,13,0,2,2,0, 0,0, 1,0,3, -47,190,1, +47,188,1, 40,2,0,0, 1, 19, @@ -1995,11 +1987,11 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {40,2, 40,2,0, 40,2,0, 40,2,0, -47,191,1, +47,189,1, 40,13,0,0, 44, 1, -49,190,1,0,78, +49,188,1,0,78, 19, 40,2,0,0,0,0,0, 40,170,1, @@ -2023,13 +2015,13 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {40,2, 40,2,0,56, 21, 40,2,0,95,0,1, -49,190,1,0, +49,188,1,0, 40,2,0,58, 49,72,1,0, 40,13,0, 40,13,0, 34, -49,191,1,0,1,0, +49,189,1,0,1,0, 22,177,1, 2, 42,0,0,0,0,1, @@ -2045,26 +2037,8 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {40,2, 49,175,1,0,1,3, 19, 40,138,0,23,183,209,56, -43,192,1,36,2, +43,190,1,21,2, 39, 49,175,1,0,1,3,1,0, -22,179,1, -2, -42,0,0,0,0,1, -34, -6, -40,13,0,2, -1, -39, -49,178,1,0,3,0,1,2,59, -21, -40,2,0,162,0,2, -39, -49,178,1,0,1,3, -19, -40,2,0,23,183,209,56, -40,9,0, -39, -49,178,1,0,1,3,1,0, 13,}; static constexpr size_t SKSL_INCLUDE_sksl_public_LENGTH = sizeof(SKSL_INCLUDE_sksl_public); diff --git a/src/sksl/sksl_gpu.sksl b/src/sksl/sksl_gpu.sksl index bc01a6e561..31b75d66ca 100644 --- a/src/sksl/sksl_gpu.sksl +++ b/src/sksl/sksl_gpu.sksl @@ -566,7 +566,6 @@ half4 blend(SkBlendMode mode, half4 src, half4 dst) { // The max() guards against division by zero when the incoming color is transparent black half4 unpremul(half4 color) { return half4(color.rgb / max(color.a, 0.0001), color.a); } -float4 unpremul_float(float4 color) { return float4(color.rgb / max(color.a, 0.0001), color.a); } float2 proj(float3 p) { return p.xy / p.z; } diff --git a/src/sksl/sksl_public.sksl b/src/sksl/sksl_public.sksl index f4323798dc..f3a8e6448e 100644 --- a/src/sksl/sksl_public.sksl +++ b/src/sksl/sksl_public.sksl @@ -192,4 +192,3 @@ $bvec not($bvec x); // The max() guards against division by zero when the incoming color is transparent black half4 unpremul (half4 color) { return half4 (color.rgb / max(color.a, 0.0001), color.a); } -float4 unpremul_float(float4 color) { return float4(color.rgb / max(color.a, 0.0001), color.a); }