Add new Rehydrator enum for Array constructors.

These changes cause massive ripple effects in the dehydrated code, so
they're being landed in their own CL.

Change-Id: Ia66bbe02dd58ed50da303f40480d396d75fa6ecd
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/391300
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
This commit is contained in:
John Stiles 2021-04-01 13:39:33 -04:00
parent b09aaa2df4
commit 92f2d9340e
8 changed files with 6787 additions and 6785 deletions

View File

@ -51,6 +51,8 @@ public:
kBuiltinLayout_Command,
// Type type, uint8 argCount, Expression[] arguments
kConstructor_Command,
// Type type, uint8 argCount, Expression[] arguments
kConstructorArray_Command,
// Type type, Expression argument
kConstructorDiagonalMatrix_Command,
kContinue_Command,

View File

@ -27,121 +27,121 @@ static uint8_t SKSL_INCLUDE_sksl_fp[] = {42,1,
5,107,76,97,115,116,
9,107,84,111,80,114,101,109,117,108,
11,107,84,111,85,110,112,114,101,109,117,108,
43,34,0,
16,1,0,2,0,
16,2,0,17,0,
47,3,0,
31,
30,0,32,0,0,255,255,255,255,255,15,0,255,255,255,255,30,0,30,0,0,2,31,0,
44,4,0,44,0,0,
44,34,0,
17,1,0,2,0,
17,2,0,17,0,
48,3,0,
32,
31,0,32,0,0,255,255,255,255,255,15,0,255,255,255,255,30,0,30,0,0,2,31,0,
45,4,0,44,0,0,
0,5,0,
41,4,0,1,
47,6,0,
31,
30,0,32,0,0,255,255,255,255,255,15,39,255,255,255,255,30,0,30,0,0,0,51,0,
41,5,0,0,
47,7,0,
31,
30,0,32,0,0,255,255,255,255,255,15,39,255,255,255,255,30,0,30,0,0,0,67,0,
44,8,0,84,0,0,
47,9,0,
31,
30,0,32,0,0,255,255,255,255,255,15,39,255,255,255,255,30,0,30,0,0,0,90,0,
41,8,0,0,
47,10,0,
31,
30,0,32,0,0,255,255,255,255,255,15,39,255,255,255,255,30,0,30,0,0,0,110,0,
41,8,0,0,
47,11,0,
31,
30,0,32,0,0,255,255,255,255,255,27,39,255,255,255,255,30,0,30,0,0,0,135,0,
44,12,0,144,0,0,
47,13,0,
31,
30,0,32,0,0,255,255,255,255,255,28,39,255,255,255,255,30,0,30,0,0,0,149,0,
41,12,0,0,
47,14,0,
10,159,0,
44,15,0,162,0,3,
24,16,0,
10,180,0,1,14,0,
41,8,0,
47,17,0,
10,159,0,
41,15,0,3,
47,18,0,
10,187,0,
44,19,0,197,0,3,
46,20,0,2,
41,16,0,
24,21,0,
10,180,0,2,17,0,18,0,
41,8,0,
41,21,0,
47,22,0,
10,159,0,
41,15,0,3,
47,23,0,
10,206,0,
44,24,0,213,0,3,
46,25,0,3,
41,16,0,
41,21,0,
24,26,0,
10,180,0,2,22,0,23,0,
41,8,0,
41,26,0,
47,27,0,
10,159,0,
41,15,0,3,
47,28,0,
10,220,0,
41,8,0,3,
46,29,0,4,
41,16,0,
41,21,0,
41,26,0,
24,30,0,
10,180,0,2,27,0,28,0,
41,8,0,
41,30,0,
47,31,0,
10,159,0,
41,15,0,3,
47,32,0,
10,220,0,
41,8,0,3,
47,33,0,
10,187,0,
41,19,0,3,
46,34,0,5,
41,16,0,
41,21,0,
41,26,0,
41,30,0,
24,35,0,
10,180,0,3,31,0,32,0,33,0,
41,8,0,
41,35,0,
47,36,0,
10,159,0,
41,15,0,3,
47,37,0,
10,220,0,
41,8,0,3,
47,38,0,
10,206,0,
41,24,0,3,
46,39,0,6,
41,16,0,
41,21,0,
41,26,0,
41,30,0,
41,35,0,
24,40,0,
10,180,0,3,36,0,37,0,38,0,
41,8,0,
41,40,0,10,0,
42,4,0,1,
48,6,0,
32,
31,0,32,0,0,255,255,255,255,255,15,39,255,255,255,255,30,0,30,0,0,0,51,0,
42,5,0,0,
48,7,0,
32,
31,0,32,0,0,255,255,255,255,255,15,39,255,255,255,255,30,0,30,0,0,0,67,0,
45,8,0,84,0,0,
48,9,0,
32,
31,0,32,0,0,255,255,255,255,255,15,39,255,255,255,255,30,0,30,0,0,0,90,0,
42,8,0,0,
48,10,0,
32,
31,0,32,0,0,255,255,255,255,255,15,39,255,255,255,255,30,0,30,0,0,0,110,0,
42,8,0,0,
48,11,0,
32,
31,0,32,0,0,255,255,255,255,255,27,39,255,255,255,255,30,0,30,0,0,0,135,0,
45,12,0,144,0,0,
48,13,0,
32,
31,0,32,0,0,255,255,255,255,255,28,39,255,255,255,255,30,0,30,0,0,0,149,0,
42,12,0,0,
48,14,0,
11,159,0,
45,15,0,162,0,3,
25,16,0,
11,180,0,1,14,0,
42,8,0,
48,17,0,
11,159,0,
42,15,0,3,
48,18,0,
11,187,0,
45,19,0,197,0,3,
47,20,0,2,
42,16,0,
25,21,0,
11,180,0,2,17,0,18,0,
42,8,0,
42,21,0,
48,22,0,
11,159,0,
42,15,0,3,
48,23,0,
11,206,0,
45,24,0,213,0,3,
47,25,0,3,
42,16,0,
42,21,0,
25,26,0,
11,180,0,2,22,0,23,0,
42,8,0,
42,26,0,
48,27,0,
11,159,0,
42,15,0,3,
48,28,0,
11,220,0,
42,8,0,3,
47,29,0,4,
42,16,0,
42,21,0,
42,26,0,
25,30,0,
11,180,0,2,27,0,28,0,
42,8,0,
42,30,0,
48,31,0,
11,159,0,
42,15,0,3,
48,32,0,
11,220,0,
42,8,0,3,
48,33,0,
11,187,0,
42,19,0,3,
47,34,0,5,
42,16,0,
42,21,0,
42,26,0,
42,30,0,
25,35,0,
11,180,0,3,31,0,32,0,33,0,
42,8,0,
42,35,0,
48,36,0,
11,159,0,
42,15,0,3,
48,37,0,
11,220,0,
42,8,0,3,
48,38,0,
11,206,0,
42,24,0,3,
47,39,0,6,
42,16,0,
42,21,0,
42,26,0,
42,30,0,
42,35,0,
25,40,0,
11,180,0,3,36,0,37,0,38,0,
42,8,0,
42,40,0,10,0,
0,0,
1,0,
5,0,
@ -152,78 +152,78 @@ static uint8_t SKSL_INCLUDE_sksl_fp[] = {42,1,
2,0,
9,0,
8,0,
13,
15,2,0,
43,5,0,
47,41,0,
31,
9,1,226,0,
41,1,0,0,
47,42,0,
31,
9,1,234,0,
41,1,0,0,
47,43,0,
31,
9,1,242,0,
41,1,0,0,
47,44,0,
31,
9,1,1,1,
41,1,0,0,
47,45,0,
31,
9,1,16,1,
41,1,0,0,5,0,
14,
16,2,0,
44,5,0,
48,41,0,
32,
10,1,226,0,
42,1,0,0,
48,42,0,
32,
10,1,234,0,
42,1,0,0,
48,43,0,
32,
10,1,242,0,
42,1,0,0,
48,44,0,
32,
10,1,1,1,
42,1,0,0,
48,45,0,
32,
10,1,16,1,
42,1,0,0,5,0,
1,0,
0,0,
3,0,
2,0,
4,0,0,0,0,0,1,0,0,0,2,0,0,0,3,0,0,0,3,0,0,0,
15,17,0,
43,3,0,
47,46,0,
31,
9,1,22,1,
41,2,0,0,
47,47,0,
31,
9,1,32,1,
41,2,0,0,
47,48,0,
31,
9,1,16,1,
41,2,0,0,3,0,
16,17,0,
44,3,0,
48,46,0,
32,
10,1,22,1,
42,2,0,0,
48,47,0,
32,
10,1,32,1,
42,2,0,0,
48,48,0,
32,
10,1,16,1,
42,2,0,0,3,0,
2,0,
0,0,
1,0,0,0,0,0,1,0,0,0,1,0,0,0,
49,
48,3,0,
41,4,0,0,
51,
49,
48,6,0,
41,4,0,1,
51,
49,
48,7,0,
41,8,0,0,
51,
49,
48,9,0,
41,8,0,0,
51,
49,
48,10,0,
41,8,0,0,
51,
49,
48,11,0,
41,12,0,0,
51,
49,
48,13,0,
41,12,0,0,
51,
14,};
50,
49,3,0,
42,4,0,0,
52,
50,
49,6,0,
42,4,0,1,
52,
50,
49,7,0,
42,8,0,0,
52,
50,
49,9,0,
42,8,0,0,
52,
50,
49,10,0,
42,8,0,0,
52,
50,
49,11,0,
42,12,0,0,
52,
50,
49,13,0,
42,12,0,0,
52,
15,};
static constexpr size_t SKSL_INCLUDE_sksl_fp_LENGTH = sizeof(SKSL_INCLUDE_sksl_fp);

View File

@ -11,35 +11,35 @@ static uint8_t SKSL_INCLUDE_sksl_frag[] = {124,0,
8,115,107,95,87,105,100,116,104,
4,104,97,108,102,
9,115,107,95,72,101,105,103,104,116,
43,7,0,
47,1,0,
31,
30,0,32,0,0,255,255,255,255,255,15,0,255,255,255,255,2,0,2,0,0,2,3,0,
44,2,0,16,0,0,
47,3,0,
31,
30,0,32,0,0,255,255,255,255,255,17,0,255,255,255,255,2,0,2,0,0,2,23,0,
44,4,0,36,0,0,
47,5,0,
31,
30,0,32,0,0,255,255,255,255,255,15,39,255,255,255,255,2,0,2,0,0,4,41,0,
44,6,0,66,0,0,
47,7,0,
31,
30,0,41,0,0,0,255,255,0,255,17,39,255,255,255,255,2,0,2,0,0,4,72,0,
41,6,0,0,
47,8,0,
31,
30,0,32,0,0,255,255,255,255,255,24,39,255,255,255,255,2,0,2,0,0,0,85,0,
41,6,0,0,
47,9,0,
31,
30,0,32,0,0,255,255,255,255,255,27,39,255,255,255,255,2,0,2,0,0,0,102,0,
44,10,0,111,0,0,
47,11,0,
31,
30,0,32,0,0,255,255,255,255,255,28,39,255,255,255,255,2,0,2,0,0,0,116,0,
41,10,0,0,7,0,
44,7,0,
48,1,0,
32,
31,0,32,0,0,255,255,255,255,255,15,0,255,255,255,255,2,0,2,0,0,2,3,0,
45,2,0,16,0,0,
48,3,0,
32,
31,0,32,0,0,255,255,255,255,255,17,0,255,255,255,255,2,0,2,0,0,2,23,0,
45,4,0,36,0,0,
48,5,0,
32,
31,0,32,0,0,255,255,255,255,255,15,39,255,255,255,255,2,0,2,0,0,4,41,0,
45,6,0,66,0,0,
48,7,0,
32,
31,0,41,0,0,0,255,255,0,255,17,39,255,255,255,255,2,0,2,0,0,4,72,0,
42,6,0,0,
48,8,0,
32,
31,0,32,0,0,255,255,255,255,255,24,39,255,255,255,255,2,0,2,0,0,0,85,0,
42,6,0,0,
48,9,0,
32,
31,0,32,0,0,255,255,255,255,255,27,39,255,255,255,255,2,0,2,0,0,0,102,0,
45,10,0,111,0,0,
48,11,0,
32,
31,0,32,0,0,255,255,255,255,255,28,39,255,255,255,255,2,0,2,0,0,0,116,0,
42,10,0,0,7,0,
2,0,
1,0,
3,0,
@ -47,34 +47,34 @@ static uint8_t SKSL_INCLUDE_sksl_frag[] = {124,0,
6,0,
4,0,
5,0,
13,
49,
48,1,0,
41,2,0,0,
51,
49,
48,3,0,
41,4,0,0,
51,
49,
48,5,0,
41,6,0,0,
51,
49,
48,7,0,
41,6,0,0,
51,
49,
48,8,0,
41,6,0,0,
51,
49,
48,9,0,
41,10,0,0,
51,
49,
48,11,0,
41,10,0,0,
51,
14,};
14,
50,
49,1,0,
42,2,0,0,
52,
50,
49,3,0,
42,4,0,0,
52,
50,
49,5,0,
42,6,0,0,
52,
50,
49,7,0,
42,6,0,0,
52,
50,
49,8,0,
42,6,0,0,
52,
50,
49,9,0,
42,10,0,0,
52,
50,
49,11,0,
42,10,0,0,
52,
15,};
static constexpr size_t SKSL_INCLUDE_sksl_frag_LENGTH = sizeof(SKSL_INCLUDE_sksl_frag);

View File

@ -13,54 +13,54 @@ static uint8_t SKSL_INCLUDE_sksl_geom[] = {134,0,
18,69,110,100,83,116,114,101,97,109,80,114,105,109,105,116,105,118,101,
10,69,109,105,116,86,101,114,116,101,120,
12,69,110,100,80,114,105,109,105,116,105,118,101,
43,12,0,
38,1,0,2,0,2,
31,
30,0,32,0,0,255,255,255,255,255,0,0,255,255,255,255,15,0,15,0,0,0,16,0,
44,2,0,28,0,
31,
30,0,32,0,0,255,255,255,255,255,1,0,255,255,255,255,15,0,15,0,0,0,35,0,
44,3,0,48,0,
47,4,0,
31,
30,0,32,0,0,255,255,255,255,255,18,39,255,255,255,255,15,0,15,0,0,2,54,0,
44,12,0,
39,1,0,2,0,2,
32,
31,0,32,0,0,255,255,255,255,255,0,0,255,255,255,255,15,0,15,0,0,0,16,0,
45,2,0,28,0,
32,
31,0,32,0,0,255,255,255,255,255,1,0,255,255,255,255,15,0,15,0,0,0,35,0,
45,3,0,48,0,
48,4,0,
32,
31,0,32,0,0,255,255,255,255,255,18,39,255,255,255,255,15,0,15,0,0,2,54,0,
0,5,0,
41,1,0,255,0,
38,6,0,2,0,2,
31,
30,0,32,0,0,255,255,255,255,255,0,0,255,255,255,255,15,0,15,0,0,0,16,0,
41,2,0,
31,
30,0,32,0,0,255,255,255,255,255,1,0,255,255,255,255,15,0,15,0,0,0,35,0,
41,3,0,
47,7,0,
31,
30,0,32,0,0,255,255,255,255,255,23,39,255,255,255,255,15,0,15,0,0,4,2,0,
41,6,0,0,
18,7,0,0,
18,7,0,1,
47,8,0,
10,60,0,
44,9,0,67,0,3,
24,10,0,
31,
9,64,71,0,1,8,0,
44,11,0,88,0,
47,12,0,
10,60,0,
41,9,0,3,
24,13,0,
31,
9,64,93,0,1,12,0,
41,11,0,
24,14,0,
31,
9,64,112,0,0,
41,11,0,
24,15,0,
31,
9,64,123,0,0,
41,11,0,7,0,
42,1,0,255,0,
39,6,0,2,0,2,
32,
31,0,32,0,0,255,255,255,255,255,0,0,255,255,255,255,15,0,15,0,0,0,16,0,
42,2,0,
32,
31,0,32,0,0,255,255,255,255,255,1,0,255,255,255,255,15,0,15,0,0,0,35,0,
42,3,0,
48,7,0,
32,
31,0,32,0,0,255,255,255,255,255,23,39,255,255,255,255,15,0,15,0,0,4,2,0,
42,6,0,0,
19,7,0,0,
19,7,0,1,
48,8,0,
11,60,0,
45,9,0,67,0,3,
25,10,0,
32,
10,64,71,0,1,8,0,
45,11,0,88,0,
48,12,0,
11,60,0,
42,9,0,3,
25,13,0,
32,
10,64,93,0,1,12,0,
42,11,0,
25,14,0,
32,
10,64,112,0,0,
42,11,0,
25,15,0,
32,
10,64,123,0,0,
42,11,0,7,0,
7,0,
10,0,
11,0,
@ -68,10 +68,10 @@ static uint8_t SKSL_INCLUDE_sksl_geom[] = {134,0,
5,0,
4,0,
1,0,
13,
28,
41,4,0,2,0,54,0,255,
28,
41,7,0,2,0,15,0,0,
14,};
14,
29,
42,4,0,2,0,54,0,255,
29,
42,7,0,2,0,15,0,0,
15,};
static constexpr size_t SKSL_INCLUDE_sksl_geom_LENGTH = sizeof(SKSL_INCLUDE_sksl_geom);

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -10,48 +10,48 @@ static uint8_t SKSL_INCLUDE_sksl_runtime[] = {88,0,
6,102,108,111,97,116,50,
9,116,114,97,110,115,102,111,114,109,
8,102,108,111,97,116,51,120,51,
43,11,0,
47,1,0,
31,
30,0,32,0,0,255,255,255,255,255,15,0,255,255,255,255,2,0,2,0,0,0,3,0,
44,2,0,16,0,0,
47,3,0,
10,23,0,
44,4,0,26,0,3,
24,5,0,
10,44,0,1,3,0,
44,6,0,51,0,
47,7,0,
10,23,0,
41,4,0,3,
47,8,0,
10,57,0,
44,9,0,64,0,3,
46,10,0,2,
41,5,0,
24,11,0,
10,44,0,2,7,0,8,0,
41,6,0,
41,11,0,
47,12,0,
10,23,0,
41,4,0,3,
47,13,0,
10,71,0,
44,14,0,81,0,3,
46,15,0,3,
41,5,0,
41,11,0,
24,16,0,
10,44,0,2,12,0,13,0,
41,6,0,
41,16,0,2,0,
44,11,0,
48,1,0,
32,
31,0,32,0,0,255,255,255,255,255,15,0,255,255,255,255,2,0,2,0,0,0,3,0,
45,2,0,16,0,0,
48,3,0,
11,23,0,
45,4,0,26,0,3,
25,5,0,
11,44,0,1,3,0,
45,6,0,51,0,
48,7,0,
11,23,0,
42,4,0,3,
48,8,0,
11,57,0,
45,9,0,64,0,3,
47,10,0,2,
42,5,0,
25,11,0,
11,44,0,2,7,0,8,0,
42,6,0,
42,11,0,
48,12,0,
11,23,0,
42,4,0,3,
48,13,0,
11,71,0,
45,14,0,81,0,3,
47,15,0,3,
42,5,0,
42,11,0,
25,16,0,
11,44,0,2,12,0,13,0,
42,6,0,
42,16,0,2,0,
9,0,
0,0,
13,
49,
48,1,0,
41,2,0,0,
51,
14,};
14,
50,
49,1,0,
42,2,0,0,
52,
15,};
static constexpr size_t SKSL_INCLUDE_sksl_runtime_LENGTH = sizeof(SKSL_INCLUDE_sksl_runtime);

View File

@ -8,42 +8,42 @@ static uint8_t SKSL_INCLUDE_sksl_vert[] = {82,0,
11,115,107,95,86,101,114,116,101,120,73,68,
3,105,110,116,
13,115,107,95,73,110,115,116,97,110,99,101,73,68,
43,6,0,
38,1,0,2,0,2,
31,
30,0,32,0,0,255,255,255,255,255,0,0,255,255,255,255,15,0,15,0,0,0,16,0,
44,2,0,28,0,
31,
30,0,32,0,0,255,255,255,255,255,1,0,255,255,255,255,15,0,15,0,0,0,35,0,
44,3,0,48,0,
47,4,0,
31,
9,4,2,0,
41,1,0,0,
18,4,0,0,
18,4,0,1,
47,5,0,
31,
30,0,32,0,0,255,255,255,255,255,42,0,255,255,255,255,15,0,15,0,0,2,54,0,
44,6,0,66,0,0,
47,7,0,
31,
30,0,32,0,0,255,255,255,255,255,43,0,255,255,255,255,15,0,15,0,0,2,70,0,
41,6,0,0,4,0,
44,6,0,
39,1,0,2,0,2,
32,
31,0,32,0,0,255,255,255,255,255,0,0,255,255,255,255,15,0,15,0,0,0,16,0,
45,2,0,28,0,
32,
31,0,32,0,0,255,255,255,255,255,1,0,255,255,255,255,15,0,15,0,0,0,35,0,
45,3,0,48,0,
48,4,0,
32,
10,4,2,0,
42,1,0,0,
19,4,0,0,
19,4,0,1,
48,5,0,
32,
31,0,32,0,0,255,255,255,255,255,42,0,255,255,255,255,15,0,15,0,0,2,54,0,
45,6,0,66,0,0,
48,7,0,
32,
31,0,32,0,0,255,255,255,255,255,43,0,255,255,255,255,15,0,15,0,0,2,70,0,
42,6,0,0,4,0,
5,0,
3,0,
2,0,
4,0,
13,
28,
41,4,0,2,0,15,0,0,
49,
48,5,0,
41,6,0,0,
51,
49,
48,7,0,
41,6,0,0,
51,
14,};
14,
29,
42,4,0,2,0,15,0,0,
50,
49,5,0,
42,6,0,0,
52,
50,
49,7,0,
42,6,0,0,
52,
15,};
static constexpr size_t SKSL_INCLUDE_sksl_vert_LENGTH = sizeof(SKSL_INCLUDE_sksl_vert);