SkSL: Remove all $gsamplerFoo types
These are GLSL-isms that weren't really implemented - each one was a
"generic" type that only resolved to a single underlying type. We've
got along just fine without them for years, so update our sample()
declarations to take the actual underlying type. (Note that we had
worked around this by declaring an integer version of sample where
necessary, so we can presumably keep doing that in the future).
Change-Id: I4c46a2fa0c1f19e6278298c8005a2760329e7abf
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/347040
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
index ced20c2..69de03f 100644
--- a/src/sksl/SkSLCompiler.cpp
+++ b/src/sksl/SkSLCompiler.cpp
@@ -143,18 +143,10 @@
TYPE(Image2D), TYPE(IImage2D),
TYPE(SubpassInput), TYPE(SubpassInputMS),
- TYPE(GSampler1D), TYPE(GSampler2D), TYPE(GSampler3D),
- TYPE(GSamplerCube),
- TYPE(GSampler2DRect),
- TYPE(GSampler1DArray), TYPE(GSampler2DArray), TYPE(GSamplerCubeArray),
- TYPE(GSamplerBuffer),
- TYPE(GSampler2DMS), TYPE(GSampler2DMSArray),
-
TYPE(Sampler1DShadow), TYPE(Sampler2DShadow), TYPE(SamplerCubeShadow),
TYPE(Sampler2DRectShadow),
TYPE(Sampler1DArrayShadow), TYPE(Sampler2DArrayShadow), TYPE(SamplerCubeArrayShadow),
- TYPE(GSampler2DArrayShadow), TYPE(GSamplerCubeArrayShadow),
TYPE(Sampler),
TYPE(Texture2D),
};
diff --git a/src/sksl/SkSLContext.h b/src/sksl/SkSLContext.h
index 6c191c9..78edd4f 100644
--- a/src/sksl/SkSLContext.h
+++ b/src/sksl/SkSLContext.h
@@ -197,30 +197,6 @@
/*isMultisampled=*/true,
/*isSampled=*/false))
- // FIXME figure out what we're supposed to do with the gsampler et al. types)
- , fGSampler1D_Type(Type::MakeGenericType("$gsampler1D", static_type(*fSampler1D_Type)))
- , fGSampler2D_Type(Type::MakeGenericType("$gsampler2D", static_type(*fSampler2D_Type)))
- , fGSampler3D_Type(Type::MakeGenericType("$gsampler3D", static_type(*fSampler3D_Type)))
- , fGSamplerCube_Type(
- Type::MakeGenericType("$gsamplerCube", static_type(*fSamplerCube_Type)))
- , fGSampler2DRect_Type(
- Type::MakeGenericType("$gsampler2DRect", static_type(*fSampler2DRect_Type)))
- , fGSampler1DArray_Type(
- Type::MakeGenericType("$gsampler1DArray", static_type(*fSampler1DArray_Type)))
- , fGSampler2DArray_Type(
- Type::MakeGenericType("$gsampler2DArray", static_type(*fSampler2DArray_Type)))
- , fGSamplerCubeArray_Type(Type::MakeGenericType("$gsamplerCubeArray",
- static_type(*fSamplerCubeArray_Type)))
- , fGSamplerBuffer_Type(
- Type::MakeGenericType("$gsamplerBuffer", static_type(*fSamplerBuffer_Type)))
- , fGSampler2DMS_Type(
- Type::MakeGenericType("$gsampler2DMS", static_type(*fSampler2DMS_Type)))
- , fGSampler2DMSArray_Type(Type::MakeGenericType("$gsampler2DMSArray",
- static_type(*fSampler2DMSArray_Type)))
- , fGSampler2DArrayShadow_Type(Type::MakeGenericType(
- "$gsampler2DArrayShadow", static_type(*fSampler2DArrayShadow_Type)))
- , fGSamplerCubeArrayShadow_Type(Type::MakeGenericType(
- "$gsamplerCubeArrayShadow", static_type(*fSamplerCubeArrayShadow_Type)))
, fGenType_Type(Type::MakeGenericType("$genType",
{fFloat_Type.get(), fFloat2_Type.get(),
fFloat3_Type.get(), fFloat4_Type.get()}))
@@ -283,10 +259,6 @@
, fFragmentProcessor_Type(fp_type(fInt_Type.get(), fBool_Type.get()))
, fDefined_Expression(new Defined(fInvalid_Type.get())) {}
- static std::vector<const Type*> static_type(const Type& t) {
- return { &t, &t, &t, &t };
- }
-
const std::unique_ptr<Type> fInvalid_Type;
const std::unique_ptr<Type> fVoid_Type;
const std::unique_ptr<Type> fFloatLiteral_Type;
@@ -395,20 +367,6 @@
const std::unique_ptr<Type> fSubpassInput_Type;
const std::unique_ptr<Type> fSubpassInputMS_Type;
- const std::unique_ptr<Type> fGSampler1D_Type;
- const std::unique_ptr<Type> fGSampler2D_Type;
- const std::unique_ptr<Type> fGSampler3D_Type;
- const std::unique_ptr<Type> fGSamplerCube_Type;
- const std::unique_ptr<Type> fGSampler2DRect_Type;
- const std::unique_ptr<Type> fGSampler1DArray_Type;
- const std::unique_ptr<Type> fGSampler2DArray_Type;
- const std::unique_ptr<Type> fGSamplerCubeArray_Type;
- const std::unique_ptr<Type> fGSamplerBuffer_Type;
- const std::unique_ptr<Type> fGSampler2DMS_Type;
- const std::unique_ptr<Type> fGSampler2DMSArray_Type;
- const std::unique_ptr<Type> fGSampler2DArrayShadow_Type;
- const std::unique_ptr<Type> fGSamplerCubeArrayShadow_Type;
-
const std::unique_ptr<Type> fGenType_Type;
const std::unique_ptr<Type> fGenHType_Type;
const std::unique_ptr<Type> fGenIType_Type;
diff --git a/src/sksl/generated/sksl_gpu.dehydrated.sksl b/src/sksl/generated/sksl_gpu.dehydrated.sksl
index ad78f78..a72ae67 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[] = {72,10,
+static uint8_t SKSL_INCLUDE_sksl_gpu[] = {56,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,
@@ -157,14 +157,13 @@
7,115,97,109,112,108,101,114,
13,109,97,107,101,83,97,109,112,108,101,114,50,68,
9,115,97,109,112,108,101,114,50,68,
-15,36,103,115,97,109,112,108,101,114,50,68,82,101,99,116,
+13,115,97,109,112,108,101,114,50,68,82,101,99,116,
11,116,101,120,116,117,114,101,83,105,122,101,
4,105,110,116,50,
-11,36,103,115,97,109,112,108,101,114,49,68,
+9,115,97,109,112,108,101,114,49,68,
1,80,
6,115,97,109,112,108,101,
4,98,105,97,115,
-11,36,103,115,97,109,112,108,101,114,50,68,
10,105,115,97,109,112,108,101,114,50,68,
4,105,110,116,52,
18,115,97,109,112,108,101,114,69,120,116,101,114,110,97,108,79,69,83,
@@ -2977,801 +2976,801 @@
9,116,4,
44,41,3,150,4,3,
23,42,3,
-9,166,4,1,40,3,
-44,43,3,178,4,
+9,164,4,1,40,3,
+44,43,3,176,4,
47,44,3,
9,116,4,
-44,45,3,183,4,3,
+44,45,3,181,4,3,
47,46,3,
-9,195,4,
+9,191,4,
41,168,0,3,
23,47,3,
-9,197,4,2,44,3,46,3,
+9,193,4,2,44,3,46,3,
41,15,2,
47,48,3,
9,116,4,
41,45,3,3,
47,49,3,
-9,195,4,
+9,191,4,
41,168,0,3,
47,50,3,
-9,204,4,
+9,200,4,
41,168,0,3,
46,51,3,2,
41,47,3,
23,52,3,
-9,197,4,3,48,3,49,3,50,3,
+9,193,4,3,48,3,49,3,50,3,
41,15,2,
41,52,3,
47,53,3,
9,116,4,
-44,54,3,209,4,3,
-47,55,3,
-9,195,4,
+41,39,3,3,
+47,54,3,
+9,191,4,
41,126,1,3,
-46,56,3,3,
+46,55,3,3,
41,47,3,
41,52,3,
-23,57,3,
-9,197,4,2,53,3,55,3,
+23,56,3,
+9,193,4,2,53,3,54,3,
41,15,2,
-41,57,3,
-47,58,3,
+41,56,3,
+47,57,3,
9,116,4,
-44,59,3,221,4,3,
-47,60,3,
-9,195,4,
+44,58,3,205,4,3,
+47,59,3,
+9,191,4,
41,126,1,3,
-46,61,3,4,
+46,60,3,4,
41,47,3,
41,52,3,
-41,57,3,
-23,62,3,
-9,197,4,2,58,3,60,3,
-44,63,3,232,4,
-41,62,3,
-47,64,3,
+41,56,3,
+23,61,3,
+9,193,4,2,57,3,59,3,
+44,62,3,216,4,
+41,61,3,
+47,63,3,
9,116,4,
-44,65,3,237,4,3,
+44,64,3,221,4,3,
+47,65,3,
+9,191,4,
+41,126,1,3,
47,66,3,
-9,195,4,
-41,126,1,3,
-47,67,3,
-9,204,4,
+9,200,4,
41,168,0,3,
-46,68,3,5,
+46,67,3,5,
41,47,3,
41,52,3,
-41,57,3,
-41,62,3,
-23,69,3,
-9,197,4,3,64,3,66,3,67,3,
+41,56,3,
+41,61,3,
+23,68,3,
+9,193,4,3,63,3,65,3,66,3,
41,15,2,
-41,69,3,
+41,68,3,
+47,69,3,
+9,116,4,
+41,64,3,3,
47,70,3,
-9,116,4,
-41,65,3,3,
-47,71,3,
-9,195,4,
+9,191,4,
41,126,1,3,
-46,72,3,6,
+46,71,3,6,
41,47,3,
41,52,3,
-41,57,3,
-41,62,3,
-41,69,3,
-23,73,3,
-9,197,4,2,70,3,71,3,
+41,56,3,
+41,61,3,
+41,68,3,
+23,72,3,
+9,193,4,2,69,3,70,3,
41,15,2,
-41,73,3,
+41,72,3,
+47,73,3,
+9,116,4,
+41,41,3,3,
47,74,3,
-9,116,4,
-41,41,3,3,
-47,75,3,
-9,195,4,
+9,191,4,
41,126,1,3,
-46,76,3,7,
+46,75,3,7,
41,47,3,
41,52,3,
-41,57,3,
-41,62,3,
-41,69,3,
-41,73,3,
-23,77,3,
-9,197,4,2,74,3,75,3,
+41,56,3,
+41,61,3,
+41,68,3,
+41,72,3,
+23,76,3,
+9,193,4,2,73,3,74,3,
41,15,2,
-41,77,3,
+41,76,3,
+47,77,3,
+9,116,4,
+41,41,3,3,
47,78,3,
-9,116,4,
-41,41,3,3,
-47,79,3,
-9,195,4,
+9,191,4,
41,168,1,3,
-46,80,3,8,
+46,79,3,8,
41,47,3,
41,52,3,
-41,57,3,
-41,62,3,
-41,69,3,
-41,73,3,
-41,77,3,
-23,81,3,
-9,197,4,2,78,3,79,3,
+41,56,3,
+41,61,3,
+41,68,3,
+41,72,3,
+41,76,3,
+23,80,3,
+9,193,4,2,77,3,78,3,
41,15,2,
-41,81,3,
-47,82,3,
-9,0,5,
-44,83,3,8,5,3,
-23,84,3,
-9,21,5,1,82,3,
+41,80,3,
+47,81,3,
+9,240,4,
+44,82,3,248,4,3,
+23,83,3,
+9,5,5,1,81,3,
41,15,2,
-47,85,3,
-9,0,5,
-44,86,3,33,5,3,
-47,87,3,
-9,197,4,
+47,84,3,
+9,240,4,
+44,85,3,17,5,3,
+47,86,3,
+9,193,4,
41,211,0,3,
-46,88,3,2,
-41,84,3,
-23,89,3,
-9,21,5,2,85,3,87,3,
+46,87,3,2,
+41,83,3,
+23,88,3,
+9,5,5,2,84,3,86,3,
41,15,2,
-41,89,3,
+41,88,3,
+47,89,3,
+9,116,4,
+41,45,3,3,
47,90,3,
-9,116,4,
-41,45,3,3,
-47,91,3,
-9,195,4,
+9,191,4,
41,126,1,3,
-46,92,3,9,
+46,91,3,9,
41,47,3,
41,52,3,
-41,57,3,
-41,62,3,
-41,69,3,
-41,73,3,
-41,77,3,
-41,81,3,
-23,93,3,
-9,197,4,2,90,3,91,3,
+41,56,3,
+41,61,3,
+41,68,3,
+41,72,3,
+41,76,3,
+41,80,3,
+23,92,3,
+9,193,4,2,89,3,90,3,
41,15,2,
-41,93,3,
+41,92,3,
+47,93,3,
+9,116,4,
+41,45,3,3,
47,94,3,
-9,116,4,
-41,45,3,3,
+9,191,4,
+41,126,1,3,
47,95,3,
-9,195,4,
-41,126,1,3,
-47,96,3,
-9,204,4,
+9,200,4,
41,168,0,3,
-46,97,3,10,
+46,96,3,10,
41,47,3,
41,52,3,
-41,57,3,
-41,62,3,
-41,69,3,
-41,73,3,
-41,77,3,
-41,81,3,
-41,93,3,
-23,98,3,
-9,197,4,3,94,3,95,3,96,3,
+41,56,3,
+41,61,3,
+41,68,3,
+41,72,3,
+41,76,3,
+41,80,3,
+41,92,3,
+23,97,3,
+9,193,4,3,93,3,94,3,95,3,
41,15,2,
-41,98,3,
+41,97,3,
+47,98,3,
+9,116,4,
+41,39,3,3,
47,99,3,
-9,116,4,
-41,54,3,3,
-47,100,3,
-9,195,4,
+9,191,4,
41,168,1,3,
-46,101,3,11,
+46,100,3,11,
41,47,3,
41,52,3,
-41,57,3,
-41,62,3,
-41,69,3,
-41,73,3,
-41,77,3,
-41,81,3,
-41,93,3,
-41,98,3,
-23,102,3,
-9,197,4,2,99,3,100,3,
+41,56,3,
+41,61,3,
+41,68,3,
+41,72,3,
+41,76,3,
+41,80,3,
+41,92,3,
+41,97,3,
+23,101,3,
+9,193,4,2,98,3,99,3,
41,15,2,
-41,102,3,
+41,101,3,
+47,102,3,
+9,116,4,
+41,39,3,3,
47,103,3,
-9,116,4,
-41,54,3,3,
-47,104,3,
-9,195,4,
+9,191,4,
41,168,1,3,
-47,105,3,
-9,204,4,
+47,104,3,
+9,200,4,
41,168,0,3,
-46,106,3,12,
+46,105,3,12,
41,47,3,
41,52,3,
-41,57,3,
+41,56,3,
+41,61,3,
+41,68,3,
+41,72,3,
+41,76,3,
+41,80,3,
+41,92,3,
+41,97,3,
+41,101,3,
+23,106,3,
+9,193,4,3,102,3,103,3,104,3,
+41,15,2,
+41,106,3,
+47,107,3,
+9,32,5,
+44,108,3,38,5,3,
+47,109,3,
+9,191,4,
+41,43,3,3,
+23,110,3,
+9,46,5,2,107,3,109,3,
+41,132,1,
+47,111,3,
+9,32,5,
+44,112,3,56,5,3,
+47,113,3,
+9,191,4,
+41,43,3,3,
+46,114,3,2,
+41,110,3,
+23,115,3,
+9,46,5,2,111,3,113,3,
41,62,3,
-41,69,3,
-41,73,3,
-41,77,3,
-41,81,3,
-41,93,3,
-41,98,3,
-41,102,3,
-23,107,3,
-9,197,4,3,103,3,104,3,105,3,
-41,15,2,
-41,107,3,
-47,108,3,
-9,48,5,
-44,109,3,54,5,3,
-47,110,3,
-9,195,4,
-41,43,3,3,
-23,111,3,
-9,62,5,2,108,3,110,3,
-41,132,1,
-47,112,3,
-9,48,5,
-44,113,3,72,5,3,
-47,114,3,
-9,195,4,
-41,43,3,3,
-46,115,3,2,
-41,111,3,
-23,116,3,
-9,62,5,2,112,3,114,3,
-41,63,3,
-41,116,3,
-47,117,3,
+41,115,3,
+47,116,3,
9,10,2,
41,3,0,3,
-23,118,3,
-9,81,5,1,117,3,
+23,117,3,
+9,65,5,1,116,3,
41,3,0,
-47,119,3,
+47,118,3,
9,10,2,
41,3,0,3,
-23,120,3,
-9,86,5,1,119,3,
+23,119,3,
+9,70,5,1,118,3,
41,3,0,
-47,121,3,
+47,120,3,
9,10,2,
41,49,0,3,
-46,122,3,2,
-41,118,3,
-23,123,3,
-9,81,5,1,121,3,
+46,121,3,2,
+41,117,3,
+23,122,3,
+9,65,5,1,120,3,
41,49,0,
-41,123,3,
-47,124,3,
+41,122,3,
+47,123,3,
9,10,2,
41,49,0,3,
-46,125,3,2,
-41,120,3,
-23,126,3,
-9,86,5,1,124,3,
+46,124,3,2,
+41,119,3,
+23,125,3,
+9,70,5,1,123,3,
41,49,0,
-41,126,3,
-47,127,3,
+41,125,3,
+47,126,3,
9,10,2,
41,3,0,3,
-23,128,3,
-9,91,5,1,127,3,
+23,127,3,
+9,75,5,1,126,3,
41,3,0,
-47,129,3,
+47,128,3,
9,10,2,
41,49,0,3,
-46,130,3,2,
-41,128,3,
-23,131,3,
-9,91,5,1,129,3,
+46,129,3,2,
+41,127,3,
+23,130,3,
+9,75,5,1,128,3,
41,49,0,
-41,131,3,
+41,130,3,
+47,131,3,
+9,82,5,
+41,168,0,3,
47,132,3,
-9,98,5,
-41,168,0,3,
-47,133,3,
-9,197,4,
+9,193,4,
41,211,0,3,
-23,134,3,
-9,110,5,2,132,3,133,3,
+23,133,3,
+9,94,5,2,131,3,132,3,
41,168,0,
+47,134,3,
+9,82,5,
+41,126,1,3,
47,135,3,
-9,98,5,
-41,126,1,3,
-47,136,3,
-9,197,4,
+9,193,4,
41,211,0,3,
-46,137,3,2,
-41,134,3,
-23,138,3,
-9,110,5,2,135,3,136,3,
+46,136,3,2,
+41,133,3,
+23,137,3,
+9,94,5,2,134,3,135,3,
41,126,1,
-41,138,3,
+41,137,3,
+47,138,3,
+9,82,5,
+41,168,1,3,
47,139,3,
-9,98,5,
-41,168,1,3,
-47,140,3,
-9,197,4,
+9,193,4,
41,211,0,3,
-46,141,3,3,
-41,134,3,
-41,138,3,
-23,142,3,
-9,110,5,2,139,3,140,3,
+46,140,3,3,
+41,133,3,
+41,137,3,
+23,141,3,
+9,94,5,2,138,3,139,3,
41,168,1,
-41,142,3,
+41,141,3,
+47,142,3,
+9,82,5,
+41,132,1,3,
47,143,3,
-9,98,5,
-41,132,1,3,
-47,144,3,
-9,197,4,
+9,193,4,
41,211,0,3,
-46,145,3,4,
-41,134,3,
-41,138,3,
-41,142,3,
-23,146,3,
-9,110,5,2,143,3,144,3,
+46,144,3,4,
+41,133,3,
+41,137,3,
+41,141,3,
+23,145,3,
+9,94,5,2,142,3,143,3,
41,132,1,
-41,146,3,
-47,147,3,
-9,98,5,
+41,145,3,
+47,146,3,
+9,82,5,
41,168,0,3,
-47,148,3,
-9,130,5,
+47,147,3,
+9,114,5,
41,126,1,3,
-23,149,3,
-9,137,5,2,147,3,148,3,
+23,148,3,
+9,121,5,2,146,3,147,3,
41,168,0,
+47,149,3,
+9,82,5,
+41,126,1,3,
47,150,3,
-9,98,5,
+9,114,5,
41,126,1,3,
-47,151,3,
-9,130,5,
-41,126,1,3,
-46,152,3,2,
-41,149,3,
-23,153,3,
-9,137,5,2,150,3,151,3,
+46,151,3,2,
+41,148,3,
+23,152,3,
+9,121,5,2,149,3,150,3,
41,126,1,
-41,153,3,
-47,154,3,
-9,98,5,
+41,152,3,
+47,153,3,
+9,82,5,
41,168,1,3,
-47,155,3,
-9,130,5,
+47,154,3,
+9,114,5,
41,126,1,3,
-46,156,3,3,
-41,149,3,
-41,153,3,
-23,157,3,
-9,137,5,2,154,3,155,3,
+46,155,3,3,
+41,148,3,
+41,152,3,
+23,156,3,
+9,121,5,2,153,3,154,3,
41,168,1,
-41,157,3,
+41,156,3,
+47,157,3,
+9,82,5,
+41,132,1,3,
47,158,3,
-9,98,5,
-41,132,1,3,
-47,159,3,
-9,130,5,
+9,114,5,
41,126,1,3,
-46,160,3,4,
-41,149,3,
-41,153,3,
-41,157,3,
-23,161,3,
-9,137,5,2,158,3,159,3,
+46,159,3,4,
+41,148,3,
+41,152,3,
+41,156,3,
+23,160,3,
+9,121,5,2,157,3,158,3,
41,132,1,
-41,161,3,
+41,160,3,
+47,161,3,
+9,141,5,
+41,15,2,3,
47,162,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,163,3,
-9,161,5,
-41,15,2,3,
-23,164,3,
-9,165,5,2,162,3,163,3,
+23,163,3,
+9,149,5,2,161,3,162,3,
41,15,2,
+47,164,3,
+9,141,5,
+41,15,2,3,
47,165,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,166,3,
-9,161,5,
-41,15,2,3,
-23,167,3,
-9,177,5,2,165,3,166,3,
+23,166,3,
+9,161,5,2,164,3,165,3,
41,15,2,
+47,167,3,
+9,141,5,
+41,15,2,3,
47,168,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,169,3,
-9,161,5,
-41,15,2,3,
-23,170,3,
-9,187,5,2,168,3,169,3,
+23,169,3,
+9,171,5,2,167,3,168,3,
41,15,2,
+47,170,3,
+9,141,5,
+41,15,2,3,
47,171,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,172,3,
-9,161,5,
-41,15,2,3,
-23,173,3,
-9,197,5,2,171,3,172,3,
+23,172,3,
+9,181,5,2,170,3,171,3,
41,15,2,
+47,173,3,
+9,141,5,
+41,15,2,3,
47,174,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,175,3,
-9,161,5,
-41,15,2,3,
-23,176,3,
-9,212,5,2,174,3,175,3,
+23,175,3,
+9,196,5,2,173,3,174,3,
41,15,2,
+47,176,3,
+9,141,5,
+41,15,2,3,
47,177,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,178,3,
-9,161,5,
-41,15,2,3,
-23,179,3,
-9,227,5,2,177,3,178,3,
+23,178,3,
+9,211,5,2,176,3,177,3,
41,15,2,
+47,179,3,
+9,141,5,
+41,15,2,3,
47,180,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,181,3,
-9,161,5,
-41,15,2,3,
-23,182,3,
-9,240,5,2,180,3,181,3,
+23,181,3,
+9,224,5,2,179,3,180,3,
41,15,2,
+47,182,3,
+9,141,5,
+41,15,2,3,
47,183,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,184,3,
-9,161,5,
-41,15,2,3,
-23,185,3,
-9,253,5,2,183,3,184,3,
+23,184,3,
+9,237,5,2,182,3,183,3,
41,15,2,
+47,185,3,
+9,141,5,
+41,15,2,3,
47,186,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,187,3,
-9,161,5,
-41,15,2,3,
-23,188,3,
-9,11,6,2,186,3,187,3,
+23,187,3,
+9,251,5,2,185,3,186,3,
41,15,2,
+47,188,3,
+9,141,5,
+41,15,2,3,
47,189,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,190,3,
-9,161,5,
-41,15,2,3,
-23,191,3,
-9,25,6,2,189,3,190,3,
+23,190,3,
+9,9,6,2,188,3,189,3,
41,15,2,
+47,191,3,
+9,141,5,
+41,15,2,3,
47,192,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,193,3,
-9,161,5,
-41,15,2,3,
-23,194,3,
-9,40,6,2,192,3,193,3,
+23,193,3,
+9,24,6,2,191,3,192,3,
41,15,2,
+47,194,3,
+9,141,5,
+41,15,2,3,
47,195,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,196,3,
-9,161,5,
-41,15,2,3,
-23,197,3,
-9,55,6,2,195,3,196,3,
+23,196,3,
+9,39,6,2,194,3,195,3,
41,15,2,
+47,197,3,
+9,141,5,
+41,15,2,3,
47,198,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,199,3,
-9,161,5,
-41,15,2,3,
-23,200,3,
-9,65,6,2,198,3,199,3,
+23,199,3,
+9,49,6,2,197,3,198,3,
41,15,2,
+47,200,3,
+9,141,5,
+41,15,2,3,
47,201,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,202,3,
-9,161,5,
-41,15,2,3,
-23,203,3,
-9,76,6,2,201,3,202,3,
+23,202,3,
+9,60,6,2,200,3,201,3,
41,15,2,
+47,203,3,
+9,141,5,
+41,15,2,3,
47,204,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,205,3,
-9,161,5,
-41,15,2,3,
-23,206,3,
-9,91,6,2,204,3,205,3,
+23,205,3,
+9,75,6,2,203,3,204,3,
41,15,2,
+47,206,3,
+9,116,4,
+41,4,2,3,
47,207,3,
-9,116,4,
+9,88,6,
41,4,2,3,
-47,208,3,
-9,104,6,
-41,4,2,3,
-23,209,3,
-9,106,6,2,207,3,208,3,
+23,208,3,
+9,90,6,2,206,3,207,3,
41,176,0,
+47,209,3,
+9,141,5,
+41,15,2,3,
47,210,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,211,3,
-9,161,5,
-41,15,2,3,
-23,212,3,
-9,131,6,2,210,3,211,3,
+23,211,3,
+9,115,6,2,209,3,210,3,
41,15,2,
+47,212,3,
+9,141,5,
+41,15,2,3,
47,213,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,214,3,
-9,161,5,
-41,15,2,3,
-23,215,3,
-9,145,6,2,213,3,214,3,
+23,214,3,
+9,129,6,2,212,3,213,3,
41,15,2,
+47,215,3,
+9,141,5,
+41,15,2,3,
47,216,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,217,3,
-9,161,5,
-41,15,2,3,
-23,218,3,
-9,158,6,2,216,3,217,3,
+23,217,3,
+9,142,6,2,215,3,216,3,
41,15,2,
+47,218,3,
+9,156,6,
+41,176,0,3,
47,219,3,
-9,172,6,
+9,88,6,
41,176,0,3,
-47,220,3,
-9,104,6,
-41,176,0,3,
-23,221,3,
-9,174,6,2,219,3,220,3,
+23,220,3,
+9,158,6,2,218,3,219,3,
41,176,0,
+47,221,3,
+9,116,4,
+41,4,2,3,
47,222,3,
-9,116,4,
+9,88,6,
41,4,2,3,
-47,223,3,
-9,104,6,
-41,4,2,3,
-23,224,3,
-9,190,6,2,222,3,223,3,
+23,223,3,
+9,174,6,2,221,3,222,3,
41,176,0,
+47,224,3,
+9,141,5,
+41,15,2,3,
47,225,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,226,3,
-9,161,5,
-41,15,2,3,
-23,227,3,
-9,213,6,2,225,3,226,3,
+23,226,3,
+9,197,6,2,224,3,225,3,
41,15,2,
+47,227,3,
+9,116,4,
+41,4,2,3,
47,228,3,
-9,116,4,
+9,88,6,
41,4,2,3,
-47,229,3,
-9,104,6,
-41,4,2,3,
-23,230,3,
-9,231,6,2,228,3,229,3,
+23,229,3,
+9,215,6,2,227,3,228,3,
41,176,0,
+47,230,3,
+9,141,5,
+41,15,2,3,
47,231,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,232,3,
-9,161,5,
-41,15,2,3,
-23,233,3,
-9,253,6,2,231,3,232,3,
+23,232,3,
+9,237,6,2,230,3,231,3,
41,15,2,
+47,233,3,
+9,141,5,
+41,15,2,3,
47,234,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,235,3,
-9,161,5,
-41,15,2,3,
-23,236,3,
-9,14,7,2,234,3,235,3,
+23,235,3,
+9,254,6,2,233,3,234,3,
41,15,2,
-47,237,3,
+47,236,3,
9,116,4,
41,4,2,3,
-47,238,3,
-9,104,6,
+47,237,3,
+9,88,6,
41,4,2,3,
-23,239,3,
-9,31,7,2,237,3,238,3,
+23,238,3,
+9,15,7,2,236,3,237,3,
41,176,0,
+47,239,3,
+9,141,5,
+41,15,2,3,
47,240,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,241,3,
-9,161,5,
-41,15,2,3,
-23,242,3,
-9,53,7,2,240,3,241,3,
+23,241,3,
+9,37,7,2,239,3,240,3,
41,15,2,
+47,242,3,
+9,141,5,
+41,15,2,3,
47,243,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,244,3,
-9,161,5,
-41,15,2,3,
-23,245,3,
-9,70,7,2,243,3,244,3,
+23,244,3,
+9,54,7,2,242,3,243,3,
41,15,2,
+47,245,3,
+9,141,5,
+41,15,2,3,
47,246,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,247,3,
-9,161,5,
-41,15,2,3,
-23,248,3,
-9,87,7,2,246,3,247,3,
+23,247,3,
+9,71,7,2,245,3,246,3,
41,15,2,
+47,248,3,
+9,141,5,
+41,15,2,3,
47,249,3,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,250,3,
-9,161,5,
-41,15,2,3,
-23,251,3,
-9,103,7,2,249,3,250,3,
+23,250,3,
+9,87,7,2,248,3,249,3,
41,15,2,
-47,252,3,
-9,118,7,
+47,251,3,
+9,102,7,
41,172,1,3,
-23,253,3,
-9,124,7,1,252,3,
+23,252,3,
+9,108,7,1,251,3,
41,176,0,
+47,253,3,
+9,131,7,
+41,172,1,3,
47,254,3,
-9,147,7,
-41,172,1,3,
+9,143,7,
+41,176,0,3,
47,255,3,
-9,159,7,
-41,176,0,3,
-47,0,4,
-9,165,7,
+9,149,7,
41,172,1,3,
-23,1,4,
-9,174,7,3,254,3,255,3,0,4,
+23,0,4,
+9,158,7,3,253,3,254,3,255,3,
41,172,1,
-47,2,4,
-9,118,7,
+47,1,4,
+9,102,7,
41,172,1,3,
-23,3,4,
-9,201,7,1,2,4,
+23,2,4,
+9,185,7,1,1,4,
41,176,0,
+47,3,4,
+9,209,7,
+41,172,1,3,
47,4,4,
-9,225,7,
-41,172,1,3,
-47,5,4,
-9,235,7,
+9,219,7,
41,176,0,3,
-23,6,4,
-9,239,7,2,4,4,5,4,
+23,5,4,
+9,223,7,2,3,4,4,4,
41,172,1,
+47,6,4,
+9,2,8,
+41,172,1,3,
47,7,4,
-9,18,8,
+9,14,8,
41,172,1,3,
-47,8,4,
-9,30,8,
-41,172,1,3,
-23,9,4,
-9,39,8,2,7,4,8,4,
+23,8,4,
+9,23,8,2,6,4,7,4,
41,172,1,
+47,9,4,
+9,141,5,
+41,15,2,3,
47,10,4,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,11,4,
-9,161,5,
-41,15,2,3,
-23,12,4,
-9,67,8,2,10,4,11,4,
+23,11,4,
+9,51,8,2,9,4,10,4,
41,15,2,
+47,12,4,
+9,141,5,
+41,15,2,3,
47,13,4,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,14,4,
-9,161,5,
-41,15,2,3,
-23,15,4,
-9,77,8,2,13,4,14,4,
+23,14,4,
+9,61,8,2,12,4,13,4,
41,15,2,
+47,15,4,
+9,141,5,
+41,15,2,3,
47,16,4,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,17,4,
-9,161,5,
-41,15,2,3,
-23,18,4,
-9,94,8,2,16,4,17,4,
+23,17,4,
+9,78,8,2,15,4,16,4,
41,15,2,
+47,18,4,
+9,141,5,
+41,15,2,3,
47,19,4,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,20,4,
-9,161,5,
-41,15,2,3,
-23,21,4,
-9,106,8,2,19,4,20,4,
+23,20,4,
+9,90,8,2,18,4,19,4,
41,15,2,
-47,22,4,
-9,123,8,
+47,21,4,
+9,107,8,
41,1,0,3,
+47,22,4,
+9,141,5,
+41,15,2,3,
47,23,4,
-9,157,5,
+9,145,5,
41,15,2,3,
-47,24,4,
-9,161,5,
-41,15,2,3,
-23,25,4,
-9,128,8,3,22,4,23,4,24,4,
+23,24,4,
+9,112,8,3,21,4,22,4,23,4,
41,15,2,
-47,26,4,
-9,118,7,
+47,25,4,
+9,102,7,
41,15,2,3,
-23,27,4,
-9,134,8,1,26,4,
+23,26,4,
+9,118,8,1,25,4,
41,15,2,
-47,28,4,
-9,118,7,
+47,27,4,
+9,102,7,
41,132,1,3,
-23,29,4,
-9,143,8,1,28,4,
+23,28,4,
+9,127,8,1,27,4,
41,132,1,
-47,30,4,
+47,29,4,
9,10,2,
41,168,1,3,
-23,31,4,
-9,158,8,1,30,4,
+23,30,4,
+9,142,8,1,29,4,
41,126,1,
+47,31,4,
+9,32,1,
+41,126,1,3,
47,32,4,
-9,32,1,
-41,126,1,3,
-47,33,4,
9,171,1,
41,126,1,3,
-46,34,4,3,
+46,33,4,3,
41,170,1,
41,175,1,
-23,35,4,
-9,135,2,2,32,4,33,4,
+23,34,4,
+9,135,2,2,31,4,32,4,
41,168,0,
-41,35,4,
-47,36,4,
+41,34,4,
+47,35,4,
9,32,1,
41,4,2,3,
-47,37,4,
+47,36,4,
9,171,1,
41,4,2,3,
-46,38,4,4,
+46,37,4,4,
41,170,1,
41,175,1,
-41,35,4,
-23,39,4,
-9,135,2,2,36,4,37,4,
+41,34,4,
+23,38,4,
+9,135,2,2,35,4,36,4,
41,176,0,
-41,39,4,136,0,
+41,38,4,136,0,
0,0,
193,3,
199,3,
@@ -3909,7 +3908,7 @@
223,3,
225,3,
12,
-22,164,3,
+22,163,3,
2,
43,0,0,0,0,1,
35,
@@ -3917,33 +3916,33 @@
41,15,2,1,
19,
41,176,0,0,0,0,0,1,0,
-22,167,3,
+22,166,3,
2,
43,0,0,0,0,1,
35,
-50,165,3,0,1,0,
-22,170,3,
+50,164,3,0,1,0,
+22,169,3,
2,
43,0,0,0,0,1,
35,
-50,169,3,0,1,0,
-22,173,3,
+50,168,3,0,1,0,
+22,172,3,
2,
43,0,0,0,0,1,
35,
1,
-50,171,3,0,56,
+50,170,3,0,56,
1,
1,
19,
41,176,0,0,0,128,63,57,
40,
-50,171,3,0,1,3,
+50,170,3,0,1,3,
41,176,0,58,
-50,172,3,0,
+50,171,3,0,
41,15,2,
41,15,2,1,0,
-22,176,3,
+22,175,3,
2,
43,0,0,0,0,1,
35,
@@ -3953,22 +3952,22 @@
19,
41,176,0,0,0,128,63,57,
40,
-50,175,3,0,1,3,
+50,174,3,0,1,3,
41,176,0,58,
-50,174,3,0,
+50,173,3,0,
41,15,2,56,
-50,175,3,0,
+50,174,3,0,
41,15,2,1,0,
-22,179,3,
+22,178,3,
2,
43,0,0,0,0,1,
35,
45,
-36,163,8,
+36,147,8,
41,14,3,
45,
1,
-50,177,3,0,75,
+50,176,3,0,75,
6,
41,15,2,1,
19,
@@ -3979,24 +3978,24 @@
19,
41,176,0,0,0,0,0,
1,
-50,177,3,0,58,
+50,176,3,0,58,
40,
-50,178,3,0,1,3,
+50,177,3,0,1,3,
41,15,2,
1,
-50,177,3,0,58,
+50,176,3,0,58,
40,
-50,178,3,0,1,3,
+50,177,3,0,1,3,
41,15,2,1,0,
-22,182,3,
+22,181,3,
2,
43,0,0,0,0,1,
35,
21,
-41,15,2,179,3,2,
-50,181,3,0,
-50,180,3,0,1,1,179,3,
-22,185,3,
+41,15,2,178,3,2,
+50,180,3,0,
+50,179,3,0,1,1,178,3,
+22,184,3,
2,
43,0,0,0,0,1,
35,
@@ -4005,11 +4004,11 @@
19,
41,176,0,0,0,128,63,57,
40,
-50,184,3,0,1,3,
+50,183,3,0,1,3,
41,176,0,58,
-50,183,3,0,
+50,182,3,0,
41,15,2,1,0,
-22,188,3,
+22,187,3,
2,
43,0,0,0,0,1,
35,
@@ -4018,31 +4017,31 @@
19,
41,176,0,0,0,128,63,57,
40,
-50,186,3,0,1,3,
+50,185,3,0,1,3,
41,176,0,58,
-50,187,3,0,
+50,186,3,0,
41,15,2,1,0,
-22,191,3,
+22,190,3,
2,
43,0,0,0,0,1,
35,
1,
1,
40,
-50,190,3,0,1,3,58,
+50,189,3,0,1,3,58,
+50,188,3,0,
+41,15,2,56,
+1,
+1,
+19,
+41,176,0,0,0,128,63,57,
+40,
+50,188,3,0,1,3,
+41,176,0,58,
50,189,3,0,
-41,15,2,56,
-1,
-1,
-19,
-41,176,0,0,0,128,63,57,
-40,
-50,189,3,0,1,3,
-41,176,0,58,
-50,190,3,0,
41,15,2,
41,15,2,1,0,
-22,194,3,
+22,193,3,
2,
43,0,0,0,0,1,
35,
@@ -4052,17 +4051,17 @@
19,
41,176,0,0,0,128,63,57,
40,
-50,193,3,0,1,3,
+50,192,3,0,1,3,
41,176,0,58,
+50,191,3,0,
+41,15,2,56,
+1,
+40,
+50,191,3,0,1,3,58,
50,192,3,0,
-41,15,2,56,
-1,
-40,
-50,192,3,0,1,3,58,
-50,193,3,0,
41,15,2,
41,15,2,1,0,
-22,197,3,
+22,196,3,
2,
43,0,0,0,0,1,
35,
@@ -4072,56 +4071,56 @@
19,
41,176,0,0,0,128,63,57,
40,
-50,196,3,0,1,3,
-41,176,0,58,
-50,195,3,0,
-41,15,2,56,
-1,
-1,
-19,
-41,176,0,0,0,128,63,57,
-40,
50,195,3,0,1,3,
41,176,0,58,
-50,196,3,0,
+50,194,3,0,
+41,15,2,56,
+1,
+1,
+19,
+41,176,0,0,0,128,63,57,
+40,
+50,194,3,0,1,3,
+41,176,0,58,
+50,195,3,0,
41,15,2,
41,15,2,1,0,
-22,200,3,
+22,199,3,
2,
43,0,0,0,0,1,
35,
21,
41,15,2,204,0,2,
1,
-50,198,3,0,56,
-50,199,3,0,
+50,197,3,0,56,
+50,198,3,0,
41,15,2,
19,
41,176,0,0,0,128,63,1,0,
-22,203,3,
+22,202,3,
2,
43,0,0,0,0,1,
35,
1,
-50,201,3,0,58,
-50,202,3,0,
+50,200,3,0,58,
+50,201,3,0,
41,15,2,1,0,
-22,206,3,
+22,205,3,
2,
43,0,0,0,0,1,
35,
1,
-50,204,3,0,56,
+50,203,3,0,56,
1,
1,
19,
41,176,0,0,0,128,63,57,
-50,204,3,0,
+50,203,3,0,
41,15,2,58,
-50,205,3,0,
+50,204,3,0,
41,15,2,
41,15,2,1,0,
-22,209,3,
+22,208,3,
2,
43,0,0,0,0,1,
35,
@@ -4131,27 +4130,27 @@
19,
41,176,0,0,0,0,64,58,
40,
-50,208,3,0,1,0,
+50,207,3,0,1,0,
41,176,0,80,
40,
-50,208,3,0,1,1,
+50,207,3,0,1,1,
41,14,3,
1,
1,
19,
41,176,0,0,0,0,64,58,
40,
-50,207,3,0,1,0,
+50,206,3,0,1,0,
41,176,0,58,
40,
-50,208,3,0,1,0,
+50,207,3,0,1,0,
41,176,0,
1,
1,
40,
-50,207,3,0,1,1,58,
+50,206,3,0,1,1,58,
40,
-50,208,3,0,1,1,
+50,207,3,0,1,1,
41,176,0,57,
1,
1,
@@ -4159,110 +4158,148 @@
41,176,0,0,0,0,64,58,
1,
40,
-50,208,3,0,1,1,57,
-40,
-50,208,3,0,1,0,
-41,176,0,
-41,176,0,58,
-1,
-40,
50,207,3,0,1,1,57,
40,
50,207,3,0,1,0,
41,176,0,
+41,176,0,58,
+1,
+40,
+50,206,3,0,1,1,57,
+40,
+50,206,3,0,1,0,
+41,176,0,
41,176,0,
41,176,0,1,0,
-22,212,3,
+22,211,3,
2,
43,1,0,
-47,40,4,
-9,201,8,
+47,39,4,
+9,185,8,
41,15,2,2,1,0,
0,0,3,
-48,40,4,
+48,39,4,
41,15,2,0,
6,
41,15,2,4,
21,
-41,176,0,209,3,2,
+41,176,0,208,3,2,
+40,
+50,209,3,0,2,0,3,
40,
50,210,3,0,2,0,3,
-40,
-50,211,3,0,2,0,3,
21,
-41,176,0,209,3,2,
+41,176,0,208,3,2,
+40,
+50,209,3,0,2,1,3,
40,
50,210,3,0,2,1,3,
-40,
-50,211,3,0,2,1,3,
21,
-41,176,0,209,3,2,
+41,176,0,208,3,2,
+40,
+50,209,3,0,2,2,3,
40,
50,210,3,0,2,2,3,
-40,
-50,211,3,0,2,2,3,
1,
40,
-50,210,3,0,1,3,56,
+50,209,3,0,1,3,56,
1,
1,
19,
41,176,0,0,0,128,63,57,
40,
-50,210,3,0,1,3,
+50,209,3,0,1,3,
41,176,0,58,
40,
-50,211,3,0,1,3,
+50,210,3,0,1,3,
41,176,0,
41,176,0,
16,
1,
40,
-50,40,4,2,3,0,1,2,81,
+50,39,4,2,3,0,1,2,81,
1,
1,
40,
-50,211,3,0,3,0,1,2,58,
-1,
-19,
-41,176,0,0,0,128,63,57,
-40,
-50,210,3,0,1,3,
-41,176,0,
-41,172,1,56,
-1,
-40,
50,210,3,0,3,0,1,2,58,
1,
19,
41,176,0,0,0,128,63,57,
40,
-50,211,3,0,1,3,
+50,209,3,0,1,3,
+41,176,0,
+41,172,1,56,
+1,
+40,
+50,209,3,0,3,0,1,2,58,
+1,
+19,
+41,176,0,0,0,128,63,57,
+40,
+50,210,3,0,1,3,
41,176,0,
41,172,1,
41,172,1,
41,172,1,
35,
-50,40,4,0,1,1,209,3,
-22,215,3,
+50,39,4,0,1,1,208,3,
+22,214,3,
+2,
+43,1,0,
+47,40,4,
+9,185,8,
+41,15,2,2,1,0,
+0,0,3,
+48,40,4,
+41,15,2,0,
+21,
+41,15,2,172,3,2,
+50,212,3,0,
+50,213,3,0,
+16,
+1,
+40,
+50,40,4,1,3,0,1,2,74,
+21,
+41,172,1,200,0,2,
+40,
+50,40,4,0,3,0,1,2,
+1,
+1,
+1,
+19,
+41,176,0,0,0,128,63,57,
+40,
+50,213,3,0,1,3,
+41,176,0,58,
+40,
+50,212,3,0,3,0,1,2,
+41,172,1,56,
+40,
+50,213,3,0,3,0,1,2,
+41,172,1,
+41,172,1,
+35,
+50,40,4,0,1,1,172,3,
+22,217,3,
2,
43,1,0,
47,41,4,
-9,201,8,
+9,185,8,
41,15,2,2,1,0,
0,0,3,
48,41,4,
41,15,2,0,
21,
-41,15,2,173,3,2,
-50,213,3,0,
-50,214,3,0,
+41,15,2,172,3,2,
+50,215,3,0,
+50,216,3,0,
16,
1,
40,
50,41,4,1,3,0,1,2,74,
21,
-41,172,1,200,0,2,
+41,172,1,224,0,2,
40,
50,41,4,0,3,0,1,2,
1,
@@ -4271,81 +4308,43 @@
19,
41,176,0,0,0,128,63,57,
40,
-50,214,3,0,1,3,
+50,216,3,0,1,3,
41,176,0,58,
40,
-50,213,3,0,3,0,1,2,
+50,215,3,0,3,0,1,2,
41,172,1,56,
40,
-50,214,3,0,3,0,1,2,
-41,172,1,
-41,172,1,
-35,
-50,41,4,0,1,1,173,3,
-22,218,3,
-2,
-43,1,0,
-47,42,4,
-9,201,8,
-41,15,2,2,1,0,
-0,0,3,
-48,42,4,
-41,15,2,0,
-21,
-41,15,2,173,3,2,
-50,216,3,0,
-50,217,3,0,
-16,
-1,
-40,
-50,42,4,1,3,0,1,2,74,
-21,
-41,172,1,224,0,2,
-40,
-50,42,4,0,3,0,1,2,
-1,
-1,
-1,
-19,
-41,176,0,0,0,128,63,57,
-40,
-50,217,3,0,1,3,
-41,176,0,58,
-40,
50,216,3,0,3,0,1,2,
-41,172,1,56,
-40,
-50,217,3,0,3,0,1,2,
41,172,1,
41,172,1,
35,
-50,42,4,0,1,1,173,3,
-22,221,3,
+50,41,4,0,1,1,172,3,
+22,220,3,
2,
43,0,0,0,0,1,
35,
45,
-36,208,8,
+36,192,8,
41,14,3,
1,
-50,219,3,0,59,
+50,218,3,0,59,
1,
-50,220,3,0,56,
+50,219,3,0,56,
19,
41,176,0,119,204,43,50,
41,176,0,
41,176,0,
1,
-50,219,3,0,59,
-50,220,3,0,
+50,218,3,0,59,
+50,219,3,0,
41,176,0,1,0,
-22,224,3,
+22,223,3,
2,
43,0,0,0,0,1,
24,0,
1,
40,
-50,223,3,0,1,0,75,
+50,222,3,0,1,0,75,
19,
41,176,0,0,0,0,0,
41,14,3,
@@ -4354,93 +4353,104 @@
35,
1,
40,
-50,222,3,0,1,0,58,
-1,
-19,
-41,176,0,0,0,128,63,57,
-40,
-50,223,3,0,1,1,
-41,176,0,
-41,176,0,1,
-2,
-43,1,0,
-47,43,4,
-9,252,8,
-41,176,0,2,1,0,
-0,0,2,
-48,43,4,
-41,176,0,0,
-1,
-40,
-50,222,3,0,1,1,57,
-40,
-50,222,3,0,1,0,
-41,176,0,
-24,0,
-1,
-50,43,4,0,75,
-19,
-41,176,0,0,0,0,0,
-41,14,3,
-2,
-43,0,0,0,0,1,
-35,
-1,
-1,
-1,
-40,
-50,222,3,0,1,1,58,
-40,
-50,223,3,0,1,1,
-41,176,0,56,
-1,
-40,
-50,222,3,0,1,0,58,
-1,
-19,
-41,176,0,0,0,128,63,57,
-40,
-50,223,3,0,1,1,
-41,176,0,
-41,176,0,
-41,176,0,56,
-1,
-40,
-50,223,3,0,1,0,58,
+50,221,3,0,1,0,58,
1,
19,
41,176,0,0,0,128,63,57,
40,
50,222,3,0,1,1,
41,176,0,
+41,176,0,1,
+2,
+43,1,0,
+47,42,4,
+9,236,8,
+41,176,0,2,1,0,
+0,0,2,
+48,42,4,
+41,176,0,0,
+1,
+40,
+50,221,3,0,1,1,57,
+40,
+50,221,3,0,1,0,
+41,176,0,
+24,0,
+1,
+50,42,4,0,75,
+19,
+41,176,0,0,0,0,0,
+41,14,3,
+2,
+43,0,0,0,0,1,
+35,
+1,
+1,
+1,
+40,
+50,221,3,0,1,1,58,
+40,
+50,222,3,0,1,1,
+41,176,0,56,
+1,
+40,
+50,221,3,0,1,0,58,
+1,
+19,
+41,176,0,0,0,128,63,57,
+40,
+50,222,3,0,1,1,
+41,176,0,
+41,176,0,
+41,176,0,56,
+1,
+40,
+50,222,3,0,1,0,58,
+1,
+19,
+41,176,0,0,0,128,63,57,
+40,
+50,221,3,0,1,1,
+41,176,0,
41,176,0,
41,176,0,1,
2,
43,0,0,0,0,2,
16,
1,
-50,43,4,1,74,
+50,42,4,1,74,
21,
41,176,0,200,0,2,
40,
-50,223,3,0,1,1,
+50,222,3,0,1,1,
21,
-41,176,0,221,3,2,
+41,176,0,220,3,2,
1,
40,
-50,223,3,0,1,0,58,
+50,222,3,0,1,0,58,
40,
-50,222,3,0,1,1,
+50,221,3,0,1,1,
41,176,0,
-50,43,4,0,
+50,42,4,0,
41,176,0,
35,
1,
1,
1,
-50,43,4,0,58,
+50,42,4,0,58,
+40,
+50,221,3,0,1,1,
+41,176,0,56,
+1,
+40,
+50,221,3,0,1,0,58,
+1,
+19,
+41,176,0,0,0,128,63,57,
40,
50,222,3,0,1,1,
+41,176,0,
+41,176,0,
41,176,0,56,
1,
40,
@@ -4449,68 +4459,57 @@
19,
41,176,0,0,0,128,63,57,
40,
-50,223,3,0,1,1,
+50,221,3,0,1,1,
41,176,0,
41,176,0,
-41,176,0,56,
-1,
-40,
-50,223,3,0,1,0,58,
-1,
-19,
-41,176,0,0,0,128,63,57,
-40,
-50,222,3,0,1,1,
-41,176,0,
-41,176,0,
-41,176,0,1,1,1,1,221,3,
-22,227,3,
+41,176,0,1,1,1,1,220,3,
+22,226,3,
2,
43,0,0,0,0,1,
35,
6,
41,15,2,4,
21,
-41,176,0,224,3,2,
+41,176,0,223,3,2,
+40,
+50,224,3,0,2,0,3,
40,
50,225,3,0,2,0,3,
-40,
-50,226,3,0,2,0,3,
21,
-41,176,0,224,3,2,
+41,176,0,223,3,2,
+40,
+50,224,3,0,2,1,3,
40,
50,225,3,0,2,1,3,
-40,
-50,226,3,0,2,1,3,
21,
-41,176,0,224,3,2,
+41,176,0,223,3,2,
+40,
+50,224,3,0,2,2,3,
40,
50,225,3,0,2,2,3,
-40,
-50,226,3,0,2,2,3,
1,
40,
-50,225,3,0,1,3,56,
+50,224,3,0,1,3,56,
1,
1,
19,
41,176,0,0,0,128,63,57,
40,
-50,225,3,0,1,3,
+50,224,3,0,1,3,
41,176,0,58,
40,
-50,226,3,0,1,3,
+50,225,3,0,1,3,
41,176,0,
-41,176,0,1,1,224,3,
-22,230,3,
+41,176,0,1,1,223,3,
+22,229,3,
2,
43,0,0,0,0,1,
24,0,
1,
40,
-50,229,3,0,1,1,75,
+50,228,3,0,1,1,75,
40,
-50,229,3,0,1,0,
+50,228,3,0,1,0,
41,14,3,
2,
43,0,0,0,0,1,
@@ -4519,9 +4518,20 @@
1,
1,
40,
-50,228,3,0,1,1,58,
+50,227,3,0,1,1,58,
40,
-50,229,3,0,1,1,
+50,228,3,0,1,1,
+41,176,0,56,
+1,
+40,
+50,227,3,0,1,0,58,
+1,
+19,
+41,176,0,0,0,128,63,57,
+40,
+50,228,3,0,1,1,
+41,176,0,
+41,176,0,
41,176,0,56,
1,
40,
@@ -4530,25 +4540,14 @@
19,
41,176,0,0,0,128,63,57,
40,
-50,229,3,0,1,1,
-41,176,0,
-41,176,0,
-41,176,0,56,
-1,
-40,
-50,229,3,0,1,0,58,
-1,
-19,
-41,176,0,0,0,128,63,57,
-40,
-50,228,3,0,1,1,
+50,227,3,0,1,1,
41,176,0,
41,176,0,
41,176,0,1,
24,0,
1,
40,
-50,228,3,0,1,0,75,
+50,227,3,0,1,0,75,
19,
41,176,0,0,0,0,0,
41,14,3,
@@ -4557,21 +4556,21 @@
35,
1,
40,
-50,229,3,0,1,0,58,
+50,228,3,0,1,0,58,
1,
19,
41,176,0,0,0,128,63,57,
40,
-50,228,3,0,1,1,
+50,227,3,0,1,1,
41,176,0,
41,176,0,1,
2,
43,1,0,
-47,44,4,
-9,252,8,
+47,43,4,
+9,236,8,
41,176,0,2,1,0,
0,0,2,
-48,44,4,
+48,43,4,
41,176,0,0,
21,
41,176,0,224,0,2,
@@ -4579,29 +4578,40 @@
41,176,0,0,0,0,0,
1,
40,
-50,229,3,0,1,1,57,
+50,228,3,0,1,1,57,
21,
-41,176,0,221,3,2,
+41,176,0,220,3,2,
1,
1,
40,
-50,229,3,0,1,1,57,
-40,
-50,229,3,0,1,0,
-41,176,0,58,
-40,
-50,228,3,0,1,1,
-41,176,0,
+50,228,3,0,1,1,57,
40,
50,228,3,0,1,0,
+41,176,0,58,
+40,
+50,227,3,0,1,1,
+41,176,0,
+40,
+50,227,3,0,1,0,
41,176,0,
35,
1,
1,
1,
-50,44,4,0,58,
+50,43,4,0,58,
+40,
+50,227,3,0,1,1,
+41,176,0,56,
+1,
+40,
+50,227,3,0,1,0,58,
+1,
+19,
+41,176,0,0,0,128,63,57,
40,
50,228,3,0,1,1,
+41,176,0,
+41,176,0,
41,176,0,56,
1,
40,
@@ -4610,68 +4620,57 @@
19,
41,176,0,0,0,128,63,57,
40,
-50,229,3,0,1,1,
+50,227,3,0,1,1,
41,176,0,
41,176,0,
-41,176,0,56,
-1,
-40,
-50,229,3,0,1,0,58,
-1,
-19,
-41,176,0,0,0,128,63,57,
-40,
-50,228,3,0,1,1,
-41,176,0,
-41,176,0,
-41,176,0,1,1,1,221,3,
-22,233,3,
+41,176,0,1,1,1,220,3,
+22,232,3,
2,
43,0,0,0,0,1,
35,
6,
41,15,2,4,
21,
-41,176,0,230,3,2,
+41,176,0,229,3,2,
+40,
+50,230,3,0,2,0,3,
40,
50,231,3,0,2,0,3,
-40,
-50,232,3,0,2,0,3,
21,
-41,176,0,230,3,2,
+41,176,0,229,3,2,
+40,
+50,230,3,0,2,1,3,
40,
50,231,3,0,2,1,3,
-40,
-50,232,3,0,2,1,3,
21,
-41,176,0,230,3,2,
+41,176,0,229,3,2,
+40,
+50,230,3,0,2,2,3,
40,
50,231,3,0,2,2,3,
-40,
-50,232,3,0,2,2,3,
1,
40,
-50,231,3,0,1,3,56,
+50,230,3,0,1,3,56,
1,
1,
19,
41,176,0,0,0,128,63,57,
40,
-50,231,3,0,1,3,
+50,230,3,0,1,3,
41,176,0,58,
40,
-50,232,3,0,1,3,
+50,231,3,0,1,3,
41,176,0,
-41,176,0,1,1,230,3,
-22,236,3,
+41,176,0,1,1,229,3,
+22,235,3,
2,
43,0,0,0,0,1,
35,
21,
-41,15,2,212,3,2,
-50,235,3,0,
-50,234,3,0,1,1,212,3,
-22,239,3,
+41,15,2,211,3,2,
+50,234,3,0,
+50,233,3,0,1,1,211,3,
+22,238,3,
2,
43,0,0,0,0,1,
24,0,
@@ -4680,10 +4679,10 @@
19,
41,176,0,0,0,0,64,58,
40,
-50,237,3,0,1,0,
+50,236,3,0,1,0,
41,176,0,80,
40,
-50,237,3,0,1,1,
+50,236,3,0,1,1,
41,14,3,
2,
43,0,0,0,0,1,
@@ -4691,51 +4690,51 @@
1,
1,
21,
-41,176,0,221,3,2,
+41,176,0,220,3,2,
1,
1,
40,
-50,238,3,0,1,0,58,
+50,237,3,0,1,0,58,
40,
-50,238,3,0,1,0,
+50,237,3,0,1,0,
41,176,0,58,
1,
40,
-50,237,3,0,1,1,57,
+50,236,3,0,1,1,57,
1,
19,
41,176,0,0,0,0,64,58,
40,
-50,237,3,0,1,0,
+50,236,3,0,1,0,
41,176,0,
41,176,0,
41,176,0,
40,
-50,238,3,0,1,1,56,
+50,237,3,0,1,1,56,
1,
1,
19,
41,176,0,0,0,128,63,57,
40,
-50,238,3,0,1,1,
+50,237,3,0,1,1,
41,176,0,58,
40,
-50,237,3,0,1,0,
+50,236,3,0,1,0,
41,176,0,
41,176,0,56,
1,
40,
-50,238,3,0,1,0,58,
+50,237,3,0,1,0,58,
1,
1,
34,57,
40,
-50,237,3,0,1,1,56,
+50,236,3,0,1,1,56,
1,
19,
41,176,0,0,0,0,64,58,
40,
-50,237,3,0,1,0,
+50,236,3,0,1,0,
41,176,0,
41,176,0,56,
19,
@@ -4749,86 +4748,86 @@
19,
41,176,0,0,0,128,64,58,
40,
-50,238,3,0,1,0,
+50,237,3,0,1,0,
41,176,0,80,
40,
-50,238,3,0,1,1,
+50,237,3,0,1,1,
41,14,3,
2,
43,4,0,
+47,44,4,
+9,242,8,
+41,176,0,2,
47,45,4,
-9,2,9,
+9,247,8,
41,176,0,2,
47,46,4,
-9,7,9,
+9,252,8,
41,176,0,2,
47,47,4,
-9,12,9,
-41,176,0,2,
-47,48,4,
-9,18,9,
+9,2,9,
41,176,0,2,4,0,
1,0,
0,0,
3,0,
2,0,5,
-48,45,4,
+48,44,4,
41,176,0,0,
1,
40,
-50,238,3,0,1,0,58,
+50,237,3,0,1,0,58,
40,
-50,238,3,0,1,0,
+50,237,3,0,1,0,
+41,176,0,
+48,45,4,
+41,176,0,0,
+1,
+50,44,4,0,58,
+40,
+50,237,3,0,1,0,
41,176,0,
48,46,4,
41,176,0,0,
1,
-50,45,4,0,58,
40,
-50,238,3,0,1,0,
+50,237,3,0,1,1,58,
+40,
+50,237,3,0,1,1,
41,176,0,
48,47,4,
41,176,0,0,
1,
+50,46,4,0,58,
40,
-50,238,3,0,1,1,58,
-40,
-50,238,3,0,1,1,
-41,176,0,
-48,48,4,
-41,176,0,0,
-1,
-50,47,4,0,58,
-40,
-50,238,3,0,1,1,
+50,237,3,0,1,1,
41,176,0,
35,
21,
-41,176,0,221,3,2,
+41,176,0,220,3,2,
1,
1,
1,
1,
-50,47,4,0,58,
+50,46,4,0,58,
1,
40,
-50,237,3,0,1,0,57,
+50,236,3,0,1,0,57,
1,
40,
-50,238,3,0,1,0,58,
+50,237,3,0,1,0,58,
1,
1,
1,
19,
41,176,0,0,0,64,64,58,
40,
-50,237,3,0,1,1,
+50,236,3,0,1,1,
41,176,0,57,
1,
19,
41,176,0,0,0,192,64,58,
40,
-50,237,3,0,1,0,
+50,236,3,0,1,0,
41,176,0,
41,176,0,57,
19,
@@ -4843,18 +4842,18 @@
19,
41,176,0,0,0,64,65,58,
40,
-50,238,3,0,1,1,
+50,237,3,0,1,1,
41,176,0,58,
-50,45,4,0,
+50,44,4,0,
41,176,0,58,
1,
40,
-50,237,3,0,1,1,57,
+50,236,3,0,1,1,57,
1,
19,
41,176,0,0,0,0,64,58,
40,
-50,237,3,0,1,0,
+50,236,3,0,1,0,
41,176,0,
41,176,0,
41,176,0,
@@ -4863,27 +4862,27 @@
1,
19,
41,176,0,0,0,128,65,58,
-50,46,4,0,
+50,45,4,0,
41,176,0,58,
1,
40,
-50,237,3,0,1,1,57,
+50,236,3,0,1,1,57,
1,
19,
41,176,0,0,0,0,64,58,
40,
-50,237,3,0,1,0,
+50,236,3,0,1,0,
41,176,0,
41,176,0,
41,176,0,
41,176,0,57,
1,
-50,48,4,0,58,
+50,47,4,0,58,
40,
-50,237,3,0,1,0,
+50,236,3,0,1,0,
41,176,0,
41,176,0,
-50,47,4,0,1,
+50,46,4,0,1,
2,
43,0,0,0,0,1,
35,
@@ -4892,16 +4891,16 @@
1,
1,
40,
-50,238,3,0,1,0,58,
+50,237,3,0,1,0,58,
1,
1,
40,
-50,237,3,0,1,1,57,
+50,236,3,0,1,1,57,
1,
19,
41,176,0,0,0,0,64,58,
40,
-50,237,3,0,1,0,
+50,236,3,0,1,0,
41,176,0,
41,176,0,56,
19,
@@ -4909,83 +4908,83 @@
41,176,0,
41,176,0,56,
40,
-50,237,3,0,1,0,
+50,236,3,0,1,0,
41,176,0,57,
1,
21,
41,176,0,113,0,1,
1,
40,
-50,238,3,0,1,1,58,
+50,237,3,0,1,1,58,
40,
-50,238,3,0,1,0,
+50,237,3,0,1,0,
41,176,0,58,
1,
40,
-50,237,3,0,1,1,57,
+50,236,3,0,1,1,57,
1,
19,
41,176,0,0,0,0,64,58,
40,
-50,237,3,0,1,0,
+50,236,3,0,1,0,
41,176,0,
41,176,0,
41,176,0,
41,176,0,57,
1,
40,
-50,238,3,0,1,1,58,
+50,237,3,0,1,1,58,
40,
-50,237,3,0,1,0,
+50,236,3,0,1,0,
41,176,0,
-41,176,0,1,1,1,221,3,
-22,242,3,
+41,176,0,1,1,1,220,3,
+22,241,3,
2,
43,0,0,0,0,1,
35,
45,
1,
40,
-50,241,3,0,1,3,75,
+50,240,3,0,1,3,75,
19,
41,176,0,0,0,0,0,
41,14,3,
-50,240,3,0,
+50,239,3,0,
6,
41,15,2,4,
21,
-41,176,0,239,3,2,
+41,176,0,238,3,2,
+40,
+50,239,3,0,2,0,3,
40,
50,240,3,0,2,0,3,
-40,
-50,241,3,0,2,0,3,
21,
-41,176,0,239,3,2,
+41,176,0,238,3,2,
+40,
+50,239,3,0,2,1,3,
40,
50,240,3,0,2,1,3,
-40,
-50,241,3,0,2,1,3,
21,
-41,176,0,239,3,2,
+41,176,0,238,3,2,
+40,
+50,239,3,0,2,2,3,
40,
50,240,3,0,2,2,3,
-40,
-50,241,3,0,2,2,3,
1,
40,
-50,240,3,0,1,3,56,
+50,239,3,0,1,3,56,
1,
1,
19,
41,176,0,0,0,128,63,57,
40,
-50,240,3,0,1,3,
+50,239,3,0,1,3,
41,176,0,58,
40,
-50,241,3,0,1,3,
+50,240,3,0,1,3,
41,176,0,
-41,176,0,1,1,239,3,
-22,245,3,
+41,176,0,1,1,238,3,
+22,244,3,
2,
43,0,0,0,0,1,
35,
@@ -4994,9 +4993,9 @@
1,
1,
40,
-50,243,3,0,3,0,1,2,56,
+50,242,3,0,3,0,1,2,56,
40,
-50,244,3,0,3,0,1,2,
+50,243,3,0,3,0,1,2,
41,172,1,57,
1,
19,
@@ -5005,33 +5004,33 @@
41,172,1,200,0,2,
1,
40,
-50,243,3,0,3,0,1,2,58,
-40,
-50,244,3,0,1,3,
-41,172,1,
-1,
-40,
-50,244,3,0,3,0,1,2,58,
+50,242,3,0,3,0,1,2,58,
40,
50,243,3,0,1,3,
41,172,1,
+1,
+40,
+50,243,3,0,3,0,1,2,58,
+40,
+50,242,3,0,1,3,
+41,172,1,
41,172,1,
41,172,1,
1,
40,
-50,243,3,0,1,3,56,
+50,242,3,0,1,3,56,
1,
1,
19,
41,176,0,0,0,128,63,57,
40,
-50,243,3,0,1,3,
+50,242,3,0,1,3,
41,176,0,58,
40,
-50,244,3,0,1,3,
+50,243,3,0,1,3,
41,176,0,
41,176,0,1,0,
-22,248,3,
+22,247,3,
2,
43,0,0,0,0,1,
35,
@@ -5040,36 +5039,36 @@
1,
1,
40,
-50,247,3,0,3,0,1,2,56,
+50,246,3,0,3,0,1,2,56,
40,
-50,246,3,0,3,0,1,2,
+50,245,3,0,3,0,1,2,
41,172,1,57,
1,
1,
19,
41,176,0,0,0,0,64,58,
40,
-50,247,3,0,3,0,1,2,
+50,246,3,0,3,0,1,2,
41,172,1,58,
40,
-50,246,3,0,3,0,1,2,
+50,245,3,0,3,0,1,2,
41,172,1,
41,172,1,
1,
40,
-50,246,3,0,1,3,56,
+50,245,3,0,1,3,56,
1,
1,
19,
41,176,0,0,0,128,63,57,
40,
-50,246,3,0,1,3,
+50,245,3,0,1,3,
41,176,0,58,
40,
-50,247,3,0,1,3,
+50,246,3,0,1,3,
41,176,0,
41,176,0,1,0,
-22,251,3,
+22,250,3,
2,
43,0,0,0,0,1,
35,
@@ -5082,33 +5081,12 @@
19,
41,176,0,0,0,128,63,57,
40,
-50,249,3,0,1,3,
-41,176,0,58,
-40,
-50,250,3,0,3,0,1,2,
-41,172,1,56,
-1,
-1,
-19,
-41,176,0,0,0,128,63,57,
-40,
-50,250,3,0,1,3,
+50,248,3,0,1,3,
41,176,0,58,
40,
50,249,3,0,3,0,1,2,
-41,172,1,
41,172,1,56,
1,
-40,
-50,249,3,0,3,0,1,2,58,
-40,
-50,250,3,0,3,0,1,2,
-41,172,1,
-41,172,1,
-1,
-40,
-50,249,3,0,1,3,56,
-1,
1,
19,
41,176,0,0,0,128,63,57,
@@ -5116,10 +5094,31 @@
50,249,3,0,1,3,
41,176,0,58,
40,
-50,250,3,0,1,3,
+50,248,3,0,3,0,1,2,
+41,172,1,
+41,172,1,56,
+1,
+40,
+50,248,3,0,3,0,1,2,58,
+40,
+50,249,3,0,3,0,1,2,
+41,172,1,
+41,172,1,
+1,
+40,
+50,248,3,0,1,3,56,
+1,
+1,
+19,
+41,176,0,0,0,128,63,57,
+40,
+50,248,3,0,1,3,
+41,176,0,58,
+40,
+50,249,3,0,1,3,
41,176,0,
41,176,0,1,0,
-22,253,3,
+22,252,3,
2,
43,0,0,0,0,1,
35,
@@ -5133,96 +5132,96 @@
41,176,0,61,10,23,63,
19,
41,176,0,174,71,225,61,
-50,252,3,0,1,0,
-22,1,4,
+50,251,3,0,1,0,
+22,0,4,
2,
43,4,0,
+47,48,4,
+9,8,9,
+41,176,0,2,
47,49,4,
-9,24,9,
-41,176,0,2,
-47,50,4,
-9,201,8,
+9,185,8,
41,172,1,2,
-47,51,4,
-9,28,9,
+47,50,4,
+9,12,9,
41,176,0,2,
-47,52,4,
-9,36,9,
+47,51,4,
+9,20,9,
41,176,0,2,4,0,
0,0,
3,0,
2,0,
1,0,6,
-48,49,4,
+48,48,4,
41,176,0,0,
21,
-41,176,0,253,3,1,
-50,0,4,0,
-48,50,4,
+41,176,0,252,3,1,
+50,255,3,0,
+48,49,4,
41,172,1,0,
1,
1,
-50,49,4,0,57,
+50,48,4,0,57,
21,
-41,176,0,253,3,1,
-50,254,3,0,
+41,176,0,252,3,1,
+50,253,3,0,
41,176,0,56,
-50,254,3,0,
+50,253,3,0,
41,172,1,
+48,50,4,
+41,176,0,0,
+21,
+41,176,0,200,0,2,
+21,
+41,176,0,200,0,2,
+40,
+50,49,4,0,1,0,
+40,
+50,49,4,0,1,1,
+40,
+50,49,4,0,1,2,
48,51,4,
41,176,0,0,
21,
-41,176,0,200,0,2,
-21,
-41,176,0,200,0,2,
-40,
-50,50,4,0,1,0,
-40,
-50,50,4,0,1,1,
-40,
-50,50,4,0,1,2,
-48,52,4,
-41,176,0,0,
-21,
41,176,0,224,0,2,
21,
41,176,0,224,0,2,
40,
-50,50,4,0,1,0,
+50,49,4,0,1,0,
40,
-50,50,4,0,1,1,
+50,49,4,0,1,1,
40,
-50,50,4,0,1,2,
+50,49,4,0,1,2,
24,0,
1,
1,
-50,51,4,0,78,
+50,50,4,0,78,
19,
41,176,0,0,0,0,0,
41,14,3,69,
1,
-50,49,4,0,76,
-50,51,4,0,
+50,48,4,0,76,
+50,50,4,0,
41,14,3,
41,14,3,
2,
43,0,0,0,0,1,
16,
1,
-50,50,4,1,74,
+50,49,4,1,74,
1,
-50,49,4,0,56,
+50,48,4,0,56,
1,
1,
1,
-50,50,4,0,57,
-50,49,4,0,
-41,172,1,58,
-50,49,4,0,
-41,172,1,59,
-1,
50,49,4,0,57,
-50,51,4,0,
+50,48,4,0,
+41,172,1,58,
+50,48,4,0,
+41,172,1,59,
+1,
+50,48,4,0,57,
+50,50,4,0,
41,176,0,
41,172,1,
41,172,1,
@@ -5232,35 +5231,35 @@
45,
1,
1,
-50,52,4,0,77,
-50,255,3,0,
+50,51,4,0,77,
+50,254,3,0,
41,14,3,69,
1,
-50,52,4,0,76,
-50,49,4,0,
+50,51,4,0,76,
+50,48,4,0,
41,14,3,
41,14,3,
1,
-50,49,4,0,56,
+50,48,4,0,56,
1,
1,
1,
-50,50,4,0,57,
-50,49,4,0,
+50,49,4,0,57,
+50,48,4,0,
41,172,1,58,
1,
-50,255,3,0,57,
-50,49,4,0,
+50,254,3,0,57,
+50,48,4,0,
41,176,0,
41,172,1,59,
1,
-50,52,4,0,57,
-50,49,4,0,
+50,51,4,0,57,
+50,48,4,0,
41,176,0,
41,172,1,
41,172,1,
-50,50,4,0,1,1,253,3,
-22,3,4,
+50,49,4,0,1,1,252,3,
+22,2,4,
2,
43,0,0,0,0,1,
35,
@@ -5270,32 +5269,32 @@
21,
41,176,0,224,0,2,
40,
-50,2,4,0,1,0,
+50,1,4,0,1,0,
40,
-50,2,4,0,1,1,
+50,1,4,0,1,1,
40,
-50,2,4,0,1,2,57,
+50,1,4,0,1,2,57,
21,
41,176,0,200,0,2,
21,
41,176,0,200,0,2,
40,
-50,2,4,0,1,0,
+50,1,4,0,1,0,
40,
-50,2,4,0,1,1,
+50,1,4,0,1,1,
40,
-50,2,4,0,1,2,
+50,1,4,0,1,2,
41,176,0,1,0,
-22,6,4,
+22,5,4,
2,
43,0,0,0,0,1,
35,
45,
1,
40,
-50,4,4,0,1,0,78,
+50,3,4,0,1,0,78,
40,
-50,4,4,0,1,2,
+50,3,4,0,1,2,
41,14,3,
6,
41,172,1,3,
@@ -5303,166 +5302,166 @@
41,176,0,0,0,0,0,
1,
1,
-50,5,4,0,58,
+50,4,4,0,58,
1,
40,
-50,4,4,0,1,1,57,
+50,3,4,0,1,1,57,
40,
-50,4,4,0,1,0,
+50,3,4,0,1,0,
41,176,0,
41,176,0,59,
1,
40,
-50,4,4,0,1,2,57,
+50,3,4,0,1,2,57,
40,
-50,4,4,0,1,0,
+50,3,4,0,1,0,
41,176,0,
41,176,0,
-50,5,4,0,
+50,4,4,0,
6,
41,172,1,1,
19,
41,176,0,0,0,0,0,1,0,
-22,9,4,
+22,8,4,
2,
43,1,0,
-47,53,4,
-9,235,7,
+47,52,4,
+9,219,7,
41,176,0,2,1,0,
0,0,2,
-48,53,4,
+48,52,4,
41,176,0,0,
21,
-41,176,0,3,4,1,
-50,8,4,0,
+41,176,0,2,4,1,
+50,7,4,0,
24,0,
1,
40,
-50,7,4,0,1,0,80,
+50,6,4,0,1,0,80,
40,
-50,7,4,0,1,1,
+50,6,4,0,1,1,
41,14,3,
2,
43,0,0,0,0,1,
24,0,
1,
40,
-50,7,4,0,1,1,80,
+50,6,4,0,1,1,80,
40,
-50,7,4,0,1,2,
+50,6,4,0,1,2,
41,14,3,
2,
43,0,0,0,0,1,
35,
21,
-41,172,1,6,4,2,
+41,172,1,5,4,2,
40,
-50,7,4,0,3,0,1,2,
-50,53,4,0,1,
+50,6,4,0,3,0,1,2,
+50,52,4,0,1,
24,0,
1,
40,
-50,7,4,0,1,0,80,
+50,6,4,0,1,0,80,
40,
-50,7,4,0,1,2,
+50,6,4,0,1,2,
41,14,3,
2,
43,0,0,0,0,1,
35,
40,
21,
-41,172,1,6,4,2,
+41,172,1,5,4,2,
40,
-50,7,4,0,3,0,2,1,
-50,53,4,0,3,0,2,1,1,
+50,6,4,0,3,0,2,1,
+50,52,4,0,3,0,2,1,1,
2,
43,0,0,0,0,1,
35,
40,
21,
-41,172,1,6,4,2,
+41,172,1,5,4,2,
40,
-50,7,4,0,3,2,0,1,
-50,53,4,0,3,1,2,0,1,1,
+50,6,4,0,3,2,0,1,
+50,52,4,0,3,1,2,0,1,1,
24,0,
1,
40,
-50,7,4,0,1,0,80,
+50,6,4,0,1,0,80,
40,
-50,7,4,0,1,2,
+50,6,4,0,1,2,
41,14,3,
2,
43,0,0,0,0,1,
35,
40,
21,
-41,172,1,6,4,2,
+41,172,1,5,4,2,
40,
-50,7,4,0,3,1,0,2,
-50,53,4,0,3,1,0,2,1,
+50,6,4,0,3,1,0,2,
+50,52,4,0,3,1,0,2,1,
24,0,
1,
40,
-50,7,4,0,1,1,80,
+50,6,4,0,1,1,80,
40,
-50,7,4,0,1,2,
+50,6,4,0,1,2,
41,14,3,
2,
43,0,0,0,0,1,
35,
40,
21,
-41,172,1,6,4,2,
+41,172,1,5,4,2,
40,
-50,7,4,0,3,1,2,0,
-50,53,4,0,3,2,0,1,1,
+50,6,4,0,3,1,2,0,
+50,52,4,0,3,2,0,1,1,
2,
43,0,0,0,0,1,
35,
40,
21,
-41,172,1,6,4,2,
+41,172,1,5,4,2,
40,
-50,7,4,0,3,2,1,0,
-50,53,4,0,3,2,1,0,1,1,2,3,4,6,4,
-22,12,4,
+50,6,4,0,3,2,1,0,
+50,52,4,0,3,2,1,0,1,1,2,2,4,5,4,
+22,11,4,
2,
43,3,0,
-47,54,4,
-9,159,7,
+47,53,4,
+9,143,7,
41,176,0,2,
-47,55,4,
-9,44,9,
+47,54,4,
+9,28,9,
41,172,1,2,
-47,56,4,
-9,48,9,
+47,55,4,
+9,32,9,
41,172,1,2,3,0,
0,0,
2,0,
1,0,4,
-48,54,4,
+48,53,4,
41,176,0,0,
1,
40,
-50,11,4,0,1,3,58,
+50,10,4,0,1,3,58,
+40,
+50,9,4,0,1,3,
+41,176,0,
+48,54,4,
+41,172,1,0,
+1,
+40,
+50,9,4,0,3,0,1,2,58,
40,
50,10,4,0,1,3,
-41,176,0,
+41,172,1,
48,55,4,
41,172,1,0,
1,
40,
50,10,4,0,3,0,1,2,58,
40,
-50,11,4,0,1,3,
-41,172,1,
-48,56,4,
-41,172,1,0,
-1,
-40,
-50,11,4,0,3,0,1,2,58,
-40,
-50,10,4,0,1,3,
+50,9,4,0,1,3,
41,172,1,
35,
6,
@@ -5472,70 +5471,70 @@
1,
1,
21,
-41,172,1,1,4,3,
+41,172,1,0,4,3,
21,
-41,172,1,9,4,2,
-50,55,4,0,
-50,56,4,0,
+41,172,1,8,4,2,
50,54,4,0,
-50,56,4,0,56,
-40,
-50,11,4,0,3,0,1,2,
-41,172,1,57,
-50,56,4,0,
-41,172,1,56,
+50,55,4,0,
+50,53,4,0,
+50,55,4,0,56,
40,
50,10,4,0,3,0,1,2,
41,172,1,57,
50,55,4,0,
+41,172,1,56,
+40,
+50,9,4,0,3,0,1,2,
+41,172,1,57,
+50,54,4,0,
41,172,1,
1,
1,
40,
-50,10,4,0,1,3,56,
+50,9,4,0,1,3,56,
40,
-50,11,4,0,1,3,
+50,10,4,0,1,3,
41,176,0,57,
-50,54,4,0,
-41,176,0,1,2,1,4,9,4,
-22,15,4,
+50,53,4,0,
+41,176,0,1,2,0,4,8,4,
+22,14,4,
2,
43,3,0,
-47,57,4,
-9,159,7,
+47,56,4,
+9,143,7,
41,176,0,2,
-47,58,4,
-9,44,9,
+47,57,4,
+9,28,9,
41,172,1,2,
-47,59,4,
-9,48,9,
+47,58,4,
+9,32,9,
41,172,1,2,3,0,
0,0,
2,0,
1,0,4,
-48,57,4,
+48,56,4,
41,176,0,0,
1,
40,
-50,14,4,0,1,3,58,
+50,13,4,0,1,3,58,
+40,
+50,12,4,0,1,3,
+41,176,0,
+48,57,4,
+41,172,1,0,
+1,
+40,
+50,12,4,0,3,0,1,2,58,
40,
50,13,4,0,1,3,
-41,176,0,
+41,172,1,
48,58,4,
41,172,1,0,
1,
40,
50,13,4,0,3,0,1,2,58,
40,
-50,14,4,0,1,3,
-41,172,1,
-48,59,4,
-41,172,1,0,
-1,
-40,
-50,14,4,0,3,0,1,2,58,
-40,
-50,13,4,0,1,3,
+50,12,4,0,1,3,
41,172,1,
35,
6,
@@ -5545,70 +5544,70 @@
1,
1,
21,
-41,172,1,1,4,3,
+41,172,1,0,4,3,
21,
-41,172,1,9,4,2,
-50,59,4,0,
+41,172,1,8,4,2,
50,58,4,0,
50,57,4,0,
-50,59,4,0,56,
-40,
-50,14,4,0,3,0,1,2,
-41,172,1,57,
-50,59,4,0,
-41,172,1,56,
+50,56,4,0,
+50,58,4,0,56,
40,
50,13,4,0,3,0,1,2,
41,172,1,57,
50,58,4,0,
+41,172,1,56,
+40,
+50,12,4,0,3,0,1,2,
+41,172,1,57,
+50,57,4,0,
41,172,1,
1,
1,
40,
-50,13,4,0,1,3,56,
+50,12,4,0,1,3,56,
40,
-50,14,4,0,1,3,
+50,13,4,0,1,3,
41,176,0,57,
-50,57,4,0,
-41,176,0,1,2,1,4,9,4,
-22,18,4,
+50,56,4,0,
+41,176,0,1,2,0,4,8,4,
+22,17,4,
2,
43,3,0,
-47,60,4,
-9,159,7,
+47,59,4,
+9,143,7,
41,176,0,2,
-47,61,4,
-9,44,9,
+47,60,4,
+9,28,9,
41,172,1,2,
-47,62,4,
-9,48,9,
+47,61,4,
+9,32,9,
41,172,1,2,3,0,
0,0,
2,0,
1,0,4,
-48,60,4,
+48,59,4,
41,176,0,0,
1,
40,
-50,17,4,0,1,3,58,
+50,16,4,0,1,3,58,
+40,
+50,15,4,0,1,3,
+41,176,0,
+48,60,4,
+41,172,1,0,
+1,
+40,
+50,15,4,0,3,0,1,2,58,
40,
50,16,4,0,1,3,
-41,176,0,
+41,172,1,
48,61,4,
41,172,1,0,
1,
40,
50,16,4,0,3,0,1,2,58,
40,
-50,17,4,0,1,3,
-41,172,1,
-48,62,4,
-41,172,1,0,
-1,
-40,
-50,17,4,0,3,0,1,2,58,
-40,
-50,16,4,0,1,3,
+50,15,4,0,1,3,
41,172,1,
35,
6,
@@ -5618,67 +5617,67 @@
1,
1,
21,
-41,172,1,1,4,3,
-50,61,4,0,
+41,172,1,0,4,3,
50,60,4,0,
-50,62,4,0,56,
-40,
-50,17,4,0,3,0,1,2,
-41,172,1,57,
-50,62,4,0,
-41,172,1,56,
+50,59,4,0,
+50,61,4,0,56,
40,
50,16,4,0,3,0,1,2,
41,172,1,57,
50,61,4,0,
+41,172,1,56,
+40,
+50,15,4,0,3,0,1,2,
+41,172,1,57,
+50,60,4,0,
41,172,1,
1,
1,
40,
-50,16,4,0,1,3,56,
+50,15,4,0,1,3,56,
40,
-50,17,4,0,1,3,
+50,16,4,0,1,3,
41,176,0,57,
-50,60,4,0,
-41,176,0,1,1,1,4,
-22,21,4,
+50,59,4,0,
+41,176,0,1,1,0,4,
+22,20,4,
2,
43,3,0,
-47,63,4,
-9,159,7,
+47,62,4,
+9,143,7,
41,176,0,2,
-47,64,4,
-9,44,9,
+47,63,4,
+9,28,9,
41,172,1,2,
-47,65,4,
-9,48,9,
+47,64,4,
+9,32,9,
41,172,1,2,3,0,
0,0,
2,0,
1,0,4,
-48,63,4,
+48,62,4,
41,176,0,0,
1,
40,
-50,20,4,0,1,3,58,
+50,19,4,0,1,3,58,
+40,
+50,18,4,0,1,3,
+41,176,0,
+48,63,4,
+41,172,1,0,
+1,
+40,
+50,18,4,0,3,0,1,2,58,
40,
50,19,4,0,1,3,
-41,176,0,
+41,172,1,
48,64,4,
41,172,1,0,
1,
40,
50,19,4,0,3,0,1,2,58,
40,
-50,20,4,0,1,3,
-41,172,1,
-48,65,4,
-41,172,1,0,
-1,
-40,
-50,20,4,0,3,0,1,2,58,
-40,
-50,19,4,0,1,3,
+50,18,4,0,1,3,
41,172,1,
35,
6,
@@ -5688,146 +5687,146 @@
1,
1,
21,
-41,172,1,1,4,3,
-50,65,4,0,
-50,63,4,0,
-50,64,4,0,56,
-40,
-50,20,4,0,3,0,1,2,
-41,172,1,57,
-50,65,4,0,
-41,172,1,56,
+41,172,1,0,4,3,
+50,64,4,0,
+50,62,4,0,
+50,63,4,0,56,
40,
50,19,4,0,3,0,1,2,
41,172,1,57,
50,64,4,0,
+41,172,1,56,
+40,
+50,18,4,0,3,0,1,2,
+41,172,1,57,
+50,63,4,0,
41,172,1,
1,
1,
40,
-50,19,4,0,1,3,56,
+50,18,4,0,1,3,56,
40,
-50,20,4,0,1,3,
+50,19,4,0,1,3,
41,176,0,57,
-50,63,4,0,
-41,176,0,1,1,1,4,
+50,62,4,0,
+41,176,0,1,1,0,4,
14,2,0,
43,29,0,
+47,65,4,
+30,
+8,1,36,9,
+41,1,0,0,
47,66,4,
30,
-8,1,52,9,
+8,1,43,9,
41,1,0,0,
47,67,4,
30,
-8,1,59,9,
+8,1,48,9,
41,1,0,0,
47,68,4,
30,
-8,1,64,9,
+8,1,53,9,
41,1,0,0,
47,69,4,
30,
-8,1,69,9,
+8,1,62,9,
41,1,0,0,
47,70,4,
30,
-8,1,78,9,
+8,1,71,9,
41,1,0,0,
47,71,4,
30,
-8,1,87,9,
+8,1,78,9,
41,1,0,0,
47,72,4,
30,
-8,1,94,9,
+8,1,85,9,
41,1,0,0,
47,73,4,
30,
-8,1,101,9,
+8,1,93,9,
41,1,0,0,
47,74,4,
30,
-8,1,109,9,
+8,1,101,9,
41,1,0,0,
47,75,4,
30,
-8,1,117,9,
+8,1,110,9,
41,1,0,0,
47,76,4,
30,
-8,1,126,9,
+8,1,119,9,
41,1,0,0,
47,77,4,
30,
-8,1,135,9,
+8,1,124,9,
41,1,0,0,
47,78,4,
30,
-8,1,140,9,
+8,1,130,9,
41,1,0,0,
47,79,4,
30,
-8,1,146,9,
+8,1,140,9,
41,1,0,0,
47,80,4,
30,
-8,1,156,9,
+8,1,148,9,
41,1,0,0,
47,81,4,
30,
-8,1,164,9,
+8,1,157,9,
41,1,0,0,
47,82,4,
30,
-8,1,173,9,
+8,1,165,9,
41,1,0,0,
47,83,4,
30,
-8,1,181,9,
+8,1,174,9,
41,1,0,0,
47,84,4,
30,
-8,1,190,9,
+8,1,186,9,
41,1,0,0,
47,85,4,
30,
-8,1,202,9,
+8,1,197,9,
41,1,0,0,
47,86,4,
30,
-8,1,213,9,
+8,1,208,9,
41,1,0,0,
47,87,4,
30,
-8,1,224,9,
+8,1,219,9,
41,1,0,0,
47,88,4,
30,
-8,1,235,9,
+8,1,231,9,
41,1,0,0,
47,89,4,
30,
-8,1,247,9,
+8,1,242,9,
41,1,0,0,
47,90,4,
30,
-8,1,2,10,
+8,1,252,9,
41,1,0,0,
47,91,4,
30,
-8,1,12,10,
+8,1,1,10,
41,1,0,0,
47,92,4,
30,
-8,1,17,10,
+8,1,13,10,
41,1,0,0,
47,93,4,
30,
-8,1,29,10,
-41,1,0,0,
-47,94,4,
-30,
-8,1,36,10,
+8,1,20,10,
41,1,0,0,29,0,
0,0,
27,0,
@@ -5858,221 +5857,221 @@
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,25,4,
+22,24,4,
2,
43,0,0,0,0,2,
39,0,
43,0,0,0,0,
-50,22,4,0,29,
+50,21,4,0,29,
28,
41,1,0,0,0,0,0,1,
35,
21,
-41,15,2,164,3,2,
+41,15,2,163,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,1,0,0,0,1,
35,
21,
-41,15,2,167,3,2,
+41,15,2,166,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,2,0,0,0,1,
35,
21,
-41,15,2,170,3,2,
+41,15,2,169,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,3,0,0,0,1,
35,
21,
-41,15,2,173,3,2,
+41,15,2,172,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,4,0,0,0,1,
35,
21,
-41,15,2,176,3,2,
+41,15,2,175,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,5,0,0,0,1,
35,
21,
-41,15,2,179,3,2,
+41,15,2,178,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,6,0,0,0,1,
35,
21,
-41,15,2,182,3,2,
+41,15,2,181,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,7,0,0,0,1,
35,
21,
-41,15,2,185,3,2,
+41,15,2,184,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,8,0,0,0,1,
35,
21,
-41,15,2,188,3,2,
+41,15,2,187,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,9,0,0,0,1,
35,
21,
-41,15,2,191,3,2,
+41,15,2,190,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,10,0,0,0,1,
35,
21,
-41,15,2,194,3,2,
+41,15,2,193,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,11,0,0,0,1,
35,
21,
-41,15,2,197,3,2,
+41,15,2,196,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,12,0,0,0,1,
35,
21,
-41,15,2,200,3,2,
+41,15,2,199,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,13,0,0,0,1,
35,
21,
-41,15,2,203,3,2,
+41,15,2,202,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,14,0,0,0,1,
35,
21,
-41,15,2,206,3,2,
+41,15,2,205,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,15,0,0,0,1,
35,
21,
-41,15,2,212,3,2,
+41,15,2,211,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,16,0,0,0,1,
35,
21,
-41,15,2,215,3,2,
+41,15,2,214,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,17,0,0,0,1,
35,
21,
-41,15,2,218,3,2,
+41,15,2,217,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,18,0,0,0,1,
35,
21,
-41,15,2,227,3,2,
+41,15,2,226,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,19,0,0,0,1,
35,
21,
-41,15,2,233,3,2,
+41,15,2,232,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,20,0,0,0,1,
35,
21,
-41,15,2,236,3,2,
+41,15,2,235,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,21,0,0,0,1,
35,
21,
-41,15,2,242,3,2,
+41,15,2,241,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,22,0,0,0,1,
35,
21,
-41,15,2,245,3,2,
+41,15,2,244,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,23,0,0,0,1,
35,
21,
-41,15,2,248,3,2,
+41,15,2,247,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,24,0,0,0,1,
35,
21,
-41,15,2,251,3,2,
+41,15,2,250,3,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,25,0,0,0,1,
35,
21,
-41,15,2,12,4,2,
+41,15,2,11,4,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,26,0,0,0,1,
35,
21,
-41,15,2,15,4,2,
+41,15,2,14,4,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,27,0,0,0,1,
35,
21,
-41,15,2,18,4,2,
+41,15,2,17,4,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
28,
41,1,0,28,0,0,0,1,
35,
21,
-41,15,2,21,4,2,
+41,15,2,20,4,2,
+50,22,4,0,
50,23,4,0,
-50,24,4,0,
35,
6,
41,15,2,1,
19,
-41,176,0,0,0,0,0,1,29,164,3,167,3,170,3,173,3,176,3,179,3,182,3,185,3,188,3,191,3,194,3,197,3,200,3,203,3,206,3,212,3,215,3,218,3,227,3,233,3,236,3,242,3,245,3,248,3,251,3,12,4,15,4,18,4,21,4,
-22,27,4,
+41,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,226,3,232,3,235,3,241,3,244,3,247,3,250,3,11,4,14,4,17,4,20,4,
+22,26,4,
2,
43,0,0,0,0,1,
35,
@@ -6080,17 +6079,17 @@
41,15,2,2,
1,
40,
-50,26,4,0,3,0,1,2,59,
+50,25,4,0,3,0,1,2,59,
21,
41,176,0,224,0,2,
40,
-50,26,4,0,1,3,
+50,25,4,0,1,3,
19,
41,176,0,23,183,209,56,
41,172,1,
40,
-50,26,4,0,1,3,1,0,
-22,29,4,
+50,25,4,0,1,3,1,0,
+22,28,4,
2,
43,0,0,0,0,1,
35,
@@ -6098,78 +6097,78 @@
41,132,1,2,
1,
40,
-50,28,4,0,3,0,1,2,59,
+50,27,4,0,3,0,1,2,59,
21,
41,168,0,216,0,2,
40,
-50,28,4,0,1,3,
+50,27,4,0,1,3,
19,
41,168,0,23,183,209,56,
41,168,1,
40,
-50,28,4,0,1,3,1,0,
-22,31,4,
+50,27,4,0,1,3,1,0,
+22,30,4,
2,
43,0,0,0,0,1,
35,
1,
40,
-50,30,4,0,2,0,1,59,
+50,29,4,0,2,0,1,59,
40,
-50,30,4,0,1,2,
+50,29,4,0,1,2,
41,126,1,1,0,
-22,35,4,
+22,34,4,
2,
43,0,0,0,0,1,
35,
45,
-36,48,10,
+36,32,10,
41,14,3,
21,
41,168,0,105,2,1,
6,
41,218,1,2,
+50,31,4,0,
50,32,4,0,
-50,33,4,0,
1,
1,
40,
-50,32,4,0,1,0,58,
+50,31,4,0,1,0,58,
40,
-50,33,4,0,1,1,
+50,32,4,0,1,1,
41,168,0,57,
1,
40,
-50,32,4,0,1,1,58,
+50,31,4,0,1,1,58,
40,
-50,33,4,0,1,0,
+50,32,4,0,1,0,
41,168,0,
41,168,0,1,0,
-22,39,4,
+22,38,4,
2,
43,0,0,0,0,1,
35,
45,
-36,48,10,
+36,32,10,
41,14,3,
21,
41,176,0,109,2,1,
6,
41,8,2,2,
+50,35,4,0,
50,36,4,0,
-50,37,4,0,
1,
1,
40,
-50,36,4,0,1,0,58,
+50,35,4,0,1,0,58,
40,
-50,37,4,0,1,1,
+50,36,4,0,1,1,
41,176,0,57,
1,
40,
-50,36,4,0,1,1,58,
+50,35,4,0,1,1,58,
40,
-50,37,4,0,1,0,
+50,36,4,0,1,0,
41,176,0,
41,176,0,1,0,
13,};
diff --git a/src/sksl/sksl_gpu.sksl b/src/sksl/sksl_gpu.sksl
index 2968f6c..bc01a6e 100644
--- a/src/sksl/sksl_gpu.sksl
+++ b/src/sksl/sksl_gpu.sksl
@@ -234,29 +234,27 @@
$genIType findMSB($genUType value);
sampler2D makeSampler2D(texture2D texture, sampler s);
-int2 textureSize($gsampler2DRect s);
+int2 textureSize(sampler2DRect s);
-half4 sample($gsampler1D s, float P);
-half4 sample($gsampler1D s, float P, float bias);
-half4 sample($gsampler2D s, float2 P);
-// The above currently only expand to handle the float/fixed case. So we also declare this integer
-// version of sample().
+half4 sample(sampler1D s, float P);
+half4 sample(sampler1D s, float P, float bias);
+half4 sample(sampler2D s, float2 P);
int4 sample(isampler2D s, float2 P);
half4 sample(samplerExternalOES s, float2 P, float bias);
half4 sample(samplerExternalOES s, float2 P);
-half4 sample($gsampler2DRect s, float2 P);
-half4 sample($gsampler2DRect s, float3 P);
+half4 sample(sampler2DRect s, float2 P);
+half4 sample(sampler2DRect s, float3 P);
// Currently we do not support the generic types of loading subpassInput so we have some explicit
// versions that we currently use
half4 subpassLoad(subpassInput subpass);
half4 subpassLoad(subpassInputMS subpass, int sample);
-half4 sample($gsampler1D s, float2 P);
-half4 sample($gsampler1D s, float2 P, float bias);
-half4 sample($gsampler2D s, float3 P);
-half4 sample($gsampler2D s, float3 P, float bias);
+half4 sample(sampler1D s, float2 P);
+half4 sample(sampler1D s, float2 P, float bias);
+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);
diff --git a/tests/sksl/errors/PrivateTypes.sksl b/tests/sksl/errors/PrivateTypes.sksl
index eb65b20..561d4af 100644
--- a/tests/sksl/errors/PrivateTypes.sksl
+++ b/tests/sksl/errors/PrivateTypes.sksl
@@ -1,5 +1,5 @@
InterfaceBlock {
- layout(set=0) $gsampler2D g;
+ layout(set=0) $mat g;
};
struct S {
diff --git a/tests/sksl/errors/golden/PrivateTypes.glsl b/tests/sksl/errors/golden/PrivateTypes.glsl
index 504b88e..d1287c8 100644
--- a/tests/sksl/errors/golden/PrivateTypes.glsl
+++ b/tests/sksl/errors/golden/PrivateTypes.glsl
@@ -1,6 +1,6 @@
### Compilation failed:
-error: 2: type '$gsampler2D' is private
+error: 2: type '$mat' is private
error: 5: type 'S' is private
error: 9: type '$ivec' is private
error: 10: type '$genType' is private