Selaa lähdekoodia

Use saturate() instead of clamp() for slightly faster shader operation

Sam Lantinga 1 vuosi sitten
vanhempi
commit
bfcca2a36e

+ 1 - 1
src/render/direct3d11/D3D11_PixelShader_Common.incl

@@ -85,7 +85,7 @@ float4 GetOutputColorFromSCRGB(float3 rgb)
         output.r = sRGBfromLinear(output.r);
         output.g = sRGBfromLinear(output.g);
         output.b = sRGBfromLinear(output.b);
-        output.rgb = clamp(output.rgb, 0.0, 1.0);
+        output.rgb = saturate(output.rgb);
     }
 
     return output;

+ 1 - 1
src/render/direct3d12/D3D12_PixelShader_Common.incl

@@ -85,7 +85,7 @@ float4 GetOutputColorFromSCRGB(float3 rgb)
         output.r = sRGBfromLinear(output.r);
         output.g = sRGBfromLinear(output.g);
         output.b = sRGBfromLinear(output.b);
-        output.rgb = clamp(output.rgb, 0.0, 1.0);
+        output.rgb = saturate(output.rgb);
     }
 
     return output;

+ 133 - 141
src/render/direct3d12/D3D12_PixelShader_HDR10.h

@@ -15,7 +15,7 @@
 ; -------------------- ----- ------ -------- -------- ------- ------
 ; SV_Target                0   xyzw        0   TARGET   float   xyzw
 ;
-; shader hash: ca751de73a0041df73e385f66530634e
+; shader hash: 0f451978083c5fe5c4bbcb00819d5ecb
 ;
 ; Pipeline Runtime Information: 
 ;
@@ -189,7 +189,7 @@ define void @main() {
   %95 = fmul fast float %90, %92
   %96 = extractvalue %dx.types.CBufRet.f32 %91, 0
   %97 = fcmp fast une float %96, 0.000000e+00
-  br i1 %97, label %141, label %98
+  br i1 %97, label %138, label %98
 
 ; <label>:98                                      ; preds = %0
   %99 = fcmp fast ugt float %93, 0x3F69A5C380000000
@@ -246,24 +246,21 @@ define void @main() {
 
 ; <label>:133                                     ; preds = %126, %124
   %134 = phi float [ %125, %124 ], [ %132, %126 ]
-  %135 = call float @dx.op.binary.f32(i32 35, float %110, float 0.000000e+00)  ; FMax(a,b)
-  %136 = call float @dx.op.binary.f32(i32 35, float %122, float 0.000000e+00)  ; FMax(a,b)
-  %137 = call float @dx.op.binary.f32(i32 35, float %134, float 0.000000e+00)  ; FMax(a,b)
-  %138 = call float @dx.op.binary.f32(i32 36, float %135, float 1.000000e+00)  ; FMin(a,b)
-  %139 = call float @dx.op.binary.f32(i32 36, float %136, float 1.000000e+00)  ; FMin(a,b)
-  %140 = call float @dx.op.binary.f32(i32 36, float %137, float 1.000000e+00)  ; FMin(a,b)
-  br label %141
+  %135 = call float @dx.op.unary.f32(i32 7, float %110)  ; Saturate(value)
+  %136 = call float @dx.op.unary.f32(i32 7, float %122)  ; Saturate(value)
+  %137 = call float @dx.op.unary.f32(i32 7, float %134)  ; Saturate(value)
+  br label %138
 
-; <label>:141                                     ; preds = %133, %0
-  %142 = phi float [ %93, %0 ], [ %138, %133 ]
-  %143 = phi float [ %94, %0 ], [ %139, %133 ]
-  %144 = phi float [ %95, %0 ], [ %140, %133 ]
-  %145 = fmul fast float %142, %5
-  %146 = fmul fast float %143, %6
-  %147 = fmul fast float %144, %7
-  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 0, float %145)  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
-  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 1, float %146)  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
-  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 2, float %147)  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
+; <label>:138                                     ; preds = %133, %0
+  %139 = phi float [ %93, %0 ], [ %135, %133 ]
+  %140 = phi float [ %94, %0 ], [ %136, %133 ]
+  %141 = phi float [ %95, %0 ], [ %137, %133 ]
+  %142 = fmul fast float %139, %5
+  %143 = fmul fast float %140, %6
+  %144 = fmul fast float %141, %7
+  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 0, float %142)  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
+  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 1, float %143)  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
+  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 2, float %144)  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
   call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 3, float %8)  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
   ret void
 }
@@ -336,9 +333,9 @@ attributes #2 = { nounwind readonly }
 #endif
 
 const unsigned char g_main[] = {
-  0x44, 0x58, 0x42, 0x43, 0xb9, 0x73, 0x6f, 0xd7, 0x57, 0x11, 0xe0, 0x9b,
-  0x59, 0x35, 0x56, 0xad, 0x95, 0x35, 0x69, 0xd8, 0x01, 0x00, 0x00, 0x00,
-  0x95, 0x18, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,
+  0x44, 0x58, 0x42, 0x43, 0x82, 0x76, 0xc5, 0xaf, 0x48, 0xf0, 0xe2, 0xb9,
+  0x09, 0x50, 0x51, 0x6b, 0xb4, 0x16, 0x4b, 0x4c, 0x01, 0x00, 0x00, 0x00,
+  0x5d, 0x18, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,
   0x50, 0x00, 0x00, 0x00, 0xdb, 0x00, 0x00, 0x00, 0x15, 0x01, 0x00, 0x00,
   0x49, 0x02, 0x00, 0x00, 0x05, 0x03, 0x00, 0x00, 0xc9, 0x0b, 0x00, 0x00,
   0xe5, 0x0b, 0x00, 0x00, 0x53, 0x46, 0x49, 0x30, 0x08, 0x00, 0x00, 0x00,
@@ -472,7 +469,7 @@ const unsigned char g_main[] = {
   0x18, 0x19, 0x11, 0x4c, 0x90, 0x8c, 0x09, 0x26, 0x47, 0xc6, 0x04, 0x43,
   0x22, 0x4a, 0x60, 0x04, 0xa0, 0x18, 0x8a, 0xa0, 0x24, 0x0a, 0x34, 0xa0,
   0x0c, 0xca, 0xa1, 0x10, 0x0a, 0xa2, 0x30, 0x0a, 0xa4, 0x80, 0x0a, 0xac,
-  0x00, 0x03, 0xca, 0xa3, 0x68, 0x03, 0x0a, 0x56, 0x80, 0x8a, 0x92, 0x28,
+  0x00, 0x03, 0xca, 0xa3, 0x5c, 0x03, 0x4a, 0x55, 0x80, 0x8a, 0x92, 0x28,
   0x83, 0x42, 0x18, 0x01, 0x28, 0x82, 0x02, 0x21, 0xad, 0x06, 0x28, 0x9c,
   0x01, 0x20, 0x71, 0x06, 0x80, 0xc6, 0x19, 0x00, 0x2a, 0x67, 0x00, 0xc8,
   0x1c, 0xcb, 0x61, 0x08, 0x00, 0x00, 0x80, 0xe3, 0x00, 0x80, 0x40, 0x20,
@@ -588,12 +585,12 @@ const unsigned char g_main[] = {
   0x5f, 0xdc, 0xb6, 0x15, 0x3c, 0xc3, 0xe5, 0x3b, 0x8f, 0x4f, 0x35, 0x40,
   0x84, 0xf9, 0xc5, 0x6d, 0x1b, 0x00, 0xc1, 0x00, 0x48, 0x03, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x41, 0x53, 0x48, 0x14, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0xca, 0x75, 0x1d, 0xe7, 0x3a, 0x00, 0x41,
-  0xdf, 0x73, 0xe3, 0x85, 0xf6, 0x65, 0x30, 0x63, 0x4e, 0x44, 0x58, 0x49,
-  0x4c, 0xa8, 0x0c, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x2a, 0x03, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x45, 0x19, 0x78, 0x08, 0x3c, 0x5f,
+  0xe5, 0xc4, 0xbb, 0xcb, 0x00, 0x81, 0x9d, 0x5e, 0xcb, 0x44, 0x58, 0x49,
+  0x4c, 0x70, 0x0c, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x1c, 0x03, 0x00,
   0x00, 0x44, 0x58, 0x49, 0x4c, 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00,
-  0x00, 0x90, 0x0c, 0x00, 0x00, 0x42, 0x43, 0xc0, 0xde, 0x21, 0x0c, 0x00,
-  0x00, 0x21, 0x03, 0x00, 0x00, 0x0b, 0x82, 0x20, 0x00, 0x02, 0x00, 0x00,
+  0x00, 0x58, 0x0c, 0x00, 0x00, 0x42, 0x43, 0xc0, 0xde, 0x21, 0x0c, 0x00,
+  0x00, 0x13, 0x03, 0x00, 0x00, 0x0b, 0x82, 0x20, 0x00, 0x02, 0x00, 0x00,
   0x00, 0x13, 0x00, 0x00, 0x00, 0x07, 0x81, 0x23, 0x91, 0x41, 0xc8, 0x04,
   0x49, 0x06, 0x10, 0x32, 0x39, 0x92, 0x01, 0x84, 0x0c, 0x25, 0x05, 0x08,
   0x19, 0x1e, 0x04, 0x8b, 0x62, 0x80, 0x18, 0x45, 0x02, 0x42, 0x92, 0x0b,
@@ -742,123 +739,118 @@ const unsigned char g_main[] = {
   0x20, 0x0d, 0x97, 0xef, 0x3c, 0xfe, 0x44, 0x44, 0x13, 0x02, 0x44, 0x98,
   0x5f, 0xdc, 0xb6, 0x15, 0x3c, 0xc3, 0xe5, 0x3b, 0x8f, 0x4f, 0x35, 0x40,
   0x84, 0xf9, 0xc5, 0x6d, 0x1b, 0x00, 0xc1, 0x00, 0x48, 0x03, 0x00, 0x00,
-  0x00, 0x61, 0x20, 0x00, 0x00, 0x60, 0x01, 0x00, 0x00, 0x13, 0x04, 0x4c,
-  0x2c, 0x10, 0x00, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, 0xa4, 0x8d, 0x00,
-  0x50, 0x51, 0x02, 0x44, 0x14, 0x5e, 0x21, 0x95, 0x5b, 0x29, 0x94, 0x5c,
-  0xd9, 0x15, 0x57, 0x19, 0x15, 0xc2, 0x0c, 0x40, 0xa9, 0x94, 0x0b, 0x0d,
-  0x63, 0x04, 0x20, 0x08, 0xe3, 0xe1, 0x18, 0x8c, 0x11, 0xb0, 0xaf, 0x3b,
-  0xa2, 0x63, 0x30, 0x46, 0x00, 0x96, 0x3c, 0x1b, 0xff, 0xc2, 0x18, 0xc1,
-  0x98, 0xae, 0x6a, 0xee, 0x0b, 0x63, 0x04, 0x2a, 0xbe, 0xde, 0xa9, 0x38,
-  0x8c, 0x11, 0xd0, 0x35, 0x28, 0xe6, 0xdf, 0x18, 0x41, 0x0b, 0xc7, 0x31,
-  0xe8, 0x0b, 0x63, 0x04, 0x7e, 0x2c, 0xae, 0x73, 0x38, 0x8c, 0x11, 0xb4,
-  0x6e, 0xc8, 0xf3, 0xbe, 0x30, 0x46, 0xc0, 0xe7, 0xac, 0x8f, 0x7f, 0x63,
-  0x04, 0x20, 0x08, 0x82, 0xf8, 0x37, 0x46, 0xe0, 0xf6, 0xb1, 0x68, 0xfb,
-  0xc2, 0x18, 0x41, 0x1f, 0x8b, 0x2e, 0xfe, 0x8d, 0x11, 0xd4, 0x6a, 0xad,
-  0xb6, 0xdf, 0x18, 0x81, 0x2c, 0xba, 0x3d, 0x0d, 0x06, 0x63, 0x04, 0x3c,
-  0xbc, 0xea, 0x74, 0x37, 0x46, 0xd0, 0x9a, 0x73, 0x4e, 0x7a, 0x63, 0x04,
-  0xeb, 0x88, 0xc7, 0x2c, 0x18, 0x8c, 0x11, 0x80, 0x20, 0xdd, 0xe6, 0x60,
-  0x30, 0x46, 0x00, 0x82, 0xe0, 0x9a, 0x83, 0xc1, 0x18, 0x01, 0x08, 0x82,
-  0x6c, 0xfd, 0x0b, 0x63, 0x04, 0x6c, 0x3b, 0xff, 0xa4, 0x37, 0x03, 0x30,
-  0x02, 0x00, 0x00, 0x00, 0x00, 0x23, 0x06, 0x09, 0x00, 0x82, 0x60, 0xb0,
-  0xe5, 0x01, 0x18, 0xb4, 0x01, 0x1e, 0xe0, 0x81, 0x19, 0x8c, 0x18, 0x24,
-  0x00, 0x08, 0x82, 0xc1, 0xa6, 0x07, 0x61, 0xe0, 0x06, 0x78, 0x80, 0x07,
-  0x67, 0x30, 0x62, 0x90, 0x00, 0x20, 0x08, 0x06, 0xdb, 0x1e, 0x88, 0x41,
-  0x1c, 0xe4, 0x41, 0x1e, 0xa0, 0xc1, 0x88, 0x41, 0x02, 0x80, 0x20, 0x18,
-  0x6c, 0x7c, 0x30, 0x06, 0x6f, 0xa0, 0x07, 0x7b, 0x90, 0x06, 0x23, 0x06,
-  0x09, 0x00, 0x82, 0x60, 0x60, 0x94, 0x02, 0x18, 0xe4, 0xc1, 0x1e, 0xc4,
-  0xc1, 0x37, 0x62, 0x90, 0x00, 0x20, 0x08, 0x06, 0x86, 0x29, 0x84, 0x81,
-  0x1e, 0xf0, 0x81, 0x1a, 0x80, 0xc1, 0x88, 0x41, 0x02, 0x80, 0x20, 0x18,
-  0x18, 0xa7, 0x20, 0x06, 0x7b, 0xd0, 0x07, 0x72, 0x10, 0x06, 0x23, 0x06,
-  0x09, 0x00, 0x82, 0x60, 0x60, 0xa0, 0xc2, 0x18, 0xf0, 0x81, 0x1f, 0xd8,
-  0x81, 0x18, 0x8c, 0x18, 0x24, 0x00, 0x08, 0x82, 0x81, 0x91, 0x0a, 0x64,
-  0x00, 0x0a, 0x7f, 0x50, 0x07, 0x63, 0x30, 0x62, 0x90, 0x00, 0x20, 0x08,
-  0x06, 0x86, 0x2a, 0x94, 0x41, 0x28, 0x80, 0x82, 0x1b, 0x90, 0xc1, 0x88,
-  0xc1, 0x03, 0x80, 0x20, 0x18, 0x34, 0xa9, 0xe0, 0x06, 0x09, 0x22, 0x04,
-  0x0c, 0x13, 0x0a, 0xa1, 0x50, 0x06, 0xcc, 0x68, 0x42, 0x00, 0x8c, 0x18,
-  0x3c, 0x00, 0x08, 0x82, 0x41, 0xb3, 0x0a, 0x70, 0xc0, 0x28, 0xc4, 0xe0,
-  0x38, 0xa3, 0x30, 0x0a, 0x67, 0xe0, 0x8c, 0x26, 0x04, 0xc0, 0x68, 0x82,
-  0x10, 0x8c, 0x18, 0x1c, 0x00, 0x08, 0x82, 0x81, 0xa5, 0x0a, 0x6e, 0xc0,
-  0x9c, 0xc2, 0x68, 0x42, 0x00, 0x8c, 0x26, 0x08, 0xc1, 0x68, 0xc2, 0x20,
-  0xd8, 0x80, 0xc0, 0xc7, 0x86, 0x03, 0x3e, 0x36, 0x1c, 0xf0, 0x19, 0x31,
-  0x38, 0x00, 0x10, 0x04, 0x03, 0x2b, 0x16, 0xea, 0x60, 0x5a, 0x85, 0xd1,
-  0x84, 0x00, 0x18, 0x4d, 0x10, 0x82, 0xd1, 0x84, 0x41, 0x18, 0x31, 0x58,
-  0x00, 0x10, 0x04, 0x83, 0x07, 0x17, 0xf8, 0xe0, 0x30, 0x8a, 0x41, 0x08,
-  0x46, 0x0c, 0x0e, 0x00, 0x04, 0xc1, 0xc0, 0xb2, 0x05, 0x3d, 0xc0, 0x5a,
-  0x61, 0x34, 0x21, 0x00, 0x46, 0x13, 0x84, 0x60, 0x34, 0x61, 0x10, 0x46,
-  0x0c, 0x16, 0x00, 0x04, 0xc1, 0xe0, 0xe9, 0x85, 0x50, 0x60, 0x16, 0x65,
-  0x10, 0x82, 0x11, 0x83, 0x03, 0x00, 0x41, 0x30, 0xb0, 0x76, 0xe1, 0x0f,
-  0x3a, 0x3e, 0x18, 0x4d, 0x08, 0x80, 0xd1, 0x04, 0x21, 0x18, 0x4d, 0x18,
-  0x84, 0x11, 0x83, 0x05, 0x00, 0x41, 0x30, 0x78, 0xc4, 0xc1, 0x14, 0x22,
-  0xe8, 0x19, 0x84, 0x60, 0xc4, 0xc0, 0x00, 0x40, 0x10, 0x0c, 0x22, 0x71,
-  0xd8, 0x85, 0x65, 0xc4, 0xc0, 0x00, 0x40, 0x10, 0x0c, 0xa2, 0x71, 0xe0,
-  0x85, 0x63, 0xc4, 0xc0, 0x00, 0x40, 0x10, 0x0c, 0x22, 0x72, 0xe8, 0x85,
+  0x00, 0x61, 0x20, 0x00, 0x00, 0x52, 0x01, 0x00, 0x00, 0x13, 0x04, 0x4c,
+  0x2c, 0x10, 0x00, 0x00, 0x00, 0x2d, 0x00, 0x00, 0x00, 0xa4, 0x8d, 0x00,
+  0x50, 0x51, 0x02, 0x44, 0x14, 0x5e, 0x39, 0x94, 0x51, 0xb9, 0x95, 0x42,
+  0xc9, 0x95, 0x5d, 0x71, 0x15, 0xc2, 0x0c, 0x40, 0xa9, 0x94, 0x0b, 0x0d,
+  0x63, 0x04, 0xec, 0xeb, 0x8e, 0xe8, 0x18, 0x8c, 0x11, 0x80, 0x25, 0xcf,
+  0xc6, 0xbf, 0x30, 0x46, 0x30, 0xa6, 0xab, 0x9a, 0xfb, 0xc2, 0x18, 0x81,
+  0x8a, 0xaf, 0x77, 0x2a, 0x0e, 0x63, 0x04, 0x74, 0x0d, 0x8a, 0xf9, 0x37,
+  0x46, 0xd0, 0xc2, 0x71, 0x0c, 0xfa, 0xc2, 0x18, 0x81, 0x1f, 0x8b, 0xeb,
+  0x1c, 0x0e, 0x63, 0x04, 0xad, 0x1b, 0xf2, 0xbc, 0x2f, 0x8c, 0x11, 0xf0,
+  0x39, 0xeb, 0xe3, 0xdf, 0x18, 0x01, 0x08, 0xc2, 0x78, 0x38, 0x06, 0x63,
+  0x04, 0x6e, 0x1f, 0x8b, 0xb6, 0x2f, 0x8c, 0x11, 0xf4, 0xb1, 0xe8, 0xe2,
+  0xdf, 0x18, 0x41, 0xad, 0xd6, 0x6a, 0xfb, 0x8d, 0x11, 0xc8, 0xa2, 0xdb,
+  0xd3, 0x60, 0x30, 0x46, 0xc0, 0xc3, 0xab, 0x4e, 0x77, 0x63, 0x04, 0xad,
+  0x39, 0xe7, 0xa4, 0x37, 0x46, 0xb0, 0x8e, 0x78, 0xcc, 0x82, 0xc1, 0x18,
+  0x01, 0x08, 0xd2, 0x6d, 0x0e, 0x06, 0x63, 0x04, 0x20, 0x08, 0xae, 0x39,
+  0x18, 0x8c, 0x11, 0x80, 0x20, 0xc8, 0xd6, 0xbf, 0x30, 0x46, 0xc0, 0xb6,
+  0xf3, 0x4f, 0x7a, 0x23, 0x00, 0x33, 0x00, 0x00, 0x00, 0x23, 0x06, 0x09,
+  0x00, 0x82, 0x60, 0xb0, 0xe1, 0x81, 0xc7, 0x06, 0x77, 0x70, 0x07, 0x65,
+  0x30, 0x62, 0x90, 0x00, 0x20, 0x08, 0x06, 0x5b, 0x1e, 0x7c, 0x6d, 0x70,
+  0x07, 0x77, 0x60, 0x06, 0x23, 0x06, 0x09, 0x00, 0x82, 0x60, 0xb0, 0xe9,
+  0x01, 0x18, 0xc0, 0x01, 0x1e, 0xe0, 0xc1, 0x19, 0x8c, 0x18, 0x24, 0x00,
+  0x08, 0x82, 0xc1, 0xb6, 0x07, 0x61, 0xe0, 0x06, 0x79, 0xa0, 0x07, 0x68,
+  0x30, 0x62, 0x90, 0x00, 0x20, 0x08, 0x06, 0x06, 0x29, 0x7c, 0x78, 0xa0,
+  0x07, 0x70, 0xe0, 0x8d, 0x18, 0x24, 0x00, 0x08, 0x82, 0x81, 0x51, 0x0a,
+  0x60, 0x90, 0x07, 0x7b, 0x90, 0x06, 0xdf, 0x88, 0x41, 0x02, 0x80, 0x20,
+  0x18, 0x18, 0xa6, 0x10, 0x06, 0x7a, 0xc0, 0x07, 0x71, 0x00, 0x06, 0x23,
+  0x06, 0x09, 0x00, 0x82, 0x60, 0x60, 0x9c, 0x82, 0x18, 0xec, 0x41, 0x1f,
+  0xd4, 0x41, 0x18, 0x8c, 0x18, 0x24, 0x00, 0x08, 0x82, 0x81, 0x81, 0x0a,
+  0x63, 0xf0, 0x07, 0x7e, 0x40, 0x07, 0x62, 0x30, 0x62, 0x90, 0x00, 0x20,
+  0x08, 0x06, 0x46, 0x2a, 0x90, 0x01, 0x28, 0xfc, 0x41, 0x1b, 0x8c, 0xc1,
+  0x88, 0xc1, 0x03, 0x80, 0x20, 0x18, 0x34, 0xa8, 0xd0, 0x06, 0x09, 0x22,
+  0x04, 0xcb, 0x02, 0x0a, 0xa0, 0x40, 0x06, 0xcb, 0x68, 0x42, 0x00, 0x8c,
+  0x18, 0x3c, 0x00, 0x08, 0x82, 0x41, 0xa3, 0x0a, 0x6f, 0xc0, 0x28, 0xc4,
+  0xd0, 0x34, 0xa2, 0x20, 0x0a, 0x66, 0xd0, 0x8c, 0x26, 0x04, 0xc0, 0x68,
+  0x82, 0x10, 0x8c, 0x18, 0x1c, 0x00, 0x08, 0x82, 0x81, 0x95, 0x0a, 0x6c,
+  0xc0, 0x98, 0xc2, 0x68, 0x42, 0x00, 0x8c, 0x26, 0x08, 0xc1, 0x68, 0xc2,
+  0x20, 0xd8, 0x80, 0xc0, 0xc7, 0x86, 0x03, 0x3e, 0x36, 0x1c, 0xf0, 0x19,
+  0x31, 0x38, 0x00, 0x10, 0x04, 0x03, 0x0b, 0x16, 0xe6, 0x60, 0x52, 0x85,
+  0xd1, 0x84, 0x00, 0x18, 0x4d, 0x10, 0x82, 0xd1, 0x84, 0x41, 0x18, 0x31,
+  0x58, 0x00, 0x10, 0x04, 0x83, 0xe7, 0x16, 0xf4, 0xe0, 0x30, 0x8a, 0x41,
+  0x08, 0x46, 0x0c, 0x0e, 0x00, 0x04, 0xc1, 0xc0, 0xaa, 0x05, 0x3c, 0xc0,
+  0x58, 0x61, 0x34, 0x21, 0x00, 0x46, 0x13, 0x84, 0x60, 0x34, 0x61, 0x10,
+  0x46, 0x0c, 0x16, 0x00, 0x04, 0xc1, 0xe0, 0xe1, 0x85, 0x3f, 0x60, 0x16,
+  0x65, 0x10, 0x82, 0x11, 0x83, 0x03, 0x00, 0x41, 0x30, 0xb0, 0x74, 0xa1,
+  0x0f, 0xba, 0x3d, 0x18, 0x4d, 0x08, 0x80, 0xd1, 0x04, 0x21, 0x18, 0x4d,
+  0x18, 0x84, 0x11, 0x83, 0x05, 0x00, 0x41, 0x30, 0x78, 0xc2, 0x81, 0x14,
+  0x22, 0xe8, 0x19, 0x84, 0x60, 0xc4, 0xc0, 0x00, 0x40, 0x10, 0x0c, 0xa2,
+  0x70, 0xd0, 0x85, 0x65, 0xc4, 0xc0, 0x00, 0x40, 0x10, 0x0c, 0x22, 0x71,
+  0xd8, 0x85, 0x63, 0xc4, 0xc0, 0x00, 0x40, 0x10, 0x0c, 0xa2, 0x71, 0xe0,
+  0x85, 0x61, 0xc4, 0xc0, 0x00, 0x40, 0x10, 0x0c, 0x22, 0x72, 0x00, 0x85,
   0x61, 0xc4, 0xc0, 0x00, 0x40, 0x10, 0x0c, 0xa2, 0x72, 0x08, 0x85, 0x61,
-  0xc4, 0xc0, 0x00, 0x40, 0x10, 0x0c, 0x22, 0x73, 0x10, 0x85, 0x61, 0xc4,
-  0xc0, 0x00, 0x40, 0x10, 0x0c, 0xa2, 0x73, 0x18, 0x85, 0xc1, 0x06, 0x37,
-  0x90, 0x8f, 0x0d, 0x6f, 0x20, 0x1f, 0x1b, 0xe0, 0x40, 0x3e, 0x23, 0x06,
+  0xc4, 0xc0, 0x00, 0x40, 0x10, 0x0c, 0x22, 0x73, 0x10, 0x85, 0xc1, 0x06,
+  0x37, 0x90, 0x8f, 0x0d, 0x6f, 0x20, 0x1f, 0x1b, 0xe0, 0x40, 0x3e, 0x23,
+  0x06, 0x06, 0x00, 0x82, 0x60, 0x10, 0xa9, 0xc3, 0x29, 0x0c, 0x23, 0x06,
   0x06, 0x00, 0x82, 0x60, 0x10, 0xad, 0x03, 0x2a, 0x0c, 0x23, 0x06, 0x06,
-  0x00, 0x82, 0x60, 0x10, 0xb1, 0x43, 0x2a, 0x0c, 0x23, 0x06, 0x06, 0x00,
-  0x82, 0x60, 0x10, 0xb5, 0x83, 0x2a, 0x0c, 0x36, 0xd4, 0x01, 0x7c, 0x6c,
-  0xb0, 0x03, 0xf8, 0xd8, 0x70, 0x07, 0xf0, 0x19, 0x31, 0x38, 0x00, 0x10,
-  0x04, 0x83, 0x09, 0x1e, 0x62, 0x61, 0xa8, 0x83, 0x11, 0x83, 0x03, 0x00,
-  0x41, 0x30, 0x98, 0xe2, 0x41, 0x16, 0x06, 0x3b, 0x18, 0x31, 0x38, 0x00,
-  0x10, 0x04, 0x83, 0x49, 0x1e, 0x66, 0x61, 0xb8, 0x03, 0x4b, 0xf8, 0x40,
-  0x3e, 0x96, 0xf4, 0x81, 0x7c, 0x2c, 0xf1, 0x03, 0xf9, 0x18, 0x28, 0x0c,
-  0xf1, 0xb1, 0x50, 0x18, 0xe2, 0x63, 0xa2, 0x30, 0xc4, 0xc7, 0x92, 0x81,
-  0x3e, 0x96, 0x0c, 0xf4, 0xb1, 0x64, 0xa0, 0xcf, 0x88, 0x81, 0x01, 0x80,
+  0x00, 0x82, 0x60, 0x10, 0xb1, 0x43, 0x2a, 0x0c, 0x36, 0xd4, 0x01, 0x7c,
+  0x6c, 0xb0, 0x03, 0xf8, 0xd8, 0x70, 0x07, 0xf0, 0x19, 0x31, 0x38, 0x00,
+  0x10, 0x04, 0x83, 0xe9, 0x1d, 0x6a, 0x61, 0xb0, 0x83, 0x11, 0x83, 0x03,
+  0x00, 0x41, 0x30, 0x98, 0xe0, 0xc1, 0x16, 0x86, 0x3b, 0x18, 0x31, 0x38,
+  0x00, 0x10, 0x04, 0x83, 0x29, 0x1e, 0x6e, 0x61, 0xc0, 0x03, 0x4b, 0xf8,
+  0x40, 0x3e, 0x96, 0xf4, 0x81, 0x7c, 0x2c, 0xf1, 0x03, 0xf9, 0x18, 0x28,
+  0x0c, 0xf1, 0xb1, 0x50, 0x18, 0xe2, 0x63, 0xa2, 0x30, 0xc4, 0xc7, 0x92,
+  0x81, 0x3e, 0x96, 0x0c, 0xf4, 0xb1, 0x64, 0xa0, 0xcf, 0x88, 0x81, 0x01,
+  0x80, 0x20, 0x18, 0x44, 0xfc, 0x50, 0x0f, 0xc3, 0x88, 0x81, 0x01, 0x80,
   0x20, 0x18, 0x44, 0xfd, 0x60, 0x0f, 0xc3, 0x88, 0x81, 0x01, 0x80, 0x20,
   0x18, 0x44, 0xfe, 0x70, 0x0f, 0xc3, 0x88, 0x81, 0x01, 0x80, 0x20, 0x18,
-  0x44, 0xff, 0x80, 0x0f, 0xc3, 0x88, 0x81, 0x01, 0x80, 0x20, 0x18, 0x44,
+  0x44, 0xff, 0xb0, 0x0b, 0xc3, 0x88, 0x81, 0x01, 0x80, 0x20, 0x18, 0x44,
   0x20, 0xc1, 0x0b, 0xc3, 0x88, 0x81, 0x01, 0x80, 0x20, 0x18, 0x44, 0x21,
-  0xd1, 0x0b, 0xc3, 0x88, 0x81, 0x01, 0x80, 0x20, 0x18, 0x44, 0x22, 0xe1,
-  0x0b, 0x83, 0x0d, 0xad, 0x20, 0x1f, 0x1b, 0x5c, 0x41, 0x3e, 0x36, 0xbc,
-  0x82, 0x7c, 0x46, 0x0c, 0x0c, 0x00, 0x04, 0xc1, 0x20, 0x32, 0x89, 0x71,
+  0xd1, 0x0b, 0x83, 0x0d, 0xad, 0x20, 0x1f, 0x1b, 0x5c, 0x41, 0x3e, 0x36,
+  0xbc, 0x82, 0x7c, 0x46, 0x0c, 0x0c, 0x00, 0x04, 0xc1, 0x20, 0x2a, 0x09,
+  0x71, 0x18, 0x46, 0x0c, 0x0c, 0x00, 0x04, 0xc1, 0x20, 0x32, 0x89, 0x71,
   0x18, 0x46, 0x0c, 0x0c, 0x00, 0x04, 0xc1, 0x20, 0x3a, 0x09, 0x72, 0x18,
-  0x46, 0x0c, 0x0c, 0x00, 0x04, 0xc1, 0x20, 0x42, 0x89, 0x72, 0x18, 0x4c,
-  0x20, 0x07, 0xf9, 0x98, 0x50, 0x0e, 0xf2, 0xb1, 0xa2, 0x1c, 0xe4, 0x33,
-  0x62, 0x80, 0x00, 0x20, 0x08, 0x06, 0x58, 0x4a, 0xb4, 0x43, 0x39, 0x0c,
-  0xc1, 0x88, 0x01, 0x02, 0x80, 0x20, 0x18, 0x60, 0x2a, 0xe1, 0x0e, 0xe5,
-  0x30, 0x04, 0x86, 0x94, 0x83, 0x7c, 0x46, 0x0c, 0x10, 0x00, 0x04, 0xc1,
-  0x00, 0x63, 0x09, 0x78, 0x28, 0x07, 0x23, 0x18, 0x31, 0x40, 0x00, 0x10,
-  0x04, 0x03, 0xac, 0x25, 0xe2, 0xa1, 0x1c, 0x8c, 0xc0, 0x96, 0x72, 0x90,
-  0xcf, 0x88, 0x01, 0x02, 0x80, 0x20, 0x18, 0x60, 0x2f, 0x31, 0x0f, 0xe5,
-  0x90, 0x04, 0x23, 0x06, 0x08, 0x00, 0x82, 0x60, 0x80, 0xc1, 0x04, 0x3d,
-  0x94, 0x43, 0x12, 0xd8, 0xf1, 0x0b, 0xf2, 0xb1, 0x02, 0x1c, 0xe4, 0x63,
-  0x43, 0x38, 0xc8, 0x67, 0xc4, 0xe0, 0x00, 0x40, 0x10, 0x0c, 0xac, 0x9a,
-  0xc8, 0x87, 0x5b, 0x88, 0x89, 0xd1, 0x84, 0x20, 0xb0, 0x22, 0x90, 0x8f,
-  0x15, 0x82, 0x7c, 0xac, 0x18, 0xe4, 0x33, 0x9a, 0x50, 0x00, 0xc3, 0x11,
-  0x41, 0x38, 0x38, 0xdf, 0x2c, 0xc3, 0x12, 0x04, 0xc3, 0x11, 0x85, 0x3a,
-  0x28, 0xdf, 0x2c, 0xc3, 0x20, 0x04, 0x66, 0xb0, 0x83, 0x7c, 0x66, 0x09,
-  0x88, 0x11, 0x03, 0x03, 0x00, 0x41, 0x30, 0x88, 0xc0, 0x22, 0x27, 0x8e,
-  0x11, 0x03, 0x03, 0x00, 0x41, 0x30, 0x88, 0xc2, 0xa2, 0x1f, 0x02, 0x0b,
-  0xe0, 0x41, 0x3e, 0x23, 0x06, 0x06, 0x00, 0x82, 0x60, 0x10, 0x8d, 0x05,
-  0x48, 0x04, 0x16, 0xcc, 0x83, 0x7c, 0x2c, 0xa8, 0x07, 0xf8, 0xcc, 0x12,
-  0x10, 0x03, 0x15, 0x83, 0x23, 0x08, 0xc3, 0x70, 0x44, 0x33, 0x0f, 0xca,
-  0x37, 0xcb, 0x60, 0x14, 0x81, 0x39, 0xf5, 0x20, 0x9f, 0x59, 0x82, 0x63,
-  0xc4, 0xc0, 0x00, 0x40, 0x10, 0x0c, 0xa2, 0xb4, 0x10, 0x8b, 0x67, 0xc4,
-  0xc0, 0x00, 0x40, 0x10, 0x0c, 0x22, 0xb5, 0x30, 0x89, 0xc0, 0x82, 0x7c,
-  0x90, 0xcf, 0x88, 0x81, 0x01, 0x80, 0x20, 0x18, 0x44, 0x6c, 0x91, 0x12,
-  0x81, 0x05, 0xfc, 0x20, 0x1f, 0x0b, 0xfc, 0x01, 0x3e, 0xb3, 0x04, 0xc7,
-  0x40, 0xc5, 0xe0, 0x14, 0x82, 0x31, 0x1c, 0x51, 0xf1, 0x83, 0xf2, 0xcd,
-  0x32, 0x24, 0x48, 0x60, 0x96, 0x3f, 0xc8, 0x67, 0x96, 0x40, 0x19, 0x31,
-  0x30, 0x00, 0x10, 0x04, 0x83, 0x48, 0x2e, 0xd6, 0xe2, 0x1a, 0x31, 0x30,
-  0x00, 0x10, 0x04, 0x83, 0x68, 0x2e, 0x5e, 0x22, 0xb0, 0x40, 0x24, 0xe4,
-  0x33, 0x62, 0x60, 0x00, 0x20, 0x08, 0x06, 0x51, 0x5d, 0xc8, 0x44, 0x60,
-  0x41, 0x49, 0xc8, 0xc7, 0x82, 0x93, 0x80, 0xcf, 0x2c, 0x81, 0x32, 0x50,
-  0x31, 0x38, 0x88, 0x90, 0x8c, 0x18, 0x1c, 0x00, 0x08, 0x82, 0xc1, 0x84,
-  0x17, 0x39, 0x31, 0xf5, 0xc3, 0x88, 0xc1, 0x01, 0x80, 0x20, 0x18, 0x4c,
-  0x79, 0xa1, 0x13, 0x8b, 0x3f, 0x8c, 0x18, 0x1c, 0x00, 0x08, 0x82, 0xc1,
-  0xa4, 0x17, 0x3b, 0x31, 0xfc, 0xc3, 0x88, 0xc1, 0x01, 0x80, 0x20, 0x18,
-  0x4c, 0x7b, 0x21, 0x16, 0x43, 0x4b, 0x8c, 0x18, 0x1c, 0x00, 0x08, 0x82,
-  0xc1, 0xc4, 0x17, 0x63, 0x31, 0xb8, 0xc4, 0x88, 0xc1, 0x01, 0x80, 0x20,
-  0x18, 0x4c, 0x7d, 0x41, 0x16, 0xc3, 0x4b, 0xcc, 0x12, 0x2c, 0x03, 0x15,
-  0x03, 0x2b, 0x00, 0x86, 0x32, 0x50, 0x31, 0xb0, 0x02, 0x60, 0x28, 0x03,
-  0x15, 0x03, 0x2b, 0x00, 0x86, 0x62, 0x43, 0x48, 0xc8, 0xc7, 0x86, 0x90,
-  0x90, 0x8f, 0x0d, 0x21, 0x21, 0x9f, 0x11, 0x83, 0x04, 0x00, 0x41, 0x30,
-  0x40, 0x50, 0x23, 0x2d, 0xfe, 0xe2, 0x2f, 0xea, 0x62, 0x18, 0x31, 0x48,
-  0x00, 0x10, 0x04, 0x03, 0x04, 0x35, 0xd2, 0xe2, 0x2f, 0xfe, 0xa2, 0x2d,
-  0x84, 0x11, 0x83, 0x04, 0x00, 0x41, 0x30, 0x40, 0x50, 0x23, 0x2d, 0xfe,
-  0xe2, 0x2f, 0xe8, 0x22, 0x18, 0x31, 0x48, 0x00, 0x10, 0x04, 0x03, 0x04,
-  0x35, 0xd2, 0xe2, 0x2f, 0xfe, 0xe2, 0x2e, 0x42, 0x02, 0x01, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00
+  0x4c, 0xd0, 0x05, 0xf9, 0x98, 0xb0, 0x0b, 0xf2, 0xb1, 0xa2, 0x1c, 0xe4,
+  0x33, 0x62, 0x80, 0x00, 0x20, 0x08, 0x06, 0x18, 0x4a, 0xac, 0x43, 0x39,
+  0x0c, 0xc1, 0x88, 0x01, 0x02, 0x80, 0x20, 0x18, 0x60, 0x29, 0xc1, 0x0e,
+  0xe5, 0x30, 0x04, 0x86, 0x94, 0x83, 0x7c, 0x46, 0x0c, 0x10, 0x00, 0x04,
+  0xc1, 0x00, 0x5b, 0x09, 0x77, 0x28, 0x07, 0x23, 0x18, 0x31, 0x40, 0x00,
+  0x10, 0x04, 0x03, 0x8c, 0x25, 0xde, 0xa1, 0x1c, 0x8c, 0xc0, 0x96, 0x72,
+  0x90, 0xcf, 0x88, 0x01, 0x02, 0x80, 0x20, 0x18, 0x60, 0x2e, 0x11, 0x0f,
+  0xe5, 0x90, 0x04, 0x23, 0x06, 0x08, 0x00, 0x82, 0x60, 0x80, 0xbd, 0x84,
+  0x3c, 0x94, 0x43, 0x12, 0xd8, 0xf1, 0x0b, 0xf2, 0xb1, 0x02, 0x1c, 0xe4,
+  0x63, 0x43, 0x38, 0xc8, 0x67, 0xc4, 0xe0, 0x00, 0x40, 0x10, 0x0c, 0x2c,
+  0x9a, 0xb8, 0x87, 0x5b, 0x80, 0x89, 0xd1, 0x84, 0x20, 0xb0, 0x22, 0x90,
+  0x8f, 0x15, 0x82, 0x7c, 0xac, 0x18, 0xe4, 0x33, 0x9a, 0x50, 0x00, 0xc3,
+  0x11, 0x81, 0x38, 0x38, 0xdf, 0x2c, 0xc3, 0x12, 0x04, 0xc3, 0x11, 0x85,
+  0x3a, 0x28, 0xdf, 0x2c, 0xc3, 0x20, 0x04, 0x66, 0xb0, 0x83, 0x7c, 0x66,
+  0x09, 0x88, 0x11, 0x03, 0x03, 0x00, 0x41, 0x30, 0x88, 0x7e, 0x02, 0x27,
+  0x8e, 0x11, 0x03, 0x03, 0x00, 0x41, 0x30, 0x88, 0xc0, 0x82, 0x1f, 0x02,
+  0x0b, 0xe0, 0x41, 0x3e, 0x23, 0x06, 0x06, 0x00, 0x82, 0x60, 0x10, 0x89,
+  0xc5, 0x3f, 0x04, 0x16, 0xcc, 0x83, 0x7c, 0x2c, 0xa8, 0x07, 0xf8, 0xcc,
+  0x12, 0x10, 0x03, 0x15, 0x83, 0x23, 0x08, 0xc3, 0x70, 0x44, 0x33, 0x0f,
+  0xca, 0x37, 0xcb, 0x60, 0x14, 0x81, 0x39, 0xf5, 0x20, 0x9f, 0x59, 0x82,
+  0x63, 0xc4, 0xc0, 0x00, 0x40, 0x10, 0x0c, 0x22, 0xb4, 0x08, 0x8b, 0x67,
+  0xc4, 0xc0, 0x00, 0x40, 0x10, 0x0c, 0xa2, 0xb4, 0x28, 0x89, 0xc0, 0x82,
+  0x7c, 0x90, 0xcf, 0x88, 0x81, 0x01, 0x80, 0x20, 0x18, 0x44, 0x6b, 0x81,
+  0x12, 0x81, 0x05, 0xfc, 0x20, 0x1f, 0x0b, 0xfc, 0x01, 0x3e, 0xb3, 0x04,
+  0xc7, 0x40, 0xc5, 0xe0, 0x14, 0x82, 0x31, 0x1c, 0x51, 0xf1, 0x83, 0xf2,
+  0xcd, 0x32, 0x24, 0x48, 0x60, 0x96, 0x3f, 0xc8, 0x67, 0x96, 0x40, 0x19,
+  0x31, 0x30, 0x00, 0x10, 0x04, 0x83, 0x28, 0x2e, 0xd4, 0xe2, 0x1a, 0x31,
+  0x30, 0x00, 0x10, 0x04, 0x83, 0x48, 0x2e, 0x5c, 0x22, 0xb0, 0x40, 0x24,
+  0xe4, 0x33, 0x62, 0x60, 0x00, 0x20, 0x08, 0x06, 0x11, 0x5d, 0xc4, 0x44,
+  0x60, 0x41, 0x49, 0xc8, 0xc7, 0x82, 0x93, 0x80, 0xcf, 0x2c, 0x81, 0x32,
+  0x50, 0x31, 0x38, 0x88, 0x90, 0x8c, 0x18, 0x18, 0x00, 0x08, 0x82, 0x41,
+  0x84, 0x17, 0x3e, 0x31, 0x8d, 0x18, 0x18, 0x00, 0x08, 0x82, 0x41, 0x94,
+  0x17, 0x3f, 0xb1, 0x8c, 0x18, 0x18, 0x00, 0x08, 0x82, 0x41, 0xa4, 0x17,
+  0x60, 0x31, 0xcc, 0x12, 0x2c, 0x03, 0x15, 0x83, 0x29, 0x00, 0x86, 0x32,
+  0x50, 0x31, 0x98, 0x02, 0x60, 0x28, 0x03, 0x15, 0x83, 0x29, 0x00, 0x86,
+  0x62, 0x83, 0x3f, 0xc8, 0xc7, 0x06, 0x7f, 0x90, 0x8f, 0x0d, 0xfe, 0x20,
+  0x9f, 0x11, 0x83, 0x04, 0x00, 0x41, 0x30, 0x40, 0x48, 0x83, 0x2c, 0xf6,
+  0x62, 0x2f, 0xe2, 0x62, 0x18, 0x31, 0x48, 0x00, 0x10, 0x04, 0x03, 0x84,
+  0x34, 0xc8, 0x62, 0x2f, 0xf6, 0x22, 0x2d, 0x84, 0x11, 0x83, 0x04, 0x00,
+  0x41, 0x30, 0x40, 0x48, 0x83, 0x2c, 0xf6, 0x62, 0x2f, 0xe0, 0x22, 0x18,
+  0x31, 0x48, 0x00, 0x10, 0x04, 0x03, 0x84, 0x34, 0xc8, 0x62, 0x2f, 0xf6,
+  0x62, 0x2e, 0xfc, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00
 };