Remove GL image support from SkSL
This was added to Ganesh briefly in 2016 for an experiment, then
reverted, and never used.
Change-Id: I65849aff53acc14f9adc7585398fd09363a4ed65
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/374376
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
diff --git a/src/sksl/SkSLBuiltinTypes.cpp b/src/sksl/SkSLBuiltinTypes.cpp
index 59371a7..d369bd1 100644
--- a/src/sksl/SkSLBuiltinTypes.cpp
+++ b/src/sksl/SkSLBuiltinTypes.cpp
@@ -218,18 +218,6 @@
, fISampler2D(MakeSamplerType("isampler2D", *fITexture2D))
, fSampler(MakeSeparateSamplerType("sampler"))
- , fImage2D(MakeTextureType("image2D",
- SpvDim2D,
- /*isDepth=*/false,
- /*isArrayedTexture=*/false,
- /*isMultisampled=*/false,
- /*isSampled=*/true))
- , fIImage2D(MakeTextureType("iimage2D",
- SpvDim2D,
- /*isDepth=*/false,
- /*isArrayedTexture=*/false,
- /*isMultisampled=*/false,
- /*isSampled=*/true))
, fSubpassInput(MakeTextureType("subpassInput",
SpvDimSubpassData,
diff --git a/src/sksl/SkSLBuiltinTypes.h b/src/sksl/SkSLBuiltinTypes.h
index d8b6e9a..9c9bb2f 100644
--- a/src/sksl/SkSLBuiltinTypes.h
+++ b/src/sksl/SkSLBuiltinTypes.h
@@ -108,9 +108,6 @@
const std::unique_ptr<Type> fISampler2D;
const std::unique_ptr<Type> fSampler;
- const std::unique_ptr<Type> fImage2D;
- const std::unique_ptr<Type> fIImage2D;
-
const std::unique_ptr<Type> fSubpassInput;
const std::unique_ptr<Type> fSubpassInputMS;
diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
index 1235754..2a54e89 100644
--- a/src/sksl/SkSLCompiler.cpp
+++ b/src/sksl/SkSLCompiler.cpp
@@ -145,7 +145,6 @@
TYPE(Sampler2DRect),
TYPE(ISampler2D),
- TYPE(Image2D), TYPE(IImage2D),
TYPE(SubpassInput), TYPE(SubpassInputMS),
TYPE(Sampler),
diff --git a/src/sksl/SkSLDehydrator.cpp b/src/sksl/SkSLDehydrator.cpp
index 7b7a7b4..d4a60db 100644
--- a/src/sksl/SkSLDehydrator.cpp
+++ b/src/sksl/SkSLDehydrator.cpp
@@ -89,7 +89,6 @@
this->writeS8(l.fSet);
this->writeS16(l.fBuiltin);
this->writeS8(l.fInputAttachmentIndex);
- this->writeS8((int) l.fFormat);
this->writeS8(l.fPrimitive);
this->writeS8(l.fMaxVertices);
this->writeS8(l.fInvocations);
diff --git a/src/sksl/SkSLGLSLCodeGenerator.cpp b/src/sksl/SkSLGLSLCodeGenerator.cpp
index 5db75c4..ba9cbdc 100644
--- a/src/sksl/SkSLGLSLCodeGenerator.cpp
+++ b/src/sksl/SkSLGLSLCodeGenerator.cpp
@@ -1086,26 +1086,6 @@
if (modifiers.fFlags & Modifiers::kConst_Flag) {
this->write("const ");
}
- switch (modifiers.fLayout.fFormat) {
- case Layout::Format::kUnspecified:
- break;
- case Layout::Format::kRGBA32F: // fall through
- case Layout::Format::kR32F:
- this->write("highp ");
- break;
- case Layout::Format::kRGBA16F: // fall through
- case Layout::Format::kR16F: // fall through
- case Layout::Format::kLUMINANCE16F: // fall through
- case Layout::Format::kRG16F:
- this->write("mediump ");
- break;
- case Layout::Format::kRGBA8: // fall through
- case Layout::Format::kR8: // fall through
- case Layout::Format::kRGBA8I: // fall through
- case Layout::Format::kR8I:
- this->write("lowp ");
- break;
- }
}
void GLSLCodeGenerator::writeInterfaceBlock(const InterfaceBlock& intf) {
diff --git a/src/sksl/SkSLParser.cpp b/src/sksl/SkSLParser.cpp
index 832546d..418340f 100644
--- a/src/sksl/SkSLParser.cpp
+++ b/src/sksl/SkSLParser.cpp
@@ -892,7 +892,6 @@
int set = -1;
int builtin = -1;
int inputAttachmentIndex = -1;
- Layout::Format format = Layout::Format::kUnspecified;
Layout::Primitive primitive = Layout::kUnspecified_Primitive;
int maxVertices = -1;
int invocations = -1;
@@ -903,8 +902,8 @@
if (this->checkNext(Token::Kind::TK_LAYOUT)) {
if (!this->expect(Token::Kind::TK_LPAREN, "'('")) {
return Layout(flags, location, offset, binding, index, set, builtin,
- inputAttachmentIndex, format, primitive, maxVertices, invocations, marker,
- when, key, ctype);
+ inputAttachmentIndex, primitive, maxVertices, invocations, marker, when,
+ key, ctype);
}
for (;;) {
Token t = this->nextToken();
@@ -994,8 +993,6 @@
this->error(t, ("'" + text + "' is not a valid layout qualifier").c_str());
break;
}
- } else if (Layout::ReadFormat(text, &format)) {
- // AST::ReadFormat stored the result in 'format'.
} else {
this->error(t, ("'" + text + "' is not a valid layout qualifier").c_str());
}
@@ -1008,7 +1005,7 @@
}
}
return Layout(flags, location, offset, binding, index, set, builtin, inputAttachmentIndex,
- format, primitive, maxVertices, invocations, marker, when, key, ctype);
+ primitive, maxVertices, invocations, marker, when, key, ctype);
}
/* layout? (UNIFORM | CONST | IN | OUT | INOUT | LOWP | MEDIUMP | HIGHP | FLAT | NOPERSPECTIVE |
diff --git a/src/sksl/SkSLRehydrator.cpp b/src/sksl/SkSLRehydrator.cpp
index e4a817c..9d91666 100644
--- a/src/sksl/SkSLRehydrator.cpp
+++ b/src/sksl/SkSLRehydrator.cpp
@@ -102,7 +102,6 @@
int set = this->readS8();
int builtin = this->readS16();
int inputAttachmentIndex = this->readS8();
- int format = this->readS8();
int primitive = this->readS8();
int maxVertices = this->readS8();
int invocations = this->readS8();
@@ -111,9 +110,8 @@
int key = this->readS8();
int ctype = this->readS8();
return Layout(flags, location, offset, binding, index, set, builtin,
- inputAttachmentIndex, (Layout::Format) format,
- (Layout::Primitive) primitive, maxVertices, invocations, marker, when,
- (Layout::Key) key, (Layout::CType) ctype);
+ inputAttachmentIndex, (Layout::Primitive)primitive, maxVertices,
+ invocations, marker, when, (Layout::Key)key, (Layout::CType)ctype);
}
default:
SkASSERT(false);
diff --git a/src/sksl/SkSLSPIRVCodeGenerator.cpp b/src/sksl/SkSLSPIRVCodeGenerator.cpp
index a39811e..646748e 100644
--- a/src/sksl/SkSLSPIRVCodeGenerator.cpp
+++ b/src/sksl/SkSLSPIRVCodeGenerator.cpp
@@ -1996,7 +1996,7 @@
Modifiers(Layout(/*flags=*/0, /*location=*/-1,
fProgram.fConfig->fSettings.fRTHeightOffset,
/*binding=*/-1, /*index=*/-1, /*set=*/-1, /*builtin=*/-1,
- /*inputAttachmentIndex=*/-1, Layout::Format::kUnspecified,
+ /*inputAttachmentIndex=*/-1,
Layout::kUnspecified_Primitive, /*maxVertices=*/1,
/*invocations=*/-1, /*marker=*/"", /*when=*/"",
Layout::kNo_Key, Layout::CType::kDefault),
@@ -2018,7 +2018,7 @@
Modifiers modifiers(
Layout(flags, /*location=*/-1, /*offset=*/-1, binding, /*index=*/-1,
set, /*builtin=*/-1, /*inputAttachmentIndex=*/-1,
- Layout::Format::kUnspecified, Layout::kUnspecified_Primitive,
+ Layout::kUnspecified_Primitive,
/*maxVertices=*/-1, /*invocations=*/-1, /*marker=*/"", /*when=*/"",
Layout::kNo_Key, Layout::CType::kDefault),
Modifiers::kUniform_Flag);
diff --git a/src/sksl/generated/sksl_frag.dehydrated.sksl b/src/sksl/generated/sksl_frag.dehydrated.sksl
index 81600ea..ba0a2c75 100644
--- a/src/sksl/generated/sksl_frag.dehydrated.sksl
+++ b/src/sksl/generated/sksl_frag.dehydrated.sksl
@@ -34,7 +34,7 @@
43,9,0,83,0,0,
46,10,0,
30,
-29,0,0,0,0,0,255,255,0,255,17,39,255,255,255,255,255,89,0,89,0,0,0,4,90,0,
+29,0,0,0,0,0,255,255,0,255,17,39,255,255,255,255,89,0,89,0,0,0,4,90,0,
40,9,0,0,
46,11,0,
30,
diff --git a/src/sksl/generated/sksl_gpu.dehydrated.sksl b/src/sksl/generated/sksl_gpu.dehydrated.sksl
index 6446ae1..1b3c896 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[] = {23,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,
@@ -171,10 +171,6 @@
12,115,117,98,112,97,115,115,73,110,112,117,116,
11,115,117,98,112,97,115,115,76,111,97,100,
14,115,117,98,112,97,115,115,73,110,112,117,116,77,83,
-5,105,109,97,103,101,
-7,105,109,97,103,101,50,68,
-9,105,109,97,103,101,76,111,97,100,
-8,105,105,109,97,103,101,50,68,
4,100,70,100,120,
4,100,70,100,121,
6,102,119,105,100,116,104,
@@ -281,7 +277,7 @@
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,240,3,
+42,233,3,
15,1,0,2,0,
46,2,0,
9,14,0,
@@ -3205,595 +3201,574 @@
40,15,2,
40,106,3,
46,107,3,
-9,32,5,
-43,108,3,38,5,3,
+9,10,2,
+40,3,0,3,
+23,108,3,
+9,32,5,1,107,3,
+40,3,0,
46,109,3,
-9,191,4,
-40,43,3,3,
+9,10,2,
+40,3,0,3,
23,110,3,
-9,46,5,2,107,3,109,3,
-40,132,1,
+9,37,5,1,109,3,
+40,3,0,
46,111,3,
-9,32,5,
-43,112,3,56,5,3,
-46,113,3,
-9,191,4,
-40,43,3,3,
-45,114,3,2,
+9,10,2,
+40,49,0,3,
+45,112,3,2,
+40,108,3,
+23,113,3,
+9,32,5,1,111,3,
+40,49,0,
+40,113,3,
+46,114,3,
+9,10,2,
+40,49,0,3,
+45,115,3,2,
40,110,3,
-23,115,3,
-9,46,5,2,111,3,113,3,
-40,62,3,
-40,115,3,
-46,116,3,
+23,116,3,
+9,37,5,1,114,3,
+40,49,0,
+40,116,3,
+46,117,3,
9,10,2,
40,3,0,3,
-23,117,3,
-9,65,5,1,116,3,
+23,118,3,
+9,42,5,1,117,3,
40,3,0,
-46,118,3,
-9,10,2,
-40,3,0,3,
-23,119,3,
-9,70,5,1,118,3,
-40,3,0,
-46,120,3,
+46,119,3,
9,10,2,
40,49,0,3,
-45,121,3,2,
-40,117,3,
-23,122,3,
-9,65,5,1,120,3,
+45,120,3,2,
+40,118,3,
+23,121,3,
+9,42,5,1,119,3,
40,49,0,
-40,122,3,
+40,121,3,
+46,122,3,
+9,49,5,
+40,168,0,3,
46,123,3,
-9,10,2,
-40,49,0,3,
-45,124,3,2,
-40,119,3,
-23,125,3,
-9,70,5,1,123,3,
-40,49,0,
-40,125,3,
+9,193,4,
+40,211,0,3,
+23,124,3,
+9,61,5,2,122,3,123,3,
+40,168,0,
+46,125,3,
+9,49,5,
+40,126,1,3,
46,126,3,
-9,10,2,
-40,3,0,3,
-23,127,3,
-9,75,5,1,126,3,
-40,3,0,
-46,128,3,
-9,10,2,
-40,49,0,3,
-45,129,3,2,
-40,127,3,
-23,130,3,
-9,75,5,1,128,3,
-40,49,0,
-40,130,3,
-46,131,3,
-9,82,5,
-40,168,0,3,
-46,132,3,
9,193,4,
40,211,0,3,
-23,133,3,
-9,94,5,2,131,3,132,3,
-40,168,0,
+45,127,3,2,
+40,124,3,
+23,128,3,
+9,61,5,2,125,3,126,3,
+40,126,1,
+40,128,3,
+46,129,3,
+9,49,5,
+40,168,1,3,
+46,130,3,
+9,193,4,
+40,211,0,3,
+45,131,3,3,
+40,124,3,
+40,128,3,
+23,132,3,
+9,61,5,2,129,3,130,3,
+40,168,1,
+40,132,3,
+46,133,3,
+9,49,5,
+40,132,1,3,
46,134,3,
-9,82,5,
-40,126,1,3,
-46,135,3,
9,193,4,
40,211,0,3,
-45,136,3,2,
-40,133,3,
-23,137,3,
-9,94,5,2,134,3,135,3,
-40,126,1,
-40,137,3,
-46,138,3,
-9,82,5,
-40,168,1,3,
-46,139,3,
-9,193,4,
-40,211,0,3,
-45,140,3,3,
-40,133,3,
-40,137,3,
-23,141,3,
-9,94,5,2,138,3,139,3,
-40,168,1,
-40,141,3,
-46,142,3,
-9,82,5,
-40,132,1,3,
-46,143,3,
-9,193,4,
-40,211,0,3,
-45,144,3,4,
-40,133,3,
-40,137,3,
-40,141,3,
-23,145,3,
-9,94,5,2,142,3,143,3,
+45,135,3,4,
+40,124,3,
+40,128,3,
+40,132,3,
+23,136,3,
+9,61,5,2,133,3,134,3,
40,132,1,
-40,145,3,
-46,146,3,
-9,82,5,
+40,136,3,
+46,137,3,
+9,49,5,
40,168,0,3,
-46,147,3,
-9,114,5,
+46,138,3,
+9,81,5,
40,126,1,3,
-23,148,3,
-9,121,5,2,146,3,147,3,
+23,139,3,
+9,88,5,2,137,3,138,3,
40,168,0,
-46,149,3,
-9,82,5,
+46,140,3,
+9,49,5,
40,126,1,3,
-46,150,3,
-9,114,5,
+46,141,3,
+9,81,5,
40,126,1,3,
-45,151,3,2,
-40,148,3,
-23,152,3,
-9,121,5,2,149,3,150,3,
+45,142,3,2,
+40,139,3,
+23,143,3,
+9,88,5,2,140,3,141,3,
40,126,1,
-40,152,3,
-46,153,3,
-9,82,5,
+40,143,3,
+46,144,3,
+9,49,5,
40,168,1,3,
-46,154,3,
-9,114,5,
+46,145,3,
+9,81,5,
40,126,1,3,
-45,155,3,3,
-40,148,3,
-40,152,3,
-23,156,3,
-9,121,5,2,153,3,154,3,
+45,146,3,3,
+40,139,3,
+40,143,3,
+23,147,3,
+9,88,5,2,144,3,145,3,
40,168,1,
-40,156,3,
-46,157,3,
-9,82,5,
+40,147,3,
+46,148,3,
+9,49,5,
40,132,1,3,
-46,158,3,
-9,114,5,
+46,149,3,
+9,81,5,
40,126,1,3,
-45,159,3,4,
-40,148,3,
-40,152,3,
-40,156,3,
-23,160,3,
-9,121,5,2,157,3,158,3,
+45,150,3,4,
+40,139,3,
+40,143,3,
+40,147,3,
+23,151,3,
+9,88,5,2,148,3,149,3,
40,132,1,
-40,160,3,
+40,151,3,
+46,152,3,
+9,108,5,
+40,15,2,3,
+46,153,3,
+9,112,5,
+40,15,2,3,
+23,154,3,
+9,116,5,2,152,3,153,3,
+40,15,2,
+46,155,3,
+9,108,5,
+40,15,2,3,
+46,156,3,
+9,112,5,
+40,15,2,3,
+23,157,3,
+9,128,5,2,155,3,156,3,
+40,15,2,
+46,158,3,
+9,108,5,
+40,15,2,3,
+46,159,3,
+9,112,5,
+40,15,2,3,
+23,160,3,
+9,138,5,2,158,3,159,3,
+40,15,2,
46,161,3,
-9,141,5,
+9,108,5,
40,15,2,3,
46,162,3,
-9,145,5,
+9,112,5,
40,15,2,3,
23,163,3,
-9,149,5,2,161,3,162,3,
+9,148,5,2,161,3,162,3,
40,15,2,
46,164,3,
-9,141,5,
+9,108,5,
40,15,2,3,
46,165,3,
-9,145,5,
+9,112,5,
40,15,2,3,
23,166,3,
-9,161,5,2,164,3,165,3,
+9,163,5,2,164,3,165,3,
40,15,2,
46,167,3,
-9,141,5,
+9,108,5,
40,15,2,3,
46,168,3,
-9,145,5,
+9,112,5,
40,15,2,3,
23,169,3,
-9,171,5,2,167,3,168,3,
+9,178,5,2,167,3,168,3,
40,15,2,
46,170,3,
-9,141,5,
+9,108,5,
40,15,2,3,
46,171,3,
-9,145,5,
+9,112,5,
40,15,2,3,
23,172,3,
-9,181,5,2,170,3,171,3,
+9,191,5,2,170,3,171,3,
40,15,2,
46,173,3,
-9,141,5,
+9,108,5,
40,15,2,3,
46,174,3,
-9,145,5,
+9,112,5,
40,15,2,3,
23,175,3,
-9,196,5,2,173,3,174,3,
+9,204,5,2,173,3,174,3,
40,15,2,
46,176,3,
-9,141,5,
+9,108,5,
40,15,2,3,
46,177,3,
-9,145,5,
+9,112,5,
40,15,2,3,
23,178,3,
-9,211,5,2,176,3,177,3,
+9,218,5,2,176,3,177,3,
40,15,2,
46,179,3,
-9,141,5,
+9,108,5,
40,15,2,3,
46,180,3,
-9,145,5,
+9,112,5,
40,15,2,3,
23,181,3,
-9,224,5,2,179,3,180,3,
+9,232,5,2,179,3,180,3,
40,15,2,
46,182,3,
-9,141,5,
+9,108,5,
40,15,2,3,
46,183,3,
-9,145,5,
+9,112,5,
40,15,2,3,
23,184,3,
-9,237,5,2,182,3,183,3,
+9,247,5,2,182,3,183,3,
40,15,2,
46,185,3,
-9,141,5,
+9,108,5,
40,15,2,3,
46,186,3,
-9,145,5,
+9,112,5,
40,15,2,3,
23,187,3,
-9,251,5,2,185,3,186,3,
+9,6,6,2,185,3,186,3,
40,15,2,
46,188,3,
-9,141,5,
+9,108,5,
40,15,2,3,
46,189,3,
-9,145,5,
+9,112,5,
40,15,2,3,
23,190,3,
-9,9,6,2,188,3,189,3,
+9,16,6,2,188,3,189,3,
40,15,2,
46,191,3,
-9,141,5,
+9,108,5,
40,15,2,3,
46,192,3,
-9,145,5,
+9,112,5,
40,15,2,3,
23,193,3,
-9,24,6,2,191,3,192,3,
+9,27,6,2,191,3,192,3,
40,15,2,
46,194,3,
-9,141,5,
+9,108,5,
40,15,2,3,
46,195,3,
-9,145,5,
+9,112,5,
40,15,2,3,
23,196,3,
-9,39,6,2,194,3,195,3,
+9,42,6,2,194,3,195,3,
40,15,2,
46,197,3,
-9,141,5,
-40,15,2,3,
+9,116,4,
+40,4,2,3,
46,198,3,
-9,145,5,
-40,15,2,3,
+9,55,6,
+40,4,2,3,
23,199,3,
-9,49,6,2,197,3,198,3,
-40,15,2,
+9,57,6,2,197,3,198,3,
+40,176,0,
46,200,3,
-9,141,5,
+9,108,5,
40,15,2,3,
46,201,3,
-9,145,5,
+9,112,5,
40,15,2,3,
23,202,3,
-9,60,6,2,200,3,201,3,
+9,82,6,2,200,3,201,3,
40,15,2,
46,203,3,
-9,141,5,
+9,108,5,
40,15,2,3,
46,204,3,
-9,145,5,
+9,112,5,
40,15,2,3,
23,205,3,
-9,75,6,2,203,3,204,3,
+9,96,6,2,203,3,204,3,
40,15,2,
46,206,3,
-9,116,4,
-40,4,2,3,
+9,108,5,
+40,15,2,3,
46,207,3,
-9,88,6,
-40,4,2,3,
+9,112,5,
+40,15,2,3,
23,208,3,
-9,90,6,2,206,3,207,3,
-40,176,0,
+9,109,6,2,206,3,207,3,
+40,15,2,
46,209,3,
-9,141,5,
-40,15,2,3,
+9,123,6,
+40,176,0,3,
46,210,3,
-9,145,5,
-40,15,2,3,
+9,55,6,
+40,176,0,3,
23,211,3,
-9,115,6,2,209,3,210,3,
-40,15,2,
-46,212,3,
-9,141,5,
-40,15,2,3,
-46,213,3,
-9,145,5,
-40,15,2,3,
-23,214,3,
-9,129,6,2,212,3,213,3,
-40,15,2,
-46,215,3,
-9,141,5,
-40,15,2,3,
-46,216,3,
-9,145,5,
-40,15,2,3,
-23,217,3,
-9,142,6,2,215,3,216,3,
-40,15,2,
-46,218,3,
-9,156,6,
-40,176,0,3,
-46,219,3,
-9,88,6,
-40,176,0,3,
-23,220,3,
-9,158,6,2,218,3,219,3,
+9,125,6,2,209,3,210,3,
40,176,0,
-46,221,3,
-9,156,6,
+46,212,3,
+9,123,6,
40,172,1,3,
-46,222,3,
-9,88,6,
+46,213,3,
+9,55,6,
40,176,0,3,
-45,223,3,2,
-40,220,3,
-23,224,3,
-9,158,6,2,221,3,222,3,
+45,214,3,2,
+40,211,3,
+23,215,3,
+9,125,6,2,212,3,213,3,
40,172,1,
-40,224,3,
-46,225,3,
+40,215,3,
+46,216,3,
9,116,4,
40,4,2,3,
-46,226,3,
-9,88,6,
+46,217,3,
+9,55,6,
40,4,2,3,
-23,227,3,
-9,174,6,2,225,3,226,3,
+23,218,3,
+9,141,6,2,216,3,217,3,
40,176,0,
+46,219,3,
+9,108,5,
+40,15,2,3,
+46,220,3,
+9,112,5,
+40,15,2,3,
+23,221,3,
+9,164,6,2,219,3,220,3,
+40,15,2,
+46,222,3,
+9,116,4,
+40,4,2,3,
+46,223,3,
+9,55,6,
+40,4,2,3,
+23,224,3,
+9,182,6,2,222,3,223,3,
+40,176,0,
+46,225,3,
+9,108,5,
+40,15,2,3,
+46,226,3,
+9,112,5,
+40,15,2,3,
+23,227,3,
+9,204,6,2,225,3,226,3,
+40,15,2,
46,228,3,
-9,141,5,
+9,108,5,
40,15,2,3,
46,229,3,
-9,145,5,
+9,112,5,
40,15,2,3,
23,230,3,
-9,197,6,2,228,3,229,3,
+9,221,6,2,228,3,229,3,
40,15,2,
46,231,3,
9,116,4,
40,4,2,3,
46,232,3,
-9,88,6,
+9,55,6,
40,4,2,3,
23,233,3,
-9,215,6,2,231,3,232,3,
+9,238,6,2,231,3,232,3,
40,176,0,
46,234,3,
-9,141,5,
+9,108,5,
40,15,2,3,
46,235,3,
-9,145,5,
+9,112,5,
40,15,2,3,
23,236,3,
-9,237,6,2,234,3,235,3,
+9,4,7,2,234,3,235,3,
40,15,2,
46,237,3,
-9,141,5,
+9,108,5,
40,15,2,3,
46,238,3,
-9,145,5,
+9,112,5,
40,15,2,3,
23,239,3,
-9,254,6,2,237,3,238,3,
+9,21,7,2,237,3,238,3,
40,15,2,
46,240,3,
-9,116,4,
-40,4,2,3,
+9,108,5,
+40,15,2,3,
46,241,3,
-9,88,6,
-40,4,2,3,
+9,112,5,
+40,15,2,3,
23,242,3,
-9,15,7,2,240,3,241,3,
-40,176,0,
+9,38,7,2,240,3,241,3,
+40,15,2,
46,243,3,
-9,141,5,
+9,108,5,
40,15,2,3,
46,244,3,
-9,145,5,
+9,112,5,
40,15,2,3,
23,245,3,
-9,37,7,2,243,3,244,3,
+9,54,7,2,243,3,244,3,
40,15,2,
46,246,3,
-9,141,5,
-40,15,2,3,
-46,247,3,
-9,145,5,
-40,15,2,3,
-23,248,3,
-9,54,7,2,246,3,247,3,
-40,15,2,
-46,249,3,
-9,141,5,
-40,15,2,3,
-46,250,3,
-9,145,5,
-40,15,2,3,
-23,251,3,
-9,71,7,2,249,3,250,3,
-40,15,2,
-46,252,3,
-9,141,5,
-40,15,2,3,
-46,253,3,
-9,145,5,
-40,15,2,3,
-23,254,3,
-9,87,7,2,252,3,253,3,
-40,15,2,
-46,255,3,
-9,102,7,
+9,69,7,
40,172,1,3,
-23,0,4,
-9,108,7,1,255,3,
+23,247,3,
+9,75,7,1,246,3,
40,176,0,
+46,248,3,
+9,98,7,
+40,172,1,3,
+46,249,3,
+9,110,7,
+40,176,0,3,
+46,250,3,
+9,116,7,
+40,172,1,3,
+23,251,3,
+9,125,7,3,248,3,249,3,250,3,
+40,172,1,
+46,252,3,
+9,69,7,
+40,172,1,3,
+23,253,3,
+9,152,7,1,252,3,
+40,176,0,
+46,254,3,
+9,176,7,
+40,172,1,3,
+46,255,3,
+9,186,7,
+40,176,0,3,
+23,0,4,
+9,190,7,2,254,3,255,3,
+40,172,1,
46,1,4,
-9,131,7,
+9,225,7,
40,172,1,3,
46,2,4,
-9,143,7,
-40,176,0,3,
-46,3,4,
-9,149,7,
+9,237,7,
40,172,1,3,
-23,4,4,
-9,158,7,3,1,4,2,4,3,4,
+23,3,4,
+9,246,7,2,1,4,2,4,
40,172,1,
+46,4,4,
+9,108,5,
+40,15,2,3,
46,5,4,
-9,102,7,
-40,172,1,3,
+9,112,5,
+40,15,2,3,
23,6,4,
-9,185,7,1,5,4,
-40,176,0,
+9,18,8,2,4,4,5,4,
+40,15,2,
46,7,4,
-9,209,7,
-40,172,1,3,
+9,108,5,
+40,15,2,3,
46,8,4,
-9,219,7,
-40,176,0,3,
+9,112,5,
+40,15,2,3,
23,9,4,
-9,223,7,2,7,4,8,4,
-40,172,1,
+9,28,8,2,7,4,8,4,
+40,15,2,
46,10,4,
-9,2,8,
-40,172,1,3,
+9,108,5,
+40,15,2,3,
46,11,4,
-9,14,8,
-40,172,1,3,
+9,112,5,
+40,15,2,3,
23,12,4,
-9,23,8,2,10,4,11,4,
-40,172,1,
+9,45,8,2,10,4,11,4,
+40,15,2,
46,13,4,
-9,141,5,
+9,108,5,
40,15,2,3,
46,14,4,
-9,145,5,
+9,112,5,
40,15,2,3,
23,15,4,
-9,51,8,2,13,4,14,4,
+9,57,8,2,13,4,14,4,
40,15,2,
46,16,4,
-9,141,5,
-40,15,2,3,
+9,74,8,
+40,1,0,3,
46,17,4,
-9,145,5,
+9,108,5,
40,15,2,3,
-23,18,4,
-9,61,8,2,16,4,17,4,
+46,18,4,
+9,112,5,
+40,15,2,3,
+23,19,4,
+9,79,8,3,16,4,17,4,18,4,
40,15,2,
-46,19,4,
-9,141,5,
-40,15,2,3,
46,20,4,
-9,145,5,
+9,69,7,
40,15,2,3,
23,21,4,
-9,78,8,2,19,4,20,4,
+9,85,8,1,20,4,
40,15,2,
46,22,4,
-9,141,5,
-40,15,2,3,
-46,23,4,
-9,145,5,
-40,15,2,3,
-23,24,4,
-9,90,8,2,22,4,23,4,
-40,15,2,
-46,25,4,
-9,107,8,
-40,1,0,3,
-46,26,4,
-9,141,5,
-40,15,2,3,
-46,27,4,
-9,145,5,
-40,15,2,3,
-23,28,4,
-9,112,8,3,25,4,26,4,27,4,
-40,15,2,
-46,29,4,
-9,102,7,
-40,15,2,3,
-23,30,4,
-9,118,8,1,29,4,
-40,15,2,
-46,31,4,
-9,102,7,
+9,69,7,
40,132,1,3,
-23,32,4,
-9,127,8,1,31,4,
+23,23,4,
+9,94,8,1,22,4,
40,132,1,
-46,33,4,
+46,24,4,
9,10,2,
40,168,1,3,
-23,34,4,
-9,142,8,1,33,4,
+23,25,4,
+9,109,8,1,24,4,
40,126,1,
-46,35,4,
+46,26,4,
9,32,1,
40,126,1,3,
-46,36,4,
+46,27,4,
9,171,1,
40,126,1,3,
-45,37,4,3,
+45,28,4,3,
40,170,1,
40,175,1,
-23,38,4,
-9,135,2,2,35,4,36,4,
+23,29,4,
+9,135,2,2,26,4,27,4,
40,168,0,
-40,38,4,
-46,39,4,
+40,29,4,
+46,30,4,
9,32,1,
40,4,2,3,
-46,40,4,
+46,31,4,
9,171,1,
40,4,2,3,
-45,41,4,4,
+45,32,4,4,
40,170,1,
40,175,1,
-40,38,4,
-23,42,4,
-9,135,2,2,39,4,40,4,
+40,29,4,
+23,33,4,
+9,135,2,2,30,4,31,4,
40,176,0,
-40,42,4,136,0,
+40,33,4,135,0,
0,0,
-197,3,
-203,3,
-149,3,
-201,3,
-209,3,
-206,3,
-174,3,
-168,3,
-164,3,
-183,3,
+190,3,
+196,3,
+142,3,
+194,3,
+202,3,
+199,3,
+167,3,
+161,3,
+157,3,
+176,3,
122,0,
65,0,
87,0,
@@ -3804,43 +3779,43 @@
72,0,
90,0,
232,2,
-225,3,
-104,3,
218,3,
-177,3,
-171,3,
-155,3,
-189,3,
-110,3,
-134,3,
-122,3,
-128,3,
-116,3,
-192,3,
-180,3,
-212,3,
-158,3,
-221,3,
-143,3,
-195,3,
-152,3,
-140,3,
-215,3,
-146,3,
-186,3,
-107,3,
-131,3,
-119,3,
-125,3,
-113,3,
-137,3,
+97,3,
+211,3,
+170,3,
+164,3,
+148,3,
+182,3,
+103,3,
+127,3,
+115,3,
+121,3,
+109,3,
+185,3,
+173,3,
+205,3,
+151,3,
+214,3,
+136,3,
+188,3,
+145,3,
+133,3,
+208,3,
+139,3,
+179,3,
+100,3,
+124,3,
+112,3,
+118,3,
+106,3,
+130,3,
155,0,
1,1,
56,0,
78,0,
-238,3,
-62,3,
-65,3,
+231,3,
+55,3,
+58,3,
50,0,
70,2,
146,1,
@@ -3857,13 +3832,12 @@
100,1,
160,0,
107,1,
-70,3,
+63,3,
144,2,
167,2,
-55,3,
90,1,
-100,3,
-85,3,
+93,3,
+78,3,
75,2,
114,0,
84,1,
@@ -3891,7 +3865,7 @@
117,1,
121,1,
94,0,
-231,3,
+224,3,
47,0,
181,1,
190,1,
@@ -3917,10 +3891,10 @@
131,1,
125,1,
129,1,
-227,3,
-229,3,
+220,3,
+222,3,
12,
-22,163,3,
+22,154,3,
2,
42,0,0,0,0,1,
34,
@@ -3928,33 +3902,33 @@
40,15,2,1,
19,
40,176,0,0,0,0,0,1,0,
-22,166,3,
+22,157,3,
2,
42,0,0,0,0,1,
34,
-49,164,3,0,1,0,
-22,169,3,
+49,155,3,0,1,0,
+22,160,3,
2,
42,0,0,0,0,1,
34,
-49,168,3,0,1,0,
-22,172,3,
+49,159,3,0,1,0,
+22,163,3,
2,
42,0,0,0,0,1,
34,
1,
-49,170,3,0,46,
+49,161,3,0,46,
1,
1,
19,
40,176,0,0,0,128,63,47,
39,
-49,170,3,0,1,3,
+49,161,3,0,1,3,
40,176,0,48,
-49,171,3,0,
+49,162,3,0,
40,15,2,
40,15,2,1,0,
-22,175,3,
+22,166,3,
2,
42,0,0,0,0,1,
34,
@@ -3964,61 +3938,114 @@
19,
40,176,0,0,0,128,63,47,
39,
+49,165,3,0,1,3,
+40,176,0,48,
+49,164,3,0,
+40,15,2,46,
+49,165,3,0,
+40,15,2,1,0,
+22,169,3,
+2,
+42,0,0,0,0,1,
+34,
+44,
+35,114,8,
+40,14,3,
+44,
+1,
+49,167,3,0,65,
+6,
+40,15,2,1,
+19,
+40,176,0,0,0,0,0,
+40,14,3,
+6,
+40,15,2,1,
+19,
+40,176,0,0,0,0,0,
+1,
+49,167,3,0,48,
+39,
+49,168,3,0,1,3,
+40,15,2,
+1,
+49,167,3,0,48,
+39,
+49,168,3,0,1,3,
+40,15,2,1,0,
+22,172,3,
+2,
+42,0,0,0,0,1,
+34,
+21,
+40,15,2,169,3,2,
+49,171,3,0,
+49,170,3,0,1,1,169,3,
+22,175,3,
+2,
+42,0,0,0,0,1,
+34,
+1,
+1,
+19,
+40,176,0,0,0,128,63,47,
+39,
49,174,3,0,1,3,
40,176,0,48,
49,173,3,0,
-40,15,2,46,
-49,174,3,0,
40,15,2,1,0,
22,178,3,
2,
42,0,0,0,0,1,
34,
-44,
-35,147,8,
-40,14,3,
-44,
1,
-49,176,3,0,65,
-6,
-40,15,2,1,
+1,
19,
-40,176,0,0,0,0,0,
-40,14,3,
-6,
-40,15,2,1,
-19,
-40,176,0,0,0,0,0,
-1,
-49,176,3,0,48,
+40,176,0,0,0,128,63,47,
39,
-49,177,3,0,1,3,
-40,15,2,
-1,
-49,176,3,0,48,
-39,
-49,177,3,0,1,3,
+49,176,3,0,1,3,
+40,176,0,48,
+49,177,3,0,
40,15,2,1,0,
22,181,3,
2,
42,0,0,0,0,1,
34,
-21,
-40,15,2,178,3,2,
+1,
+1,
+39,
+49,180,3,0,1,3,48,
+49,179,3,0,
+40,15,2,46,
+1,
+1,
+19,
+40,176,0,0,0,128,63,47,
+39,
+49,179,3,0,1,3,
+40,176,0,48,
49,180,3,0,
-49,179,3,0,1,1,178,3,
+40,15,2,
+40,15,2,1,0,
22,184,3,
2,
42,0,0,0,0,1,
34,
1,
1,
+1,
19,
40,176,0,0,0,128,63,47,
39,
49,183,3,0,1,3,
40,176,0,48,
49,182,3,0,
+40,15,2,46,
+1,
+39,
+49,182,3,0,1,3,48,
+49,183,3,0,
+40,15,2,
40,15,2,1,0,
22,187,3,
2,
@@ -4026,74 +4053,56 @@
34,
1,
1,
+1,
+19,
+40,176,0,0,0,128,63,47,
+39,
+49,186,3,0,1,3,
+40,176,0,48,
+49,185,3,0,
+40,15,2,46,
+1,
+1,
19,
40,176,0,0,0,128,63,47,
39,
49,185,3,0,1,3,
40,176,0,48,
49,186,3,0,
+40,15,2,
40,15,2,1,0,
22,190,3,
2,
42,0,0,0,0,1,
34,
+21,
+40,15,2,204,0,2,
1,
-1,
-39,
-49,189,3,0,1,3,48,
-49,188,3,0,
-40,15,2,46,
-1,
-1,
-19,
-40,176,0,0,0,128,63,47,
-39,
-49,188,3,0,1,3,
-40,176,0,48,
+49,188,3,0,46,
49,189,3,0,
40,15,2,
-40,15,2,1,0,
+19,
+40,176,0,0,0,128,63,1,0,
22,193,3,
2,
42,0,0,0,0,1,
34,
1,
-1,
-1,
-19,
-40,176,0,0,0,128,63,47,
-39,
-49,192,3,0,1,3,
-40,176,0,48,
-49,191,3,0,
-40,15,2,46,
-1,
-39,
-49,191,3,0,1,3,48,
+49,191,3,0,48,
49,192,3,0,
-40,15,2,
40,15,2,1,0,
22,196,3,
2,
42,0,0,0,0,1,
34,
1,
+49,194,3,0,46,
1,
1,
19,
40,176,0,0,0,128,63,47,
-39,
-49,195,3,0,1,3,
-40,176,0,48,
49,194,3,0,
-40,15,2,46,
-1,
-1,
-19,
-40,176,0,0,0,128,63,47,
-39,
-49,194,3,0,1,3,
-40,176,0,48,
+40,15,2,48,
49,195,3,0,
40,15,2,
40,15,2,1,0,
@@ -4101,68 +4110,33 @@
2,
42,0,0,0,0,1,
34,
-21,
-40,15,2,204,0,2,
-1,
-49,197,3,0,46,
-49,198,3,0,
-40,15,2,
-19,
-40,176,0,0,0,128,63,1,0,
-22,202,3,
-2,
-42,0,0,0,0,1,
-34,
-1,
-49,200,3,0,48,
-49,201,3,0,
-40,15,2,1,0,
-22,205,3,
-2,
-42,0,0,0,0,1,
-34,
-1,
-49,203,3,0,46,
-1,
-1,
-19,
-40,176,0,0,0,128,63,47,
-49,203,3,0,
-40,15,2,48,
-49,204,3,0,
-40,15,2,
-40,15,2,1,0,
-22,208,3,
-2,
-42,0,0,0,0,1,
-34,
44,
1,
1,
19,
40,176,0,0,0,0,64,48,
39,
-49,207,3,0,1,0,
+49,198,3,0,1,0,
40,176,0,70,
39,
-49,207,3,0,1,1,
+49,198,3,0,1,1,
40,14,3,
1,
1,
19,
40,176,0,0,0,0,64,48,
39,
-49,206,3,0,1,0,
+49,197,3,0,1,0,
40,176,0,48,
39,
-49,207,3,0,1,0,
+49,198,3,0,1,0,
40,176,0,
1,
1,
39,
-49,206,3,0,1,1,48,
+49,197,3,0,1,1,48,
39,
-49,207,3,0,1,1,
+49,198,3,0,1,1,
40,176,0,47,
1,
1,
@@ -4170,212 +4144,212 @@
40,176,0,0,0,0,64,48,
1,
39,
-49,207,3,0,1,1,47,
+49,198,3,0,1,1,47,
39,
-49,207,3,0,1,0,
+49,198,3,0,1,0,
40,176,0,
40,176,0,48,
1,
39,
-49,206,3,0,1,1,47,
+49,197,3,0,1,1,47,
39,
-49,206,3,0,1,0,
+49,197,3,0,1,0,
40,176,0,
40,176,0,
40,176,0,1,0,
-22,211,3,
+22,202,3,
2,
42,1,0,
-46,43,4,
-9,185,8,
+46,34,4,
+9,152,8,
40,15,2,2,1,0,
0,0,3,
-47,43,4,
+47,34,4,
40,15,2,0,
6,
40,15,2,4,
21,
-40,176,0,208,3,2,
+40,176,0,199,3,2,
39,
-49,209,3,0,2,0,3,
+49,200,3,0,2,0,3,
39,
-49,210,3,0,2,0,3,
+49,201,3,0,2,0,3,
21,
-40,176,0,208,3,2,
+40,176,0,199,3,2,
39,
-49,209,3,0,2,1,3,
+49,200,3,0,2,1,3,
39,
-49,210,3,0,2,1,3,
+49,201,3,0,2,1,3,
21,
-40,176,0,208,3,2,
+40,176,0,199,3,2,
39,
-49,209,3,0,2,2,3,
+49,200,3,0,2,2,3,
39,
-49,210,3,0,2,2,3,
+49,201,3,0,2,2,3,
1,
39,
-49,209,3,0,1,3,46,
+49,200,3,0,1,3,46,
1,
1,
19,
40,176,0,0,0,128,63,47,
39,
-49,209,3,0,1,3,
+49,200,3,0,1,3,
40,176,0,48,
39,
-49,210,3,0,1,3,
+49,201,3,0,1,3,
40,176,0,
40,176,0,
16,
1,
39,
-49,43,4,2,3,0,1,2,71,
+49,34,4,2,3,0,1,2,71,
1,
1,
39,
-49,210,3,0,3,0,1,2,48,
+49,201,3,0,3,0,1,2,48,
1,
19,
40,176,0,0,0,128,63,47,
39,
-49,209,3,0,1,3,
+49,200,3,0,1,3,
40,176,0,
40,172,1,46,
1,
39,
-49,209,3,0,3,0,1,2,48,
+49,200,3,0,3,0,1,2,48,
1,
19,
40,176,0,0,0,128,63,47,
39,
-49,210,3,0,1,3,
+49,201,3,0,1,3,
40,176,0,
40,172,1,
40,172,1,
40,172,1,
34,
-49,43,4,0,1,1,208,3,
-22,214,3,
+49,34,4,0,1,1,199,3,
+22,205,3,
2,
42,1,0,
-46,44,4,
-9,185,8,
+46,35,4,
+9,152,8,
40,15,2,2,1,0,
0,0,3,
-47,44,4,
+47,35,4,
40,15,2,0,
21,
-40,15,2,172,3,2,
-49,212,3,0,
-49,213,3,0,
+40,15,2,163,3,2,
+49,203,3,0,
+49,204,3,0,
16,
1,
39,
-49,44,4,1,3,0,1,2,64,
+49,35,4,1,3,0,1,2,64,
21,
40,172,1,200,0,2,
39,
-49,44,4,0,3,0,1,2,
+49,35,4,0,3,0,1,2,
1,
1,
1,
19,
40,176,0,0,0,128,63,47,
39,
-49,213,3,0,1,3,
+49,204,3,0,1,3,
40,176,0,48,
39,
-49,212,3,0,3,0,1,2,
+49,203,3,0,3,0,1,2,
40,172,1,46,
39,
-49,213,3,0,3,0,1,2,
+49,204,3,0,3,0,1,2,
40,172,1,
40,172,1,
34,
-49,44,4,0,1,1,172,3,
-22,217,3,
+49,35,4,0,1,1,163,3,
+22,208,3,
2,
42,1,0,
-46,45,4,
-9,185,8,
+46,36,4,
+9,152,8,
40,15,2,2,1,0,
0,0,3,
-47,45,4,
+47,36,4,
40,15,2,0,
21,
-40,15,2,172,3,2,
-49,215,3,0,
-49,216,3,0,
+40,15,2,163,3,2,
+49,206,3,0,
+49,207,3,0,
16,
1,
39,
-49,45,4,1,3,0,1,2,64,
+49,36,4,1,3,0,1,2,64,
21,
40,172,1,224,0,2,
39,
-49,45,4,0,3,0,1,2,
+49,36,4,0,3,0,1,2,
1,
1,
1,
19,
40,176,0,0,0,128,63,47,
39,
-49,216,3,0,1,3,
+49,207,3,0,1,3,
40,176,0,48,
39,
-49,215,3,0,3,0,1,2,
+49,206,3,0,3,0,1,2,
40,172,1,46,
39,
-49,216,3,0,3,0,1,2,
+49,207,3,0,3,0,1,2,
40,172,1,
40,172,1,
34,
-49,45,4,0,1,1,172,3,
-22,220,3,
+49,36,4,0,1,1,163,3,
+22,211,3,
2,
42,0,0,0,0,1,
34,
44,
-35,192,8,
+35,159,8,
40,14,3,
1,
-49,218,3,0,49,
+49,209,3,0,49,
1,
-49,219,3,0,46,
+49,210,3,0,46,
19,
40,176,0,119,204,43,50,
40,176,0,
40,176,0,
1,
-49,218,3,0,49,
-49,219,3,0,
+49,209,3,0,49,
+49,210,3,0,
40,176,0,1,0,
-22,224,3,
+22,215,3,
2,
42,0,0,0,0,1,
34,
44,
-35,192,8,
+35,159,8,
40,14,3,
1,
-49,221,3,0,49,
+49,212,3,0,49,
1,
-49,222,3,0,46,
+49,213,3,0,46,
19,
40,176,0,119,204,43,50,
40,176,0,
40,172,1,
1,
-49,221,3,0,49,
-49,222,3,0,
+49,212,3,0,49,
+49,213,3,0,
40,172,1,1,0,
-22,227,3,
+22,218,3,
2,
42,0,0,0,0,1,
24,0,
1,
39,
-49,226,3,0,1,0,65,
+49,217,3,0,1,0,65,
19,
40,176,0,0,0,0,0,
40,14,3,
@@ -4384,31 +4358,31 @@
34,
1,
39,
-49,225,3,0,1,0,48,
+49,216,3,0,1,0,48,
1,
19,
40,176,0,0,0,128,63,47,
39,
-49,226,3,0,1,1,
+49,217,3,0,1,1,
40,176,0,
40,176,0,1,
2,
42,1,0,
-46,46,4,
-9,236,8,
+46,37,4,
+9,203,8,
40,176,0,2,1,0,
0,0,2,
-47,46,4,
+47,37,4,
40,176,0,0,
1,
39,
-49,225,3,0,1,1,47,
+49,216,3,0,1,1,47,
39,
-49,225,3,0,1,0,
+49,216,3,0,1,0,
40,176,0,
24,0,
1,
-49,46,4,0,65,
+49,37,4,0,65,
19,
40,176,0,0,0,0,0,
40,14,3,
@@ -4419,29 +4393,29 @@
1,
1,
39,
-49,225,3,0,1,1,48,
+49,216,3,0,1,1,48,
39,
-49,226,3,0,1,1,
+49,217,3,0,1,1,
40,176,0,46,
1,
39,
-49,225,3,0,1,0,48,
+49,216,3,0,1,0,48,
1,
19,
40,176,0,0,0,128,63,47,
39,
-49,226,3,0,1,1,
+49,217,3,0,1,1,
40,176,0,
40,176,0,
40,176,0,46,
1,
39,
-49,226,3,0,1,0,48,
+49,217,3,0,1,0,48,
1,
19,
40,176,0,0,0,128,63,47,
39,
-49,225,3,0,1,1,
+49,216,3,0,1,1,
40,176,0,
40,176,0,
40,176,0,1,
@@ -4449,98 +4423,98 @@
42,0,0,0,0,2,
16,
1,
-49,46,4,1,64,
+49,37,4,1,64,
21,
40,176,0,200,0,2,
39,
-49,226,3,0,1,1,
+49,217,3,0,1,1,
21,
-40,176,0,220,3,2,
+40,176,0,211,3,2,
1,
39,
-49,226,3,0,1,0,48,
+49,217,3,0,1,0,48,
39,
-49,225,3,0,1,1,
+49,216,3,0,1,1,
40,176,0,
-49,46,4,0,
+49,37,4,0,
40,176,0,
34,
1,
1,
1,
-49,46,4,0,48,
+49,37,4,0,48,
39,
-49,225,3,0,1,1,
+49,216,3,0,1,1,
40,176,0,46,
1,
39,
-49,225,3,0,1,0,48,
+49,216,3,0,1,0,48,
1,
19,
40,176,0,0,0,128,63,47,
39,
-49,226,3,0,1,1,
+49,217,3,0,1,1,
40,176,0,
40,176,0,
40,176,0,46,
1,
39,
-49,226,3,0,1,0,48,
+49,217,3,0,1,0,48,
1,
19,
40,176,0,0,0,128,63,47,
39,
-49,225,3,0,1,1,
+49,216,3,0,1,1,
40,176,0,
40,176,0,
-40,176,0,1,1,1,1,220,3,
-22,230,3,
+40,176,0,1,1,1,1,211,3,
+22,221,3,
2,
42,0,0,0,0,1,
34,
6,
40,15,2,4,
21,
-40,176,0,227,3,2,
+40,176,0,218,3,2,
39,
-49,228,3,0,2,0,3,
+49,219,3,0,2,0,3,
39,
-49,229,3,0,2,0,3,
+49,220,3,0,2,0,3,
21,
-40,176,0,227,3,2,
+40,176,0,218,3,2,
39,
-49,228,3,0,2,1,3,
+49,219,3,0,2,1,3,
39,
-49,229,3,0,2,1,3,
+49,220,3,0,2,1,3,
21,
-40,176,0,227,3,2,
+40,176,0,218,3,2,
39,
-49,228,3,0,2,2,3,
+49,219,3,0,2,2,3,
39,
-49,229,3,0,2,2,3,
+49,220,3,0,2,2,3,
1,
39,
-49,228,3,0,1,3,46,
+49,219,3,0,1,3,46,
1,
1,
19,
40,176,0,0,0,128,63,47,
39,
-49,228,3,0,1,3,
+49,219,3,0,1,3,
40,176,0,48,
39,
-49,229,3,0,1,3,
+49,220,3,0,1,3,
40,176,0,
-40,176,0,1,1,227,3,
-22,233,3,
+40,176,0,1,1,218,3,
+22,224,3,
2,
42,0,0,0,0,1,
24,0,
1,
39,
-49,232,3,0,1,1,65,
+49,223,3,0,1,1,65,
39,
-49,232,3,0,1,0,
+49,223,3,0,1,0,
40,14,3,
2,
42,0,0,0,0,1,
@@ -4549,36 +4523,36 @@
1,
1,
39,
-49,231,3,0,1,1,48,
+49,222,3,0,1,1,48,
39,
-49,232,3,0,1,1,
+49,223,3,0,1,1,
40,176,0,46,
1,
39,
-49,231,3,0,1,0,48,
+49,222,3,0,1,0,48,
1,
19,
40,176,0,0,0,128,63,47,
39,
-49,232,3,0,1,1,
+49,223,3,0,1,1,
40,176,0,
40,176,0,
40,176,0,46,
1,
39,
-49,232,3,0,1,0,48,
+49,223,3,0,1,0,48,
1,
19,
40,176,0,0,0,128,63,47,
39,
-49,231,3,0,1,1,
+49,222,3,0,1,1,
40,176,0,
40,176,0,
40,176,0,1,
24,0,
1,
39,
-49,231,3,0,1,0,65,
+49,222,3,0,1,0,65,
19,
40,176,0,0,0,0,0,
40,14,3,
@@ -4587,21 +4561,21 @@
34,
1,
39,
-49,232,3,0,1,0,48,
+49,223,3,0,1,0,48,
1,
19,
40,176,0,0,0,128,63,47,
39,
-49,231,3,0,1,1,
+49,222,3,0,1,1,
40,176,0,
40,176,0,1,
2,
42,1,0,
-46,47,4,
-9,236,8,
+46,38,4,
+9,203,8,
40,176,0,2,1,0,
0,0,2,
-47,47,4,
+47,38,4,
40,176,0,0,
21,
40,176,0,224,0,2,
@@ -4609,56 +4583,378 @@
40,176,0,0,0,0,0,
1,
39,
-49,232,3,0,1,1,47,
+49,223,3,0,1,1,47,
21,
-40,176,0,220,3,2,
+40,176,0,211,3,2,
1,
1,
39,
-49,232,3,0,1,1,47,
+49,223,3,0,1,1,47,
39,
-49,232,3,0,1,0,
+49,223,3,0,1,0,
40,176,0,48,
39,
-49,231,3,0,1,1,
+49,222,3,0,1,1,
40,176,0,
39,
-49,231,3,0,1,0,
+49,222,3,0,1,0,
40,176,0,
34,
1,
1,
1,
-49,47,4,0,48,
+49,38,4,0,48,
39,
-49,231,3,0,1,1,
+49,222,3,0,1,1,
40,176,0,46,
1,
39,
-49,231,3,0,1,0,48,
+49,222,3,0,1,0,48,
+1,
+19,
+40,176,0,0,0,128,63,47,
+39,
+49,223,3,0,1,1,
+40,176,0,
+40,176,0,
+40,176,0,46,
+1,
+39,
+49,223,3,0,1,0,48,
+1,
+19,
+40,176,0,0,0,128,63,47,
+39,
+49,222,3,0,1,1,
+40,176,0,
+40,176,0,
+40,176,0,1,1,1,211,3,
+22,227,3,
+2,
+42,0,0,0,0,1,
+34,
+6,
+40,15,2,4,
+21,
+40,176,0,224,3,2,
+39,
+49,225,3,0,2,0,3,
+39,
+49,226,3,0,2,0,3,
+21,
+40,176,0,224,3,2,
+39,
+49,225,3,0,2,1,3,
+39,
+49,226,3,0,2,1,3,
+21,
+40,176,0,224,3,2,
+39,
+49,225,3,0,2,2,3,
+39,
+49,226,3,0,2,2,3,
+1,
+39,
+49,225,3,0,1,3,46,
+1,
+1,
+19,
+40,176,0,0,0,128,63,47,
+39,
+49,225,3,0,1,3,
+40,176,0,48,
+39,
+49,226,3,0,1,3,
+40,176,0,
+40,176,0,1,1,224,3,
+22,230,3,
+2,
+42,0,0,0,0,1,
+34,
+21,
+40,15,2,202,3,2,
+49,229,3,0,
+49,228,3,0,1,1,202,3,
+22,233,3,
+2,
+42,0,0,0,0,1,
+24,0,
+1,
+1,
+19,
+40,176,0,0,0,0,64,48,
+39,
+49,231,3,0,1,0,
+40,176,0,70,
+39,
+49,231,3,0,1,1,
+40,14,3,
+2,
+42,0,0,0,0,1,
+34,
+1,
+1,
+21,
+40,176,0,211,3,2,
+1,
+1,
+39,
+49,232,3,0,1,0,48,
+39,
+49,232,3,0,1,0,
+40,176,0,48,
+1,
+39,
+49,231,3,0,1,1,47,
+1,
+19,
+40,176,0,0,0,0,64,48,
+39,
+49,231,3,0,1,0,
+40,176,0,
+40,176,0,
+40,176,0,
+39,
+49,232,3,0,1,1,46,
+1,
1,
19,
40,176,0,0,0,128,63,47,
39,
49,232,3,0,1,1,
-40,176,0,
+40,176,0,48,
+39,
+49,231,3,0,1,0,
40,176,0,
40,176,0,46,
1,
39,
49,232,3,0,1,0,48,
1,
+1,
+33,47,
+39,
+49,231,3,0,1,1,46,
+1,
19,
-40,176,0,0,0,128,63,47,
+40,176,0,0,0,0,64,48,
+39,
+49,231,3,0,1,0,
+40,176,0,
+40,176,0,46,
+19,
+40,176,0,0,0,128,63,
+40,176,0,
+40,176,0,
+40,176,0,1,
+24,0,
+1,
+1,
+19,
+40,176,0,0,0,128,64,48,
+39,
+49,232,3,0,1,0,
+40,176,0,70,
+39,
+49,232,3,0,1,1,
+40,14,3,
+2,
+42,4,0,
+46,39,4,
+9,209,8,
+40,176,0,2,
+46,40,4,
+9,214,8,
+40,176,0,2,
+46,41,4,
+9,219,8,
+40,176,0,2,
+46,42,4,
+9,225,8,
+40,176,0,2,4,0,
+1,0,
+0,0,
+3,0,
+2,0,5,
+47,39,4,
+40,176,0,0,
+1,
+39,
+49,232,3,0,1,0,48,
+39,
+49,232,3,0,1,0,
+40,176,0,
+47,40,4,
+40,176,0,0,
+1,
+49,39,4,0,48,
+39,
+49,232,3,0,1,0,
+40,176,0,
+47,41,4,
+40,176,0,0,
+1,
+39,
+49,232,3,0,1,1,48,
+39,
+49,232,3,0,1,1,
+40,176,0,
+47,42,4,
+40,176,0,0,
+1,
+49,41,4,0,48,
+39,
+49,232,3,0,1,1,
+40,176,0,
+34,
+21,
+40,176,0,211,3,2,
+1,
+1,
+1,
+1,
+49,41,4,0,48,
+1,
+39,
+49,231,3,0,1,0,47,
+1,
+39,
+49,232,3,0,1,0,48,
+1,
+1,
+1,
+19,
+40,176,0,0,0,64,64,48,
39,
49,231,3,0,1,1,
+40,176,0,47,
+1,
+19,
+40,176,0,0,0,192,64,48,
+39,
+49,231,3,0,1,0,
+40,176,0,
+40,176,0,47,
+19,
+40,176,0,0,0,128,63,
40,176,0,
40,176,0,
-40,176,0,1,1,1,220,3,
+40,176,0,
+40,176,0,46,
+1,
+1,
+1,
+19,
+40,176,0,0,0,64,65,48,
+39,
+49,232,3,0,1,1,
+40,176,0,48,
+49,39,4,0,
+40,176,0,48,
+1,
+39,
+49,231,3,0,1,1,47,
+1,
+19,
+40,176,0,0,0,0,64,48,
+39,
+49,231,3,0,1,0,
+40,176,0,
+40,176,0,
+40,176,0,
+40,176,0,47,
+1,
+1,
+19,
+40,176,0,0,0,128,65,48,
+49,40,4,0,
+40,176,0,48,
+1,
+39,
+49,231,3,0,1,1,47,
+1,
+19,
+40,176,0,0,0,0,64,48,
+39,
+49,231,3,0,1,0,
+40,176,0,
+40,176,0,
+40,176,0,
+40,176,0,47,
+1,
+49,42,4,0,48,
+39,
+49,231,3,0,1,0,
+40,176,0,
+40,176,0,
+49,41,4,0,1,
+2,
+42,0,0,0,0,1,
+34,
+1,
+1,
+1,
+1,
+39,
+49,232,3,0,1,0,48,
+1,
+1,
+39,
+49,231,3,0,1,1,47,
+1,
+19,
+40,176,0,0,0,0,64,48,
+39,
+49,231,3,0,1,0,
+40,176,0,
+40,176,0,46,
+19,
+40,176,0,0,0,128,63,
+40,176,0,
+40,176,0,46,
+39,
+49,231,3,0,1,0,
+40,176,0,47,
+1,
+21,
+40,176,0,113,0,1,
+1,
+39,
+49,232,3,0,1,1,48,
+39,
+49,232,3,0,1,0,
+40,176,0,48,
+1,
+39,
+49,231,3,0,1,1,47,
+1,
+19,
+40,176,0,0,0,0,64,48,
+39,
+49,231,3,0,1,0,
+40,176,0,
+40,176,0,
+40,176,0,
+40,176,0,47,
+1,
+39,
+49,232,3,0,1,1,48,
+39,
+49,231,3,0,1,0,
+40,176,0,
+40,176,0,1,1,1,211,3,
22,236,3,
2,
42,0,0,0,0,1,
34,
+44,
+1,
+39,
+49,235,3,0,1,3,65,
+19,
+40,176,0,0,0,0,0,
+40,14,3,
+49,234,3,0,
6,
40,15,2,4,
21,
@@ -4697,310 +4993,122 @@
2,
42,0,0,0,0,1,
34,
-21,
-40,15,2,211,3,2,
-49,238,3,0,
-49,237,3,0,1,1,211,3,
-22,242,3,
-2,
-42,0,0,0,0,1,
-24,0,
+6,
+40,15,2,2,
1,
1,
+39,
+49,237,3,0,3,0,1,2,46,
+39,
+49,238,3,0,3,0,1,2,
+40,172,1,47,
+1,
19,
40,176,0,0,0,0,64,48,
-39,
-49,240,3,0,1,0,
-40,176,0,70,
-39,
-49,240,3,0,1,1,
-40,14,3,
-2,
-42,0,0,0,0,1,
-34,
-1,
-1,
21,
-40,176,0,220,3,2,
-1,
+40,172,1,200,0,2,
1,
39,
-49,241,3,0,1,0,48,
+49,237,3,0,3,0,1,2,48,
39,
-49,241,3,0,1,0,
-40,176,0,48,
+49,238,3,0,1,3,
+40,172,1,
1,
39,
-49,240,3,0,1,1,47,
+49,238,3,0,3,0,1,2,48,
+39,
+49,237,3,0,1,3,
+40,172,1,
+40,172,1,
+40,172,1,
1,
-19,
-40,176,0,0,0,0,64,48,
39,
-49,240,3,0,1,0,
-40,176,0,
-40,176,0,
-40,176,0,
-39,
-49,241,3,0,1,1,46,
+49,237,3,0,1,3,46,
1,
1,
19,
40,176,0,0,0,128,63,47,
39,
-49,241,3,0,1,1,
+49,237,3,0,1,3,
40,176,0,48,
39,
-49,240,3,0,1,0,
+49,238,3,0,1,3,
40,176,0,
-40,176,0,46,
-1,
-39,
-49,241,3,0,1,0,48,
-1,
-1,
-33,47,
-39,
-49,240,3,0,1,1,46,
-1,
-19,
-40,176,0,0,0,0,64,48,
-39,
-49,240,3,0,1,0,
-40,176,0,
-40,176,0,46,
-19,
-40,176,0,0,0,128,63,
-40,176,0,
-40,176,0,
-40,176,0,1,
-24,0,
-1,
-1,
-19,
-40,176,0,0,0,128,64,48,
-39,
-49,241,3,0,1,0,
-40,176,0,70,
-39,
-49,241,3,0,1,1,
-40,14,3,
-2,
-42,4,0,
-46,48,4,
-9,242,8,
-40,176,0,2,
-46,49,4,
-9,247,8,
-40,176,0,2,
-46,50,4,
-9,252,8,
-40,176,0,2,
-46,51,4,
-9,2,9,
-40,176,0,2,4,0,
-1,0,
-0,0,
-3,0,
-2,0,5,
-47,48,4,
-40,176,0,0,
-1,
-39,
-49,241,3,0,1,0,48,
-39,
-49,241,3,0,1,0,
-40,176,0,
-47,49,4,
-40,176,0,0,
-1,
-49,48,4,0,48,
-39,
-49,241,3,0,1,0,
-40,176,0,
-47,50,4,
-40,176,0,0,
-1,
-39,
-49,241,3,0,1,1,48,
-39,
-49,241,3,0,1,1,
-40,176,0,
-47,51,4,
-40,176,0,0,
-1,
-49,50,4,0,48,
-39,
-49,241,3,0,1,1,
-40,176,0,
-34,
-21,
-40,176,0,220,3,2,
-1,
-1,
-1,
-1,
-49,50,4,0,48,
-1,
-39,
-49,240,3,0,1,0,47,
-1,
-39,
-49,241,3,0,1,0,48,
-1,
-1,
-1,
-19,
-40,176,0,0,0,64,64,48,
-39,
-49,240,3,0,1,1,
-40,176,0,47,
-1,
-19,
-40,176,0,0,0,192,64,48,
-39,
-49,240,3,0,1,0,
-40,176,0,
-40,176,0,47,
-19,
-40,176,0,0,0,128,63,
-40,176,0,
-40,176,0,
-40,176,0,
-40,176,0,46,
-1,
-1,
-1,
-19,
-40,176,0,0,0,64,65,48,
-39,
-49,241,3,0,1,1,
-40,176,0,48,
-49,48,4,0,
-40,176,0,48,
-1,
-39,
-49,240,3,0,1,1,47,
-1,
-19,
-40,176,0,0,0,0,64,48,
-39,
-49,240,3,0,1,0,
-40,176,0,
-40,176,0,
-40,176,0,
-40,176,0,47,
-1,
-1,
-19,
-40,176,0,0,0,128,65,48,
-49,49,4,0,
-40,176,0,48,
-1,
-39,
-49,240,3,0,1,1,47,
-1,
-19,
-40,176,0,0,0,0,64,48,
-39,
-49,240,3,0,1,0,
-40,176,0,
-40,176,0,
-40,176,0,
-40,176,0,47,
-1,
-49,51,4,0,48,
-39,
-49,240,3,0,1,0,
-40,176,0,
-40,176,0,
-49,50,4,0,1,
+40,176,0,1,0,
+22,242,3,
2,
42,0,0,0,0,1,
34,
-1,
-1,
+6,
+40,15,2,2,
1,
1,
39,
-49,241,3,0,1,0,48,
-1,
-1,
+49,241,3,0,3,0,1,2,46,
39,
-49,240,3,0,1,1,47,
+49,240,3,0,3,0,1,2,
+40,172,1,47,
+1,
1,
19,
40,176,0,0,0,0,64,48,
39,
-49,240,3,0,1,0,
-40,176,0,
-40,176,0,46,
+49,241,3,0,3,0,1,2,
+40,172,1,48,
+39,
+49,240,3,0,3,0,1,2,
+40,172,1,
+40,172,1,
+1,
+39,
+49,240,3,0,1,3,46,
+1,
+1,
19,
-40,176,0,0,0,128,63,
-40,176,0,
-40,176,0,46,
+40,176,0,0,0,128,63,47,
39,
-49,240,3,0,1,0,
-40,176,0,47,
-1,
-21,
-40,176,0,113,0,1,
-1,
-39,
-49,241,3,0,1,1,48,
-39,
-49,241,3,0,1,0,
+49,240,3,0,1,3,
40,176,0,48,
-1,
39,
-49,240,3,0,1,1,47,
-1,
-19,
-40,176,0,0,0,0,64,48,
-39,
-49,240,3,0,1,0,
+49,241,3,0,1,3,
40,176,0,
-40,176,0,
-40,176,0,
-40,176,0,47,
-1,
-39,
-49,241,3,0,1,1,48,
-39,
-49,240,3,0,1,0,
-40,176,0,
-40,176,0,1,1,1,220,3,
+40,176,0,1,0,
22,245,3,
2,
42,0,0,0,0,1,
34,
-44,
+6,
+40,15,2,2,
+1,
+1,
+1,
+1,
+19,
+40,176,0,0,0,128,63,47,
+39,
+49,243,3,0,1,3,
+40,176,0,48,
+39,
+49,244,3,0,3,0,1,2,
+40,172,1,46,
+1,
+1,
+19,
+40,176,0,0,0,128,63,47,
+39,
+49,244,3,0,1,3,
+40,176,0,48,
+39,
+49,243,3,0,3,0,1,2,
+40,172,1,
+40,172,1,46,
1,
39,
-49,244,3,0,1,3,65,
-19,
-40,176,0,0,0,0,0,
-40,14,3,
-49,243,3,0,
-6,
-40,15,2,4,
-21,
-40,176,0,242,3,2,
+49,243,3,0,3,0,1,2,48,
39,
-49,243,3,0,2,0,3,
-39,
-49,244,3,0,2,0,3,
-21,
-40,176,0,242,3,2,
-39,
-49,243,3,0,2,1,3,
-39,
-49,244,3,0,2,1,3,
-21,
-40,176,0,242,3,2,
-39,
-49,243,3,0,2,2,3,
-39,
-49,244,3,0,2,2,3,
+49,244,3,0,3,0,1,2,
+40,172,1,
+40,172,1,
1,
39,
49,243,3,0,1,3,46,
@@ -5014,142 +5122,8 @@
39,
49,244,3,0,1,3,
40,176,0,
-40,176,0,1,1,242,3,
-22,248,3,
-2,
-42,0,0,0,0,1,
-34,
-6,
-40,15,2,2,
-1,
-1,
-39,
-49,246,3,0,3,0,1,2,46,
-39,
-49,247,3,0,3,0,1,2,
-40,172,1,47,
-1,
-19,
-40,176,0,0,0,0,64,48,
-21,
-40,172,1,200,0,2,
-1,
-39,
-49,246,3,0,3,0,1,2,48,
-39,
-49,247,3,0,1,3,
-40,172,1,
-1,
-39,
-49,247,3,0,3,0,1,2,48,
-39,
-49,246,3,0,1,3,
-40,172,1,
-40,172,1,
-40,172,1,
-1,
-39,
-49,246,3,0,1,3,46,
-1,
-1,
-19,
-40,176,0,0,0,128,63,47,
-39,
-49,246,3,0,1,3,
-40,176,0,48,
-39,
-49,247,3,0,1,3,
-40,176,0,
40,176,0,1,0,
-22,251,3,
-2,
-42,0,0,0,0,1,
-34,
-6,
-40,15,2,2,
-1,
-1,
-39,
-49,250,3,0,3,0,1,2,46,
-39,
-49,249,3,0,3,0,1,2,
-40,172,1,47,
-1,
-1,
-19,
-40,176,0,0,0,0,64,48,
-39,
-49,250,3,0,3,0,1,2,
-40,172,1,48,
-39,
-49,249,3,0,3,0,1,2,
-40,172,1,
-40,172,1,
-1,
-39,
-49,249,3,0,1,3,46,
-1,
-1,
-19,
-40,176,0,0,0,128,63,47,
-39,
-49,249,3,0,1,3,
-40,176,0,48,
-39,
-49,250,3,0,1,3,
-40,176,0,
-40,176,0,1,0,
-22,254,3,
-2,
-42,0,0,0,0,1,
-34,
-6,
-40,15,2,2,
-1,
-1,
-1,
-1,
-19,
-40,176,0,0,0,128,63,47,
-39,
-49,252,3,0,1,3,
-40,176,0,48,
-39,
-49,253,3,0,3,0,1,2,
-40,172,1,46,
-1,
-1,
-19,
-40,176,0,0,0,128,63,47,
-39,
-49,253,3,0,1,3,
-40,176,0,48,
-39,
-49,252,3,0,3,0,1,2,
-40,172,1,
-40,172,1,46,
-1,
-39,
-49,252,3,0,3,0,1,2,48,
-39,
-49,253,3,0,3,0,1,2,
-40,172,1,
-40,172,1,
-1,
-39,
-49,252,3,0,1,3,46,
-1,
-1,
-19,
-40,176,0,0,0,128,63,47,
-39,
-49,252,3,0,1,3,
-40,176,0,48,
-39,
-49,253,3,0,1,3,
-40,176,0,
-40,176,0,1,0,
-22,0,4,
+22,247,3,
2,
42,0,0,0,0,1,
34,
@@ -5163,96 +5137,96 @@
40,176,0,61,10,23,63,
19,
40,176,0,174,71,225,61,
-49,255,3,0,1,0,
-22,4,4,
+49,246,3,0,1,0,
+22,251,3,
2,
42,4,0,
-46,52,4,
-9,8,9,
+46,43,4,
+9,231,8,
40,176,0,2,
-46,53,4,
-9,185,8,
+46,44,4,
+9,152,8,
40,172,1,2,
-46,54,4,
-9,12,9,
+46,45,4,
+9,235,8,
40,176,0,2,
-46,55,4,
-9,20,9,
+46,46,4,
+9,243,8,
40,176,0,2,4,0,
0,0,
3,0,
2,0,
1,0,6,
-47,52,4,
+47,43,4,
40,176,0,0,
21,
-40,176,0,0,4,1,
-49,3,4,0,
-47,53,4,
+40,176,0,247,3,1,
+49,250,3,0,
+47,44,4,
40,172,1,0,
1,
1,
-49,52,4,0,47,
+49,43,4,0,47,
21,
-40,176,0,0,4,1,
-49,1,4,0,
+40,176,0,247,3,1,
+49,248,3,0,
40,176,0,46,
-49,1,4,0,
+49,248,3,0,
40,172,1,
-47,54,4,
+47,45,4,
40,176,0,0,
21,
40,176,0,200,0,2,
21,
40,176,0,200,0,2,
39,
-49,53,4,0,1,0,
+49,44,4,0,1,0,
39,
-49,53,4,0,1,1,
+49,44,4,0,1,1,
39,
-49,53,4,0,1,2,
-47,55,4,
+49,44,4,0,1,2,
+47,46,4,
40,176,0,0,
21,
40,176,0,224,0,2,
21,
40,176,0,224,0,2,
39,
-49,53,4,0,1,0,
+49,44,4,0,1,0,
39,
-49,53,4,0,1,1,
+49,44,4,0,1,1,
39,
-49,53,4,0,1,2,
+49,44,4,0,1,2,
24,0,
1,
1,
-49,54,4,0,68,
+49,45,4,0,68,
19,
40,176,0,0,0,0,0,
40,14,3,59,
1,
-49,52,4,0,66,
-49,54,4,0,
+49,43,4,0,66,
+49,45,4,0,
40,14,3,
40,14,3,
2,
42,0,0,0,0,1,
16,
1,
-49,53,4,1,64,
+49,44,4,1,64,
1,
-49,52,4,0,46,
+49,43,4,0,46,
1,
1,
-49,53,4,0,47,
-49,52,4,0,
+49,44,4,0,47,
+49,43,4,0,
40,172,1,48,
21,
-40,176,0,220,3,2,
-49,52,4,0,
+40,176,0,211,3,2,
+49,43,4,0,
1,
-49,52,4,0,47,
-49,54,4,0,
+49,43,4,0,47,
+49,45,4,0,
40,176,0,
40,172,1,
40,172,1,
@@ -5261,41 +5235,41 @@
24,0,
1,
1,
-49,55,4,0,67,
-49,2,4,0,
+49,46,4,0,67,
+49,249,3,0,
40,14,3,59,
1,
-49,55,4,0,66,
-49,52,4,0,
+49,46,4,0,66,
+49,43,4,0,
40,14,3,
40,14,3,
2,
42,0,0,0,0,1,
34,
1,
-49,52,4,0,46,
+49,43,4,0,46,
21,
-40,172,1,224,3,2,
+40,172,1,215,3,2,
1,
1,
-49,53,4,0,47,
-49,52,4,0,
+49,44,4,0,47,
+49,43,4,0,
40,172,1,48,
1,
-49,2,4,0,47,
-49,52,4,0,
+49,249,3,0,47,
+49,43,4,0,
40,176,0,
40,172,1,
1,
-49,55,4,0,47,
-49,52,4,0,
+49,46,4,0,47,
+49,43,4,0,
40,176,0,
40,172,1,1,
2,
42,0,0,0,0,1,
34,
-49,53,4,0,1,1,3,220,3,224,3,0,4,
-22,6,4,
+49,44,4,0,1,1,3,211,3,215,3,247,3,
+22,253,3,
2,
42,0,0,0,0,1,
34,
@@ -5305,31 +5279,31 @@
21,
40,176,0,224,0,2,
39,
-49,5,4,0,1,0,
+49,252,3,0,1,0,
39,
-49,5,4,0,1,1,
+49,252,3,0,1,1,
39,
-49,5,4,0,1,2,47,
+49,252,3,0,1,2,47,
21,
40,176,0,200,0,2,
21,
40,176,0,200,0,2,
39,
-49,5,4,0,1,0,
+49,252,3,0,1,0,
39,
-49,5,4,0,1,1,
+49,252,3,0,1,1,
39,
-49,5,4,0,1,2,
+49,252,3,0,1,2,
40,176,0,1,0,
-22,9,4,
+22,0,4,
2,
42,0,0,0,0,1,
24,0,
1,
39,
-49,7,4,0,1,0,68,
+49,254,3,0,1,0,68,
39,
-49,7,4,0,1,2,
+49,254,3,0,1,2,
40,14,3,
2,
42,0,0,0,0,1,
@@ -5339,142 +5313,358 @@
19,
40,176,0,0,0,0,0,
21,
-40,176,0,220,3,2,
+40,176,0,211,3,2,
1,
-49,8,4,0,48,
+49,255,3,0,48,
1,
39,
-49,7,4,0,1,1,47,
+49,254,3,0,1,1,47,
39,
-49,7,4,0,1,0,
+49,254,3,0,1,0,
40,176,0,
40,176,0,
1,
39,
-49,7,4,0,1,2,47,
+49,254,3,0,1,2,47,
39,
-49,7,4,0,1,0,
+49,254,3,0,1,0,
40,176,0,
-49,8,4,0,1,
+49,255,3,0,1,
2,
42,0,0,0,0,1,
34,
6,
40,172,1,1,
19,
-40,176,0,0,0,0,0,1,1,1,220,3,
-22,12,4,
+40,176,0,0,0,0,0,1,1,1,211,3,
+22,3,4,
2,
42,1,0,
-46,56,4,
-9,219,7,
+46,47,4,
+9,186,7,
40,176,0,2,1,0,
0,0,2,
-47,56,4,
+47,47,4,
40,176,0,0,
21,
-40,176,0,6,4,1,
-49,11,4,0,
+40,176,0,253,3,1,
+49,2,4,0,
24,0,
1,
39,
-49,10,4,0,1,0,70,
+49,1,4,0,1,0,70,
39,
-49,10,4,0,1,1,
+49,1,4,0,1,1,
40,14,3,
2,
42,0,0,0,0,1,
24,0,
1,
39,
-49,10,4,0,1,1,70,
+49,1,4,0,1,1,70,
39,
-49,10,4,0,1,2,
+49,1,4,0,1,2,
40,14,3,
2,
42,0,0,0,0,1,
34,
21,
-40,172,1,9,4,2,
-49,10,4,0,
-49,56,4,0,1,
+40,172,1,0,4,2,
+49,1,4,0,
+49,47,4,0,1,
24,0,
1,
39,
-49,10,4,0,1,0,70,
+49,1,4,0,1,0,70,
39,
-49,10,4,0,1,2,
+49,1,4,0,1,2,
40,14,3,
2,
42,0,0,0,0,1,
34,
39,
21,
-40,172,1,9,4,2,
+40,172,1,0,4,2,
39,
-49,10,4,0,3,0,2,1,
-49,56,4,0,3,0,2,1,1,
+49,1,4,0,3,0,2,1,
+49,47,4,0,3,0,2,1,1,
2,
42,0,0,0,0,1,
34,
39,
21,
-40,172,1,9,4,2,
+40,172,1,0,4,2,
39,
-49,10,4,0,3,2,0,1,
-49,56,4,0,3,1,2,0,1,1,
+49,1,4,0,3,2,0,1,
+49,47,4,0,3,1,2,0,1,1,
24,0,
1,
39,
-49,10,4,0,1,0,70,
+49,1,4,0,1,0,70,
39,
-49,10,4,0,1,2,
+49,1,4,0,1,2,
40,14,3,
2,
42,0,0,0,0,1,
34,
39,
21,
-40,172,1,9,4,2,
+40,172,1,0,4,2,
39,
-49,10,4,0,3,1,0,2,
-49,56,4,0,3,1,0,2,1,
+49,1,4,0,3,1,0,2,
+49,47,4,0,3,1,0,2,1,
24,0,
1,
39,
-49,10,4,0,1,1,70,
+49,1,4,0,1,1,70,
39,
-49,10,4,0,1,2,
+49,1,4,0,1,2,
40,14,3,
2,
42,0,0,0,0,1,
34,
39,
21,
-40,172,1,9,4,2,
+40,172,1,0,4,2,
39,
-49,10,4,0,3,1,2,0,
-49,56,4,0,3,2,0,1,1,
+49,1,4,0,3,1,2,0,
+49,47,4,0,3,2,0,1,1,
2,
42,0,0,0,0,1,
34,
39,
21,
-40,172,1,9,4,2,
+40,172,1,0,4,2,
39,
-49,10,4,0,3,2,1,0,
-49,56,4,0,3,2,1,0,1,1,2,6,4,9,4,
+49,1,4,0,3,2,1,0,
+49,47,4,0,3,2,1,0,1,1,2,253,3,0,4,
+22,6,4,
+2,
+42,3,0,
+46,48,4,
+9,110,7,
+40,176,0,2,
+46,49,4,
+9,251,8,
+40,172,1,2,
+46,50,4,
+9,255,8,
+40,172,1,2,3,0,
+0,0,
+2,0,
+1,0,4,
+47,48,4,
+40,176,0,0,
+1,
+39,
+49,5,4,0,1,3,48,
+39,
+49,4,4,0,1,3,
+40,176,0,
+47,49,4,
+40,172,1,0,
+1,
+39,
+49,4,4,0,3,0,1,2,48,
+39,
+49,5,4,0,1,3,
+40,172,1,
+47,50,4,
+40,172,1,0,
+1,
+39,
+49,5,4,0,3,0,1,2,48,
+39,
+49,4,4,0,1,3,
+40,172,1,
+34,
+6,
+40,15,2,2,
+1,
+1,
+1,
+1,
+21,
+40,172,1,251,3,3,
+21,
+40,172,1,3,4,2,
+49,49,4,0,
+49,50,4,0,
+49,48,4,0,
+49,50,4,0,46,
+39,
+49,5,4,0,3,0,1,2,
+40,172,1,47,
+49,50,4,0,
+40,172,1,46,
+39,
+49,4,4,0,3,0,1,2,
+40,172,1,47,
+49,49,4,0,
+40,172,1,
+1,
+1,
+39,
+49,4,4,0,1,3,46,
+39,
+49,5,4,0,1,3,
+40,176,0,47,
+49,48,4,0,
+40,176,0,1,2,251,3,3,4,
+22,9,4,
+2,
+42,3,0,
+46,51,4,
+9,110,7,
+40,176,0,2,
+46,52,4,
+9,251,8,
+40,172,1,2,
+46,53,4,
+9,255,8,
+40,172,1,2,3,0,
+0,0,
+2,0,
+1,0,4,
+47,51,4,
+40,176,0,0,
+1,
+39,
+49,8,4,0,1,3,48,
+39,
+49,7,4,0,1,3,
+40,176,0,
+47,52,4,
+40,172,1,0,
+1,
+39,
+49,7,4,0,3,0,1,2,48,
+39,
+49,8,4,0,1,3,
+40,172,1,
+47,53,4,
+40,172,1,0,
+1,
+39,
+49,8,4,0,3,0,1,2,48,
+39,
+49,7,4,0,1,3,
+40,172,1,
+34,
+6,
+40,15,2,2,
+1,
+1,
+1,
+1,
+21,
+40,172,1,251,3,3,
+21,
+40,172,1,3,4,2,
+49,53,4,0,
+49,52,4,0,
+49,51,4,0,
+49,53,4,0,46,
+39,
+49,8,4,0,3,0,1,2,
+40,172,1,47,
+49,53,4,0,
+40,172,1,46,
+39,
+49,7,4,0,3,0,1,2,
+40,172,1,47,
+49,52,4,0,
+40,172,1,
+1,
+1,
+39,
+49,7,4,0,1,3,46,
+39,
+49,8,4,0,1,3,
+40,176,0,47,
+49,51,4,0,
+40,176,0,1,2,251,3,3,4,
+22,12,4,
+2,
+42,3,0,
+46,54,4,
+9,110,7,
+40,176,0,2,
+46,55,4,
+9,251,8,
+40,172,1,2,
+46,56,4,
+9,255,8,
+40,172,1,2,3,0,
+0,0,
+2,0,
+1,0,4,
+47,54,4,
+40,176,0,0,
+1,
+39,
+49,11,4,0,1,3,48,
+39,
+49,10,4,0,1,3,
+40,176,0,
+47,55,4,
+40,172,1,0,
+1,
+39,
+49,10,4,0,3,0,1,2,48,
+39,
+49,11,4,0,1,3,
+40,172,1,
+47,56,4,
+40,172,1,0,
+1,
+39,
+49,11,4,0,3,0,1,2,48,
+39,
+49,10,4,0,1,3,
+40,172,1,
+34,
+6,
+40,15,2,2,
+1,
+1,
+1,
+1,
+21,
+40,172,1,251,3,3,
+49,55,4,0,
+49,54,4,0,
+49,56,4,0,46,
+39,
+49,11,4,0,3,0,1,2,
+40,172,1,47,
+49,56,4,0,
+40,172,1,46,
+39,
+49,10,4,0,3,0,1,2,
+40,172,1,47,
+49,55,4,0,
+40,172,1,
+1,
+1,
+39,
+49,10,4,0,1,3,46,
+39,
+49,11,4,0,1,3,
+40,176,0,47,
+49,54,4,0,
+40,176,0,1,1,251,3,
22,15,4,
2,
42,3,0,
46,57,4,
-9,143,7,
+9,110,7,
40,176,0,2,
46,58,4,
-9,28,9,
+9,251,8,
40,172,1,2,
46,59,4,
-9,32,9,
+9,255,8,
40,172,1,2,3,0,
0,0,
2,0,
@@ -5511,13 +5701,10 @@
1,
1,
21,
-40,172,1,4,4,3,
-21,
-40,172,1,12,4,2,
-49,58,4,0,
+40,172,1,251,3,3,
49,59,4,0,
49,57,4,0,
-49,59,4,0,46,
+49,58,4,0,46,
39,
49,14,4,0,3,0,1,2,
40,172,1,47,
@@ -5536,337 +5723,124 @@
49,14,4,0,1,3,
40,176,0,47,
49,57,4,0,
-40,176,0,1,2,4,4,12,4,
-22,18,4,
-2,
-42,3,0,
-46,60,4,
-9,143,7,
-40,176,0,2,
-46,61,4,
-9,28,9,
-40,172,1,2,
-46,62,4,
-9,32,9,
-40,172,1,2,3,0,
-0,0,
-2,0,
-1,0,4,
-47,60,4,
-40,176,0,0,
-1,
-39,
-49,17,4,0,1,3,48,
-39,
-49,16,4,0,1,3,
-40,176,0,
-47,61,4,
-40,172,1,0,
-1,
-39,
-49,16,4,0,3,0,1,2,48,
-39,
-49,17,4,0,1,3,
-40,172,1,
-47,62,4,
-40,172,1,0,
-1,
-39,
-49,17,4,0,3,0,1,2,48,
-39,
-49,16,4,0,1,3,
-40,172,1,
-34,
-6,
-40,15,2,2,
-1,
-1,
-1,
-1,
-21,
-40,172,1,4,4,3,
-21,
-40,172,1,12,4,2,
-49,62,4,0,
-49,61,4,0,
-49,60,4,0,
-49,62,4,0,46,
-39,
-49,17,4,0,3,0,1,2,
-40,172,1,47,
-49,62,4,0,
-40,172,1,46,
-39,
-49,16,4,0,3,0,1,2,
-40,172,1,47,
-49,61,4,0,
-40,172,1,
-1,
-1,
-39,
-49,16,4,0,1,3,46,
-39,
-49,17,4,0,1,3,
-40,176,0,47,
-49,60,4,0,
-40,176,0,1,2,4,4,12,4,
-22,21,4,
-2,
-42,3,0,
-46,63,4,
-9,143,7,
-40,176,0,2,
-46,64,4,
-9,28,9,
-40,172,1,2,
-46,65,4,
-9,32,9,
-40,172,1,2,3,0,
-0,0,
-2,0,
-1,0,4,
-47,63,4,
-40,176,0,0,
-1,
-39,
-49,20,4,0,1,3,48,
-39,
-49,19,4,0,1,3,
-40,176,0,
-47,64,4,
-40,172,1,0,
-1,
-39,
-49,19,4,0,3,0,1,2,48,
-39,
-49,20,4,0,1,3,
-40,172,1,
-47,65,4,
-40,172,1,0,
-1,
-39,
-49,20,4,0,3,0,1,2,48,
-39,
-49,19,4,0,1,3,
-40,172,1,
-34,
-6,
-40,15,2,2,
-1,
-1,
-1,
-1,
-21,
-40,172,1,4,4,3,
-49,64,4,0,
-49,63,4,0,
-49,65,4,0,46,
-39,
-49,20,4,0,3,0,1,2,
-40,172,1,47,
-49,65,4,0,
-40,172,1,46,
-39,
-49,19,4,0,3,0,1,2,
-40,172,1,47,
-49,64,4,0,
-40,172,1,
-1,
-1,
-39,
-49,19,4,0,1,3,46,
-39,
-49,20,4,0,1,3,
-40,176,0,47,
-49,63,4,0,
-40,176,0,1,1,4,4,
-22,24,4,
-2,
-42,3,0,
-46,66,4,
-9,143,7,
-40,176,0,2,
-46,67,4,
-9,28,9,
-40,172,1,2,
-46,68,4,
-9,32,9,
-40,172,1,2,3,0,
-0,0,
-2,0,
-1,0,4,
-47,66,4,
-40,176,0,0,
-1,
-39,
-49,23,4,0,1,3,48,
-39,
-49,22,4,0,1,3,
-40,176,0,
-47,67,4,
-40,172,1,0,
-1,
-39,
-49,22,4,0,3,0,1,2,48,
-39,
-49,23,4,0,1,3,
-40,172,1,
-47,68,4,
-40,172,1,0,
-1,
-39,
-49,23,4,0,3,0,1,2,48,
-39,
-49,22,4,0,1,3,
-40,172,1,
-34,
-6,
-40,15,2,2,
-1,
-1,
-1,
-1,
-21,
-40,172,1,4,4,3,
-49,68,4,0,
-49,66,4,0,
-49,67,4,0,46,
-39,
-49,23,4,0,3,0,1,2,
-40,172,1,47,
-49,68,4,0,
-40,172,1,46,
-39,
-49,22,4,0,3,0,1,2,
-40,172,1,47,
-49,67,4,0,
-40,172,1,
-1,
-1,
-39,
-49,22,4,0,1,3,46,
-39,
-49,23,4,0,1,3,
-40,176,0,47,
-49,66,4,0,
-40,176,0,1,1,4,4,
+40,176,0,1,1,251,3,
14,2,0,
42,29,0,
+46,60,4,
+30,
+8,1,3,9,
+40,1,0,0,
+46,61,4,
+30,
+8,1,10,9,
+40,1,0,0,
+46,62,4,
+30,
+8,1,15,9,
+40,1,0,0,
+46,63,4,
+30,
+8,1,20,9,
+40,1,0,0,
+46,64,4,
+30,
+8,1,29,9,
+40,1,0,0,
+46,65,4,
+30,
+8,1,38,9,
+40,1,0,0,
+46,66,4,
+30,
+8,1,45,9,
+40,1,0,0,
+46,67,4,
+30,
+8,1,52,9,
+40,1,0,0,
+46,68,4,
+30,
+8,1,60,9,
+40,1,0,0,
46,69,4,
30,
-8,1,36,9,
+8,1,68,9,
40,1,0,0,
46,70,4,
30,
-8,1,43,9,
+8,1,77,9,
40,1,0,0,
46,71,4,
30,
-8,1,48,9,
+8,1,86,9,
40,1,0,0,
46,72,4,
30,
-8,1,53,9,
+8,1,91,9,
40,1,0,0,
46,73,4,
30,
-8,1,62,9,
+8,1,97,9,
40,1,0,0,
46,74,4,
30,
-8,1,71,9,
+8,1,107,9,
40,1,0,0,
46,75,4,
30,
-8,1,78,9,
+8,1,115,9,
40,1,0,0,
46,76,4,
30,
-8,1,85,9,
+8,1,124,9,
40,1,0,0,
46,77,4,
30,
-8,1,93,9,
+8,1,132,9,
40,1,0,0,
46,78,4,
30,
-8,1,101,9,
+8,1,141,9,
40,1,0,0,
46,79,4,
30,
-8,1,110,9,
+8,1,153,9,
40,1,0,0,
46,80,4,
30,
-8,1,119,9,
+8,1,164,9,
40,1,0,0,
46,81,4,
30,
-8,1,124,9,
+8,1,175,9,
40,1,0,0,
46,82,4,
30,
-8,1,130,9,
+8,1,186,9,
40,1,0,0,
46,83,4,
30,
-8,1,140,9,
+8,1,198,9,
40,1,0,0,
46,84,4,
30,
-8,1,148,9,
+8,1,209,9,
40,1,0,0,
46,85,4,
30,
-8,1,157,9,
+8,1,219,9,
40,1,0,0,
46,86,4,
30,
-8,1,165,9,
+8,1,224,9,
40,1,0,0,
46,87,4,
30,
-8,1,174,9,
+8,1,236,9,
40,1,0,0,
46,88,4,
30,
-8,1,186,9,
-40,1,0,0,
-46,89,4,
-30,
-8,1,197,9,
-40,1,0,0,
-46,90,4,
-30,
-8,1,208,9,
-40,1,0,0,
-46,91,4,
-30,
-8,1,219,9,
-40,1,0,0,
-46,92,4,
-30,
-8,1,231,9,
-40,1,0,0,
-46,93,4,
-30,
-8,1,242,9,
-40,1,0,0,
-46,94,4,
-30,
-8,1,252,9,
-40,1,0,0,
-46,95,4,
-30,
-8,1,1,10,
-40,1,0,0,
-46,96,4,
-30,
-8,1,13,10,
-40,1,0,0,
-46,97,4,
-30,
-8,1,20,10,
+8,1,243,9,
40,1,0,0,29,0,
0,0,
27,0,
@@ -5897,222 +5871,222 @@
7,0,
3,0,
11,0,0,0,0,0,1,0,0,0,2,0,0,0,3,0,0,0,4,0,0,0,5,0,0,0,6,0,0,0,7,0,0,0,8,0,0,0,9,0,0,0,10,0,0,0,11,0,0,0,12,0,0,0,13,0,0,0,14,0,0,0,15,0,0,0,16,0,0,0,17,0,0,0,18,0,0,0,19,0,0,0,20,0,0,0,21,0,0,0,22,0,0,0,23,0,0,0,24,0,0,0,25,0,0,0,26,0,0,0,27,0,0,0,28,0,0,0,
-22,28,4,
+22,19,4,
2,
42,0,0,0,0,1,
38,0,
42,0,0,0,0,
-49,25,4,0,30,
+49,16,4,0,30,
28,
40,1,0,0,0,0,0,1,
34,
21,
-40,15,2,163,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,154,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,1,0,0,0,1,
34,
21,
-40,15,2,166,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,157,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,2,0,0,0,1,
34,
21,
-40,15,2,169,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,160,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,3,0,0,0,1,
34,
21,
-40,15,2,172,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,163,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,4,0,0,0,1,
34,
21,
-40,15,2,175,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,166,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,5,0,0,0,1,
34,
21,
-40,15,2,178,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,169,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,6,0,0,0,1,
34,
21,
-40,15,2,181,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,172,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,7,0,0,0,1,
34,
21,
-40,15,2,184,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,175,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,8,0,0,0,1,
34,
21,
-40,15,2,187,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,178,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,9,0,0,0,1,
34,
21,
-40,15,2,190,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,181,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,10,0,0,0,1,
34,
21,
-40,15,2,193,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,184,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,11,0,0,0,1,
34,
21,
-40,15,2,196,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,187,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,12,0,0,0,1,
34,
21,
-40,15,2,199,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,190,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,13,0,0,0,1,
34,
21,
-40,15,2,202,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,193,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,14,0,0,0,1,
34,
21,
-40,15,2,205,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,196,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,15,0,0,0,1,
34,
21,
-40,15,2,211,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,202,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,16,0,0,0,1,
34,
21,
-40,15,2,214,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,205,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,17,0,0,0,1,
34,
21,
-40,15,2,217,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,208,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,18,0,0,0,1,
34,
21,
-40,15,2,230,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,221,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,19,0,0,0,1,
34,
21,
-40,15,2,236,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,227,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,20,0,0,0,1,
34,
21,
-40,15,2,239,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,230,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,21,0,0,0,1,
34,
21,
-40,15,2,245,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,236,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,22,0,0,0,1,
34,
21,
-40,15,2,248,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,239,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,23,0,0,0,1,
34,
21,
-40,15,2,251,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,242,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,24,0,0,0,1,
34,
21,
-40,15,2,254,3,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,245,3,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,25,0,0,0,1,
34,
21,
-40,15,2,15,4,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,6,4,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,26,0,0,0,1,
34,
21,
-40,15,2,18,4,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,9,4,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,27,0,0,0,1,
34,
21,
-40,15,2,21,4,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,12,4,2,
+49,17,4,0,
+49,18,4,0,
28,
40,1,0,28,0,0,0,1,
34,
21,
-40,15,2,24,4,2,
-49,26,4,0,
-49,27,4,0,
+40,15,2,15,4,2,
+49,17,4,0,
+49,18,4,0,
50,1,
34,
6,
40,15,2,1,
19,
-40,176,0,0,0,0,0,1,29,163,3,166,3,169,3,172,3,175,3,178,3,181,3,184,3,187,3,190,3,193,3,196,3,199,3,202,3,205,3,211,3,214,3,217,3,230,3,236,3,239,3,245,3,248,3,251,3,254,3,15,4,18,4,21,4,24,4,
-22,30,4,
+40,176,0,0,0,0,0,1,29,154,3,157,3,160,3,163,3,166,3,169,3,172,3,175,3,178,3,181,3,184,3,187,3,190,3,193,3,196,3,202,3,205,3,208,3,221,3,227,3,230,3,236,3,239,3,242,3,245,3,6,4,9,4,12,4,15,4,
+22,21,4,
2,
42,0,0,0,0,1,
34,
@@ -6120,17 +6094,17 @@
40,15,2,2,
1,
39,
-49,29,4,0,3,0,1,2,49,
+49,20,4,0,3,0,1,2,49,
21,
40,176,0,224,0,2,
39,
-49,29,4,0,1,3,
+49,20,4,0,1,3,
19,
40,176,0,23,183,209,56,
40,172,1,
39,
-49,29,4,0,1,3,1,0,
-22,32,4,
+49,20,4,0,1,3,1,0,
+22,23,4,
2,
42,0,0,0,0,1,
34,
@@ -6138,78 +6112,78 @@
40,132,1,2,
1,
39,
-49,31,4,0,3,0,1,2,49,
+49,22,4,0,3,0,1,2,49,
21,
40,168,0,216,0,2,
39,
-49,31,4,0,1,3,
+49,22,4,0,1,3,
19,
40,168,0,23,183,209,56,
40,168,1,
39,
-49,31,4,0,1,3,1,0,
-22,34,4,
+49,22,4,0,1,3,1,0,
+22,25,4,
2,
42,0,0,0,0,1,
34,
1,
39,
-49,33,4,0,2,0,1,49,
+49,24,4,0,2,0,1,49,
39,
-49,33,4,0,1,2,
+49,24,4,0,1,2,
40,126,1,1,0,
-22,38,4,
+22,29,4,
2,
42,0,0,0,0,1,
34,
44,
-35,32,10,
+35,255,9,
40,14,3,
21,
40,168,0,105,2,1,
6,
40,218,1,2,
-49,35,4,0,
-49,36,4,0,
+49,26,4,0,
+49,27,4,0,
1,
1,
39,
-49,35,4,0,1,0,48,
+49,26,4,0,1,0,48,
39,
-49,36,4,0,1,1,
+49,27,4,0,1,1,
40,168,0,47,
1,
39,
-49,35,4,0,1,1,48,
+49,26,4,0,1,1,48,
39,
-49,36,4,0,1,0,
+49,27,4,0,1,0,
40,168,0,
40,168,0,1,0,
-22,42,4,
+22,33,4,
2,
42,0,0,0,0,1,
34,
44,
-35,32,10,
+35,255,9,
40,14,3,
21,
40,176,0,109,2,1,
6,
40,8,2,2,
-49,39,4,0,
-49,40,4,0,
+49,30,4,0,
+49,31,4,0,
1,
1,
39,
-49,39,4,0,1,0,48,
+49,30,4,0,1,0,48,
39,
-49,40,4,0,1,1,
+49,31,4,0,1,1,
40,176,0,47,
1,
39,
-49,39,4,0,1,1,48,
+49,30,4,0,1,1,48,
39,
-49,40,4,0,1,0,
+49,31,4,0,1,0,
40,176,0,
40,176,0,1,0,
13,};
diff --git a/src/sksl/ir/SkSLLayout.h b/src/sksl/ir/SkSLLayout.h
index 4900c5e..708647b 100644
--- a/src/sksl/ir/SkSLLayout.h
+++ b/src/sksl/ir/SkSLLayout.h
@@ -39,21 +39,6 @@
kTrianglesAdjacency_Primitive
};
- // These are used by images in GLSL. We only support a subset of what GL supports.
- enum class Format {
- kUnspecified = -1,
- kRGBA32F,
- kR32F,
- kRGBA16F,
- kR16F,
- kLUMINANCE16F,
- kRGBA8,
- kR8,
- kRGBA8I,
- kR8I,
- kRG16F,
- };
-
// used by SkSL processors
enum Key {
// field is not a key
@@ -85,58 +70,6 @@
kGrFragmentProcessor,
};
- static const char* FormatToStr(Format format) {
- switch (format) {
- case Format::kUnspecified: return "";
- case Format::kRGBA32F: return "rgba32f";
- case Format::kR32F: return "r32f";
- case Format::kRGBA16F: return "rgba16f";
- case Format::kR16F: return "r16f";
- case Format::kLUMINANCE16F: return "lum16f";
- case Format::kRGBA8: return "rgba8";
- case Format::kR8: return "r8";
- case Format::kRGBA8I: return "rgba8i";
- case Format::kR8I: return "r8i";
- case Format::kRG16F: return "rg16f";
- }
- SK_ABORT("Unexpected format");
- }
-
- static bool ReadFormat(String str, Format* format) {
- if (str == "rgba32f") {
- *format = Format::kRGBA32F;
- return true;
- } else if (str == "r32f") {
- *format = Format::kR32F;
- return true;
- } else if (str == "rgba16f") {
- *format = Format::kRGBA16F;
- return true;
- } else if (str == "r16f") {
- *format = Format::kR16F;
- return true;
- } else if (str == "lum16f") {
- *format = Format::kLUMINANCE16F;
- return true;
- } else if (str == "rgba8") {
- *format = Format::kRGBA8;
- return true;
- } else if (str == "r8") {
- *format = Format::kR8;
- return true;
- } else if (str == "rgba8i") {
- *format = Format::kRGBA8I;
- return true;
- } else if (str == "r8i") {
- *format = Format::kR8I;
- return true;
- } else if (str == "rg16f") {
- *format = Format::kRG16F;
- return true;
- }
- return false;
- }
-
static const char* CTypeToStr(CType ctype) {
switch (ctype) {
case CType::kDefault:
@@ -174,8 +107,8 @@
}
Layout(int flags, int location, int offset, int binding, int index, int set, int builtin,
- int inputAttachmentIndex, Format format, Primitive primitive, int maxVertices,
- int invocations, StringFragment marker, StringFragment when, Key key, CType ctype)
+ int inputAttachmentIndex, Primitive primitive, int maxVertices, int invocations,
+ StringFragment marker, StringFragment when, Key key, CType ctype)
: fFlags(flags)
, fLocation(location)
, fOffset(offset)
@@ -184,7 +117,6 @@
, fSet(set)
, fBuiltin(builtin)
, fInputAttachmentIndex(inputAttachmentIndex)
- , fFormat(format)
, fPrimitive(primitive)
, fMaxVertices(maxVertices)
, fInvocations(invocations)
@@ -202,7 +134,6 @@
, fSet(-1)
, fBuiltin(-1)
, fInputAttachmentIndex(-1)
- , fFormat(Format::kUnspecified)
, fPrimitive(kUnspecified_Primitive)
, fMaxVertices(-1)
, fInvocations(-1)
@@ -245,9 +176,6 @@
if (fInputAttachmentIndex >= 0) {
result += separator() + "input_attachment_index = " + to_string(fInputAttachmentIndex);
}
- if (Format::kUnspecified != fFormat) {
- result += separator() + FormatToStr(fFormat);
- }
if (fFlags & kOriginUpperLeft_Flag) {
result += separator() + "origin_upper_left";
}
@@ -321,7 +249,6 @@
fSet == other.fSet &&
fBuiltin == other.fBuiltin &&
fInputAttachmentIndex == other.fInputAttachmentIndex &&
- fFormat == other.fFormat &&
fPrimitive == other.fPrimitive &&
fMaxVertices == other.fMaxVertices &&
fInvocations == other.fInvocations &&
@@ -347,7 +274,6 @@
// input_attachment_index comes from Vulkan/SPIR-V to connect a shader variable to the a
// corresponding attachment on the subpass in which the shader is being used.
int fInputAttachmentIndex;
- Format fFormat;
Primitive fPrimitive;
int fMaxVertices;
int fInvocations;
diff --git a/src/sksl/sksl_gpu.sksl b/src/sksl/sksl_gpu.sksl
index ded6fb3..748ef6e 100644
--- a/src/sksl/sksl_gpu.sksl
+++ b/src/sksl/sksl_gpu.sksl
@@ -256,8 +256,6 @@
half4 sample(sampler2D s, float3 P);
half4 sample(sampler2D s, float3 P, float bias);
-float4 imageLoad(image2D image, int2 P);
-int4 imageLoad(iimage2D image, int2 P);
$genType dFdx($genType p);
$genType dFdy($genType p);
$genHType dFdx($genHType p);
