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

Increased the size of the dehydrator's offset and binding fields

Browse Source 
This is in preparation for dehydrating the entire test corpus, where it
turns out a single byte is inadequate for these fields.

Change-Id: I1f410b664fb777b57bdbcad07ad4f2f97ab812bc
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/500436
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
This commit is contained in:
Ethan Nicholas 2022-01-26 15:28:33 -05:00 committed by SkCQ
parent e9e62dc7c9
commit f50616aa1e
8 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sksl/SkSLDehydrator.cpp
View File

@ -90,8 +90,8 @@ void Dehydrator::write(Layout l) {
this->writeCommand(Rehydrator::kLayout_Command);
fBody.write32(l.fFlags);
this->writeS8(l.fLocation);
this->writeS8(l.fOffset);
this->writeS8(l.fBinding);
this->writeS16(l.fOffset);
this->writeS16(l.fBinding);
this->writeS8(l.fIndex);
this->writeS8(l.fSet);
this->writeS16(l.fBuiltin);

4
src/sksl/SkSLRehydrator.cpp
View File

@ -107,8 +107,8 @@ Layout Rehydrator::layout() {
case kLayout_Command: {
int flags = this->readU32();
int location = this->readS8();
int offset = this->readS8();
int binding = this->readS8();
int offset = this->readS16();
int binding = this->readS16();
int index = this->readS8();
int set = this->readS8();
int builtin = this->readS16();

4
src/sksl/SkSLRehydrator.h
View File

@ -32,7 +32,7 @@ class Type;
*/
class Rehydrator {
public:
static constexpr uint16_t kVersion = 2;
static constexpr uint16_t kVersion = 3;
enum Command {
// uint16 id, Type componentType, uint8 count
@ -94,7 +94,7 @@ public:
kInterfaceBlock_Command,
// int32 value
kIntLiteral_Command,
// int32 flags, int8 location, int8 offset, int8 binding, int8 index, int8 set,
// int32 flags, int8 location, int16 offset, int16 binding, int8 index, int8 set,
// int16 builtin, int8 inputAttachmentIndex
kLayout_Command,
// Layout layout, uint8 flags

12
src/sksl/generated/sksl_frag.dehydrated.sksl
View File

@ -1,4 +1,4 @@
static uint8_t SKSL_INCLUDE_sksl_frag[] = {2,0,96,0,
static uint8_t SKSL_INCLUDE_sksl_frag[] = {3,0,96,0,
12,115,107,95,70,114,97,103,67,111,111,114,100,
6,102,108,111,97,116,52,
12,115,107,95,67,108,111,99,107,119,105,115,101,
@ -10,23 +10,23 @@ static uint8_t SKSL_INCLUDE_sksl_frag[] = {2,0,96,0,
47,1,5,0,
51,1,0,
36,
35,0,2,0,0,255,255,255,255,255,15,0,255,16,2,0,
35,0,2,0,0,255,255,255,255,255,255,255,15,0,255,16,2,0,
48,2,0,15,0,0,
51,3,0,
36,
35,0,2,0,0,255,255,255,255,255,17,0,255,16,22,0,
35,0,2,0,0,255,255,255,255,255,255,255,17,0,255,16,22,0,
48,4,0,35,0,0,
51,5,0,
36,
35,144,2,0,0,0,255,255,0,255,17,39,255,32,40,0,
35,144,2,0,0,0,255,255,255,255,0,255,17,39,255,32,40,0,
48,6,0,53,0,0,
51,7,0,
36,
35,0,2,0,0,255,255,255,255,255,24,39,255,0,59,0,
35,0,2,0,0,255,255,255,255,255,255,255,24,39,255,0,59,0,
46,6,0,0,
51,8,0,
36,
35,0,2,0,0,255,255,255,255,255,28,39,255,32,76,0,
35,0,2,0,0,255,255,255,255,255,255,255,28,39,255,32,76,0,
46,6,0,0,5,0,
1,0,
2,0,

2
src/sksl/generated/sksl_gpu.dehydrated.sksl
View File

@ -1,4 +1,4 @@
static uint8_t SKSL_INCLUDE_sksl_gpu[] = {2,0,189,8,
static uint8_t SKSL_INCLUDE_sksl_gpu[] = {3,0,189,8,
7,100,101,103,114,101,101,115,
8,36,103,101,110,84,121,112,101,
7,114,97,100,105,97,110,115,

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

@ -1,4 +1,4 @@
static uint8_t SKSL_INCLUDE_sksl_public[] = {2,0,227,3,
static uint8_t SKSL_INCLUDE_sksl_public[] = {3,0,227,3,
7,100,101,103,114,101,101,115,
8,36,103,101,110,84,121,112,101,
7,114,97,100,105,97,110,115,

4
src/sksl/generated/sksl_rt_shader.dehydrated.sksl
View File

@ -1,10 +1,10 @@
static uint8_t SKSL_INCLUDE_sksl_rt_shader[] = {2,0,20,0,
static uint8_t SKSL_INCLUDE_sksl_rt_shader[] = {3,0,20,0,
12,115,107,95,70,114,97,103,67,111,111,114,100,
6,102,108,111,97,116,52,
47,1,1,0,
51,1,0,
36,
35,0,2,0,0,255,255,255,255,255,15,0,255,0,2,0,
35,0,2,0,0,255,255,255,255,255,255,255,15,0,255,0,2,0,
48,2,0,15,0,0,1,0,
0,0,
20,

10
src/sksl/generated/sksl_vert.dehydrated.sksl
View File

@ -1,4 +1,4 @@
static uint8_t SKSL_INCLUDE_sksl_vert[] = {2,0,82,0,
static uint8_t SKSL_INCLUDE_sksl_vert[] = {3,0,82,0,
12,115,107,95,80,101,114,86,101,114,116,101,120,
11,115,107,95,80,111,115,105,116,105,111,110,
6,102,108,111,97,116,52,
@ -11,10 +11,10 @@ static uint8_t SKSL_INCLUDE_sksl_vert[] = {2,0,82,0,
47,1,6,0,
43,1,0,2,0,2,
36,
35,0,2,0,0,255,255,255,255,255,0,0,255,0,15,0,
35,0,2,0,0,255,255,255,255,255,255,255,0,0,255,0,15,0,
48,2,0,27,0,
36,
35,0,2,0,0,255,255,255,255,255,1,0,255,0,34,0,
35,0,2,0,0,255,255,255,255,255,255,255,1,0,255,0,34,0,
48,3,0,47,0,1,
51,4,0,
36,
@ -24,11 +24,11 @@ static uint8_t SKSL_INCLUDE_sksl_vert[] = {2,0,82,0,
23,4,0,1,
51,5,0,
36,
35,0,2,0,0,255,255,255,255,255,42,0,255,16,53,0,
35,0,2,0,0,255,255,255,255,255,255,255,42,0,255,16,53,0,
48,6,0,65,0,0,
51,7,0,
36,
35,0,2,0,0,255,255,255,255,255,43,0,255,16,69,0,
35,0,2,0,0,255,255,255,255,255,255,255,43,0,255,16,69,0,
46,6,0,0,4,0,
5,0,
3,0,