فهرست منبع

Removed unused YCbCr_matrix from Vulkan shaders

Sam Lantinga 1 سال پیش
والد
کامیت
bf853823a2

+ 0 - 9
src/render/vulkan/SDL_render_vulkan.c

@@ -193,8 +193,6 @@ typedef struct
     float tonemap_factor1;
     float tonemap_factor2;
     float sdr_white_point;
-
-    float YCbCr_matrix[16];
 } PixelShaderConstants;
 
 /* Per-vertex data */
@@ -238,7 +236,6 @@ typedef struct
     int width;
     int height;
     VULKAN_Shader shader;
-    const float *YCbCr_matrix;
 
 #if SDL_HAVE_YUV
     /* Object passed to VkImageView and VkSampler for doing Ycbcr -> RGB conversion */
@@ -3170,8 +3167,6 @@ static void VULKAN_SetupShaderConstants(SDL_Renderer *renderer, const SDL_Render
     constants->color_scale = cmd->data.draw.color_scale;
 
     if (texture) {
-        VULKAN_TextureData *textureData = (VULKAN_TextureData *)texture->driverdata;
-
         switch (texture->format) {
         case SDL_PIXELFORMAT_YV12:
         case SDL_PIXELFORMAT_IYUV:
@@ -3207,10 +3202,6 @@ static void VULKAN_SetupShaderConstants(SDL_Renderer *renderer, const SDL_Render
             constants->tonemap_factor1 = (output_headroom / (texture->HDR_headroom * texture->HDR_headroom));
             constants->tonemap_factor2 = (1.0f / output_headroom);
         }
-
-        if (textureData->YCbCr_matrix) {
-            SDL_memcpy(constants->YCbCr_matrix, textureData->YCbCr_matrix, sizeof(constants->YCbCr_matrix));
-        }
     }
 }
 

+ 242 - 248
src/render/vulkan/VULKAN_PixelShader_Advanced.h

@@ -1,4 +1,4 @@
-	// 1113.1.1
+	// 1114.0.0
 	 #pragma once
 const uint32_t VULKAN_PixelShader_Advanced[] = {
 	0x07230203,0x00010000,0x0008000b,0x0000043e,0x00000000,0x00020011,0x00000001,0x0006000b,
@@ -12,20 +12,15 @@ const uint32_t VULKAN_PixelShader_Advanced[] = {
 	0x00070006,0x00000075,0x00000004,0x656e6f74,0x5f70616d,0x6874656d,0x0000646f,0x00070006,
 	0x00000075,0x00000005,0x656e6f74,0x5f70616d,0x74636166,0x0031726f,0x00070006,0x00000075,
 	0x00000006,0x656e6f74,0x5f70616d,0x74636166,0x0032726f,0x00070006,0x00000075,0x00000007,
-	0x5f726473,0x74696877,0x6f705f65,0x00746e69,0x00050006,0x00000075,0x00000008,0x66666f59,
-	0x00746573,0x00050006,0x00000075,0x00000009,0x656f6352,0x00006666,0x00050006,0x00000075,
-	0x0000000a,0x656f6347,0x00006666,0x00050006,0x00000075,0x0000000b,0x656f6342,0x00006666,
-	0x00030005,0x00000077,0x00000000,0x00050005,0x000000e6,0x74786574,0x30657275,0x00000000,
-	0x00050005,0x000001bb,0x75706e69,0x65742e74,0x00000078,0x00050005,0x000001be,0x75706e69,
-	0x6f632e74,0x00726f6c,0x00070005,0x000001c2,0x746e6540,0x6f507972,0x4f746e69,0x75707475,
-	0x00000074,0x00050048,0x00000075,0x00000000,0x00000023,0x00000000,0x00050048,0x00000075,
-	0x00000001,0x00000023,0x00000004,0x00050048,0x00000075,0x00000002,0x00000023,0x00000008,
-	0x00050048,0x00000075,0x00000003,0x00000023,0x0000000c,0x00050048,0x00000075,0x00000004,
-	0x00000023,0x00000010,0x00050048,0x00000075,0x00000005,0x00000023,0x00000014,0x00050048,
-	0x00000075,0x00000006,0x00000023,0x00000018,0x00050048,0x00000075,0x00000007,0x00000023,
-	0x0000001c,0x00050048,0x00000075,0x00000008,0x00000023,0x00000020,0x00050048,0x00000075,
-	0x00000009,0x00000023,0x00000030,0x00050048,0x00000075,0x0000000a,0x00000023,0x00000040,
-	0x00050048,0x00000075,0x0000000b,0x00000023,0x00000050,0x00030047,0x00000075,0x00000002,
+	0x5f726473,0x74696877,0x6f705f65,0x00746e69,0x00030005,0x00000077,0x00000000,0x00050005,
+	0x000000e6,0x74786574,0x30657275,0x00000000,0x00050005,0x000001bb,0x75706e69,0x65742e74,
+	0x00000078,0x00050005,0x000001be,0x75706e69,0x6f632e74,0x00726f6c,0x00070005,0x000001c2,
+	0x746e6540,0x6f507972,0x4f746e69,0x75707475,0x00000074,0x00050048,0x00000075,0x00000000,
+	0x00000023,0x00000000,0x00050048,0x00000075,0x00000001,0x00000023,0x00000004,0x00050048,
+	0x00000075,0x00000002,0x00000023,0x00000008,0x00050048,0x00000075,0x00000003,0x00000023,
+	0x0000000c,0x00050048,0x00000075,0x00000004,0x00000023,0x00000010,0x00050048,0x00000075,
+	0x00000005,0x00000023,0x00000014,0x00050048,0x00000075,0x00000006,0x00000023,0x00000018,
+	0x00050048,0x00000075,0x00000007,0x00000023,0x0000001c,0x00030047,0x00000075,0x00000002,
 	0x00040047,0x00000077,0x00000022,0x00000000,0x00040047,0x00000077,0x00000021,0x00000001,
 	0x00040047,0x000000e6,0x00000022,0x00000000,0x00040047,0x000000e6,0x00000021,0x00000000,
 	0x00040047,0x000001bb,0x0000001e,0x00000000,0x00040047,0x000001be,0x0000001e,0x00000001,
@@ -41,237 +36,236 @@ const uint32_t VULKAN_PixelShader_Advanced[] = {
 	0x0006002c,0x0000000f,0x00000061,0x00000060,0x00000060,0x00000060,0x0004002b,0x00000006,
 	0x00000064,0x4196d000,0x0004002b,0x00000006,0x00000065,0x41958000,0x0004002b,0x00000006,
 	0x0000006c,0x461c4000,0x0004002b,0x00000006,0x00000071,0x40c8e06b,0x0006002c,0x0000000f,
-	0x00000072,0x00000071,0x00000071,0x00000071,0x000e001e,0x00000075,0x00000006,0x00000006,
-	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000018,0x00000018,
-	0x00000018,0x00000018,0x00040020,0x00000076,0x00000002,0x00000075,0x0004003b,0x00000076,
-	0x00000077,0x00000002,0x00040015,0x00000078,0x00000020,0x00000001,0x0004002b,0x00000078,
-	0x00000079,0x00000007,0x00040020,0x0000007a,0x00000002,0x00000006,0x0004002b,0x00000078,
-	0x00000081,0x00000004,0x0004002b,0x00000006,0x00000084,0x3f800000,0x0004002b,0x00000078,
-	0x00000088,0x00000005,0x0004002b,0x00000006,0x00000090,0x40000000,0x0004002b,0x00000078,
-	0x00000094,0x00000001,0x00040018,0x0000009b,0x0000000f,0x00000003,0x0004002b,0x00000006,
-	0x0000009c,0x3f209d8c,0x0004002b,0x00000006,0x0000009d,0x3ea897c8,0x0004002b,0x00000006,
-	0x0000009e,0x3d3168f9,0x0006002c,0x0000000f,0x0000009f,0x0000009c,0x0000009d,0x0000009e,
-	0x0004002b,0x00000006,0x000000a0,0x3d8d82ba,0x0004002b,0x00000006,0x000000a1,0x3f6b670a,
-	0x0004002b,0x00000006,0x000000a2,0x3c3a27af,0x0006002c,0x0000000f,0x000000a3,0x000000a0,
-	0x000000a1,0x000000a2,0x0004002b,0x00000006,0x000000a4,0x3c86466b,0x0004002b,0x00000006,
-	0x000000a5,0x3db44029,0x0004002b,0x00000006,0x000000a6,0x3f6545b7,0x0006002c,0x0000000f,
-	0x000000a7,0x000000a4,0x000000a5,0x000000a6,0x0006002c,0x0000009b,0x000000a8,0x0000009f,
-	0x000000a3,0x000000a7,0x0004002b,0x00000078,0x000000c1,0x00000006,0x0004002b,0x00000006,
-	0x000000d1,0x3fd48b22,0x0004002b,0x00000006,0x000000d2,0xbf1670a0,0x0004002b,0x00000006,
-	0x000000d3,0xbd952d23,0x0006002c,0x0000000f,0x000000d4,0x000000d1,0x000000d2,0x000000d3,
-	0x0004002b,0x00000006,0x000000d5,0xbdff127f,0x0004002b,0x00000006,0x000000d6,0x3f9102b4,
-	0x0004002b,0x00000006,0x000000d7,0xbc08c60d,0x0006002c,0x0000000f,0x000000d8,0x000000d5,
-	0x000000d6,0x000000d7,0x0004002b,0x00000006,0x000000d9,0xbc94b7b3,0x0004002b,0x00000006,
-	0x000000da,0xbdce05cd,0x0004002b,0x00000006,0x000000db,0x3f8f333c,0x0006002c,0x0000000f,
-	0x000000dc,0x000000d9,0x000000da,0x000000db,0x0006002c,0x0000009b,0x000000dd,0x000000d4,
-	0x000000d8,0x000000dc,0x00090019,0x000000e3,0x00000006,0x00000001,0x00000000,0x00000000,
-	0x00000000,0x00000001,0x00000000,0x0003001b,0x000000e4,0x000000e3,0x00040020,0x000000e5,
-	0x00000000,0x000000e4,0x0004003b,0x000000e5,0x000000e6,0x00000000,0x0004002b,0x00000078,
-	0x000000f2,0x00000002,0x0004002b,0x00000078,0x00000103,0x00000000,0x0004002b,0x00000006,
-	0x00000147,0x40400000,0x00040020,0x000001b6,0x00000001,0x00000018,0x00040020,0x000001ba,
-	0x00000001,0x00000019,0x0004003b,0x000001ba,0x000001bb,0x00000001,0x0004003b,0x000001b6,
-	0x000001be,0x00000001,0x00040020,0x000001c1,0x00000003,0x00000018,0x0004003b,0x000001c1,
-	0x000001c2,0x00000003,0x0006002c,0x0000000f,0x000003fa,0x0000005d,0x0000005d,0x0000005d,
-	0x0006002c,0x0000000f,0x000003fb,0x00000064,0x00000064,0x00000064,0x0006002c,0x0000000f,
-	0x00000400,0x00000084,0x00000084,0x00000084,0x0004002b,0x00000006,0x00000406,0x3f72a76f,
-	0x0004002b,0x00000006,0x00000407,0x3d9e8391,0x0004002b,0x00000006,0x00000409,0xbd6147ae,
-	0x00030001,0x00000018,0x0000043d,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,
-	0x000200f8,0x00000005,0x0004003d,0x00000019,0x000001bc,0x000001bb,0x0004003d,0x00000018,
-	0x000001bf,0x000001be,0x0004003d,0x000000e4,0x0000023c,0x000000e6,0x00050057,0x00000018,
-	0x0000023f,0x0000023c,0x000001bc,0x00050041,0x0000007a,0x000001d8,0x00000077,0x00000094,
-	0x0004003d,0x00000006,0x000001d9,0x000001d8,0x000500b4,0x00000033,0x000001da,0x000001d9,
-	0x00000147,0x000300f7,0x000001e5,0x00000000,0x000400fa,0x000001da,0x000001db,0x000001e5,
-	0x000200f8,0x000001db,0x0008004f,0x0000000f,0x000001dd,0x0000023f,0x0000023f,0x00000000,
-	0x00000001,0x00000002,0x0006000c,0x0000000f,0x00000246,0x00000001,0x00000004,0x000001dd,
-	0x0007000c,0x0000000f,0x00000247,0x00000001,0x0000001a,0x00000246,0x0000005b,0x00050083,
-	0x0000000f,0x00000249,0x00000247,0x000003fa,0x0007000c,0x0000000f,0x0000024a,0x00000001,
-	0x00000028,0x00000249,0x00000061,0x0006000c,0x0000000f,0x0000024c,0x00000001,0x00000004,
-	0x000001dd,0x0007000c,0x0000000f,0x0000024d,0x00000001,0x0000001a,0x0000024c,0x0000005b,
-	0x0005008e,0x0000000f,0x0000024e,0x0000024d,0x00000065,0x00050083,0x0000000f,0x00000250,
-	0x000003fb,0x0000024e,0x00050088,0x0000000f,0x00000253,0x0000024a,0x00000250,0x0006000c,
-	0x0000000f,0x00000254,0x00000001,0x00000004,0x00000253,0x0007000c,0x0000000f,0x00000255,
-	0x00000001,0x0000001a,0x00000254,0x00000072,0x0005008e,0x0000000f,0x00000256,0x00000255,
-	0x0000006c,0x00050041,0x0000007a,0x00000257,0x00000077,0x00000079,0x0004003d,0x00000006,
-	0x00000258,0x00000257,0x00060050,0x0000000f,0x00000259,0x00000258,0x00000258,0x00000258,
-	0x00050088,0x0000000f,0x0000025a,0x00000256,0x00000259,0x00050051,0x00000006,0x000001e0,
-	0x0000025a,0x00000000,0x00060052,0x00000018,0x000003a7,0x000001e0,0x0000023f,0x00000000,
-	0x00050051,0x00000006,0x000001e2,0x0000025a,0x00000001,0x00060052,0x00000018,0x000003a9,
-	0x000001e2,0x000003a7,0x00000001,0x00050051,0x00000006,0x000001e4,0x0000025a,0x00000002,
-	0x00060052,0x00000018,0x000003ab,0x000001e4,0x000003a9,0x00000002,0x000200f9,0x000001e5,
-	0x000200f8,0x000001e5,0x000700f5,0x00000018,0x0000040a,0x0000023f,0x00000005,0x000003ab,
-	0x000001db,0x00050041,0x0000007a,0x000001e6,0x00000077,0x00000081,0x0004003d,0x00000006,
-	0x000001e7,0x000001e6,0x000500b7,0x00000033,0x000001e8,0x000001e7,0x00000060,0x000300f7,
-	0x000001f3,0x00000000,0x000400fa,0x000001e8,0x000001e9,0x000001f3,0x000200f8,0x000001e9,
-	0x0008004f,0x0000000f,0x000001eb,0x0000040a,0x0000040a,0x00000000,0x00000001,0x00000002,
-	0x00050041,0x0000007a,0x0000025f,0x00000077,0x00000081,0x0004003d,0x00000006,0x00000260,
-	0x0000025f,0x000500b4,0x00000033,0x00000261,0x00000260,0x00000084,0x000300f7,0x00000295,
-	0x00000000,0x000400fa,0x00000261,0x00000262,0x00000267,0x000200f8,0x00000262,0x00050041,
-	0x0000007a,0x00000263,0x00000077,0x00000088,0x0004003d,0x00000006,0x00000264,0x00000263,
-	0x0005008e,0x0000000f,0x00000266,0x000001eb,0x00000264,0x000200f9,0x00000295,0x000200f8,
-	0x00000267,0x00050041,0x0000007a,0x00000268,0x00000077,0x00000081,0x0004003d,0x00000006,
-	0x00000269,0x00000268,0x000500b4,0x00000033,0x0000026a,0x00000269,0x00000090,0x000300f7,
-	0x00000294,0x00000000,0x000400fa,0x0000026a,0x0000026b,0x00000294,0x000200f8,0x0000026b,
-	0x00050041,0x0000007a,0x0000026c,0x00000077,0x00000094,0x0004003d,0x00000006,0x0000026d,
-	0x0000026c,0x000500b4,0x00000033,0x0000026e,0x0000026d,0x00000090,0x000300f7,0x00000272,
-	0x00000000,0x000400fa,0x0000026e,0x0000026f,0x00000272,0x000200f8,0x0000026f,0x00050090,
-	0x0000000f,0x00000271,0x000001eb,0x000000a8,0x000200f9,0x00000272,0x000200f8,0x00000272,
-	0x000700f5,0x0000000f,0x0000040b,0x000001eb,0x0000026b,0x00000271,0x0000026f,0x00050051,
-	0x00000006,0x00000274,0x0000040b,0x00000000,0x00050051,0x00000006,0x00000276,0x0000040b,
-	0x00000001,0x00050051,0x00000006,0x00000278,0x0000040b,0x00000002,0x0007000c,0x00000006,
-	0x00000279,0x00000001,0x00000028,0x00000276,0x00000278,0x0007000c,0x00000006,0x0000027a,
-	0x00000001,0x00000028,0x00000274,0x00000279,0x000500ba,0x00000033,0x0000027c,0x0000027a,
-	0x00000060,0x000300f7,0x0000028c,0x00000000,0x000400fa,0x0000027c,0x0000027d,0x0000028c,
-	0x000200f8,0x0000027d,0x00050041,0x0000007a,0x0000027e,0x00000077,0x00000088,0x0004003d,
-	0x00000006,0x0000027f,0x0000027e,0x0008000c,0x00000006,0x00000282,0x00000001,0x00000032,
-	0x0000027f,0x0000027a,0x00000084,0x00050041,0x0000007a,0x00000283,0x00000077,0x000000c1,
-	0x0004003d,0x00000006,0x00000284,0x00000283,0x0008000c,0x00000006,0x00000287,0x00000001,
-	0x00000032,0x00000284,0x0000027a,0x00000084,0x00050088,0x00000006,0x00000288,0x00000282,
-	0x00000287,0x0005008e,0x0000000f,0x0000028b,0x0000040b,0x00000288,0x000200f9,0x0000028c,
-	0x000200f8,0x0000028c,0x000700f5,0x0000000f,0x0000040c,0x0000040b,0x00000272,0x0000028b,
-	0x0000027d,0x00050041,0x0000007a,0x0000028d,0x00000077,0x00000094,0x0004003d,0x00000006,
-	0x0000028e,0x0000028d,0x000500b4,0x00000033,0x0000028f,0x0000028e,0x00000090,0x000300f7,
-	0x00000293,0x00000000,0x000400fa,0x0000028f,0x00000290,0x00000293,0x000200f8,0x00000290,
-	0x00050090,0x0000000f,0x00000292,0x0000040c,0x000000dd,0x000200f9,0x00000293,0x000200f8,
-	0x00000293,0x000700f5,0x0000000f,0x0000040f,0x0000040c,0x0000028c,0x00000292,0x00000290,
-	0x000200f9,0x00000294,0x000200f8,0x00000294,0x000700f5,0x0000000f,0x0000040e,0x000001eb,
-	0x00000267,0x0000040f,0x00000293,0x000200f9,0x00000295,0x000200f8,0x00000295,0x000700f5,
-	0x0000000f,0x0000040d,0x00000266,0x00000262,0x0000040e,0x00000294,0x00050051,0x00000006,
-	0x000001ee,0x0000040d,0x00000000,0x00060052,0x00000018,0x000003b0,0x000001ee,0x0000040a,
-	0x00000000,0x00050051,0x00000006,0x000001f0,0x0000040d,0x00000001,0x00060052,0x00000018,
-	0x000003b2,0x000001f0,0x000003b0,0x00000001,0x00050051,0x00000006,0x000001f2,0x0000040d,
-	0x00000002,0x00060052,0x00000018,0x000003b4,0x000001f2,0x000003b2,0x00000002,0x000200f9,
-	0x000001f3,0x000200f8,0x000001f3,0x000700f5,0x00000018,0x00000415,0x0000040a,0x000001e5,
-	0x000003b4,0x00000295,0x00050041,0x0000007a,0x000001f4,0x00000077,0x00000094,0x0004003d,
-	0x00000006,0x000001f5,0x000001f4,0x000500b4,0x00000033,0x000001f6,0x000001f5,0x00000084,
-	0x000300f7,0x00000234,0x00000000,0x000400fa,0x000001f6,0x000001f7,0x00000204,0x000200f8,
-	0x000001f7,0x0008004f,0x0000000f,0x000001f9,0x00000415,0x00000415,0x00000000,0x00000001,
-	0x00000002,0x00050041,0x0000007a,0x0000029d,0x00000077,0x00000103,0x0004003d,0x00000006,
-	0x0000029e,0x0000029d,0x000500b7,0x00000033,0x0000029f,0x0000029e,0x00000060,0x000300f7,
-	0x000002ad,0x00000000,0x000400fa,0x0000029f,0x000002a0,0x000002ad,0x000200f8,0x000002a0,
-	0x00050051,0x00000006,0x000002a2,0x00000415,0x00000000,0x000500bc,0x00000033,0x000002b6,
-	0x000002a2,0x00000032,0x000300f7,0x000002c0,0x00000000,0x000400fa,0x000002b6,0x000002b7,
-	0x000002ba,0x000200f8,0x000002b7,0x00050085,0x00000006,0x000002b9,0x000002a2,0x00000407,
-	0x000200f9,0x000002c0,0x000200f8,0x000002ba,0x00050081,0x00000006,0x000002bc,0x000002a2,
-	0x0000003c,0x0006000c,0x00000006,0x000002bd,0x00000001,0x00000004,0x000002bc,0x00050085,
-	0x00000006,0x000002be,0x000002bd,0x00000406,0x0007000c,0x00000006,0x000002bf,0x00000001,
-	0x0000001a,0x000002be,0x00000041,0x000200f9,0x000002c0,0x000200f8,0x000002c0,0x000700f5,
-	0x00000006,0x0000042c,0x000002b9,0x000002b7,0x000002bf,0x000002ba,0x00050051,0x00000006,
-	0x000002a6,0x00000415,0x00000001,0x000500bc,0x00000033,0x000002c5,0x000002a6,0x00000032,
-	0x000300f7,0x000002cf,0x00000000,0x000400fa,0x000002c5,0x000002c6,0x000002c9,0x000200f8,
-	0x000002c6,0x00050085,0x00000006,0x000002c8,0x000002a6,0x00000407,0x000200f9,0x000002cf,
-	0x000200f8,0x000002c9,0x00050081,0x00000006,0x000002cb,0x000002a6,0x0000003c,0x0006000c,
-	0x00000006,0x000002cc,0x00000001,0x00000004,0x000002cb,0x00050085,0x00000006,0x000002cd,
-	0x000002cc,0x00000406,0x0007000c,0x00000006,0x000002ce,0x00000001,0x0000001a,0x000002cd,
-	0x00000041,0x000200f9,0x000002cf,0x000200f8,0x000002cf,0x000700f5,0x00000006,0x0000042e,
-	0x000002c8,0x000002c6,0x000002ce,0x000002c9,0x00050051,0x00000006,0x000002aa,0x00000415,
-	0x00000002,0x000500bc,0x00000033,0x000002d4,0x000002aa,0x00000032,0x000300f7,0x000002de,
-	0x00000000,0x000400fa,0x000002d4,0x000002d5,0x000002d8,0x000200f8,0x000002d5,0x00050085,
-	0x00000006,0x000002d7,0x000002aa,0x00000407,0x000200f9,0x000002de,0x000200f8,0x000002d8,
-	0x00050081,0x00000006,0x000002da,0x000002aa,0x0000003c,0x0006000c,0x00000006,0x000002db,
-	0x00000001,0x00000004,0x000002da,0x00050085,0x00000006,0x000002dc,0x000002db,0x00000406,
-	0x0007000c,0x00000006,0x000002dd,0x00000001,0x0000001a,0x000002dc,0x00000041,0x000200f9,
-	0x000002de,0x000200f8,0x000002de,0x000700f5,0x00000006,0x00000430,0x000002d7,0x000002d5,
-	0x000002dd,0x000002d8,0x00060050,0x0000000f,0x0000043c,0x0000042c,0x0000042e,0x00000430,
-	0x000200f9,0x000002ad,0x000200f8,0x000002ad,0x000700f5,0x0000000f,0x00000432,0x000001f9,
-	0x000001f7,0x0000043c,0x000002de,0x00050041,0x0000007a,0x000002af,0x00000077,0x000000f2,
-	0x0004003d,0x00000006,0x000002b0,0x000002af,0x0005008e,0x0000000f,0x000002b1,0x00000432,
-	0x000002b0,0x00050051,0x00000006,0x000001fc,0x000002b1,0x00000000,0x00050051,0x00000006,
-	0x000001fe,0x000002b1,0x00000001,0x00050051,0x00000006,0x00000200,0x000002b1,0x00000002,
-	0x00050051,0x00000006,0x00000202,0x00000415,0x00000003,0x00070050,0x00000018,0x00000408,
-	0x000001fc,0x000001fe,0x00000200,0x00000202,0x000200f9,0x00000234,0x000200f8,0x00000204,
-	0x00050041,0x0000007a,0x00000205,0x00000077,0x00000094,0x0004003d,0x00000006,0x00000206,
-	0x00000205,0x000500b4,0x00000033,0x00000207,0x00000206,0x00000090,0x000300f7,0x00000233,
-	0x00000000,0x000400fa,0x00000207,0x00000208,0x00000215,0x000200f8,0x00000208,0x0008004f,
-	0x0000000f,0x0000020a,0x00000415,0x00000415,0x00000000,0x00000001,0x00000002,0x00050041,
-	0x0000007a,0x000002e7,0x00000077,0x000000f2,0x0004003d,0x00000006,0x000002e8,0x000002e7,
-	0x0005008e,0x0000000f,0x000002e9,0x0000020a,0x000002e8,0x00050041,0x0000007a,0x000002ea,
-	0x00000077,0x00000103,0x0004003d,0x00000006,0x000002eb,0x000002ea,0x000500b7,0x00000033,
-	0x000002ec,0x000002eb,0x00000060,0x000400a8,0x00000033,0x000002ed,0x000002ec,0x000300f7,
-	0x000002ff,0x00000000,0x000400fa,0x000002ed,0x000002ee,0x000002ff,0x000200f8,0x000002ee,
-	0x00050051,0x00000006,0x000002f0,0x000002e9,0x00000000,0x000500bc,0x00000033,0x00000304,
-	0x000002f0,0x00000047,0x000300f7,0x0000030e,0x00000000,0x000400fa,0x00000304,0x00000305,
-	0x00000308,0x000200f8,0x00000305,0x00050085,0x00000006,0x00000307,0x000002f0,0x00000038,
-	0x000200f9,0x0000030e,0x000200f8,0x00000308,0x0006000c,0x00000006,0x0000030a,0x00000001,
-	0x00000004,0x000002f0,0x0007000c,0x00000006,0x0000030b,0x00000001,0x0000001a,0x0000030a,
-	0x00000050,0x0008000c,0x00000006,0x0000030d,0x00000001,0x00000032,0x0000030b,0x0000003f,
-	0x00000409,0x000200f9,0x0000030e,0x000200f8,0x0000030e,0x000700f5,0x00000006,0x00000421,
-	0x00000307,0x00000305,0x0000030d,0x00000308,0x00050051,0x00000006,0x000002f4,0x000002e9,
-	0x00000001,0x000500bc,0x00000033,0x00000313,0x000002f4,0x00000047,0x000300f7,0x0000031d,
-	0x00000000,0x000400fa,0x00000313,0x00000314,0x00000317,0x000200f8,0x00000314,0x00050085,
-	0x00000006,0x00000316,0x000002f4,0x00000038,0x000200f9,0x0000031d,0x000200f8,0x00000317,
-	0x0006000c,0x00000006,0x00000319,0x00000001,0x00000004,0x000002f4,0x0007000c,0x00000006,
-	0x0000031a,0x00000001,0x0000001a,0x00000319,0x00000050,0x0008000c,0x00000006,0x0000031c,
-	0x00000001,0x00000032,0x0000031a,0x0000003f,0x00000409,0x000200f9,0x0000031d,0x000200f8,
-	0x0000031d,0x000700f5,0x00000006,0x00000423,0x00000316,0x00000314,0x0000031c,0x00000317,
-	0x00050051,0x00000006,0x000002f8,0x000002e9,0x00000002,0x000500bc,0x00000033,0x00000322,
-	0x000002f8,0x00000047,0x000300f7,0x0000032c,0x00000000,0x000400fa,0x00000322,0x00000323,
-	0x00000326,0x000200f8,0x00000323,0x00050085,0x00000006,0x00000325,0x000002f8,0x00000038,
-	0x000200f9,0x0000032c,0x000200f8,0x00000326,0x0006000c,0x00000006,0x00000328,0x00000001,
-	0x00000004,0x000002f8,0x0007000c,0x00000006,0x00000329,0x00000001,0x0000001a,0x00000328,
-	0x00000050,0x0008000c,0x00000006,0x0000032b,0x00000001,0x00000032,0x00000329,0x0000003f,
-	0x00000409,0x000200f9,0x0000032c,0x000200f8,0x0000032c,0x000700f5,0x00000006,0x00000425,
-	0x00000325,0x00000323,0x0000032b,0x00000326,0x00060050,0x0000000f,0x0000043b,0x00000421,
-	0x00000423,0x00000425,0x0008000c,0x0000000f,0x000002fe,0x00000001,0x0000002b,0x0000043b,
-	0x00000061,0x00000400,0x000200f9,0x000002ff,0x000200f8,0x000002ff,0x000700f5,0x0000000f,
-	0x00000427,0x000002e9,0x00000208,0x000002fe,0x0000032c,0x00050051,0x00000006,0x0000020d,
-	0x00000427,0x00000000,0x00050051,0x00000006,0x0000020f,0x00000427,0x00000001,0x00050051,
-	0x00000006,0x00000211,0x00000427,0x00000002,0x00050051,0x00000006,0x00000213,0x00000415,
-	0x00000003,0x00070050,0x00000018,0x00000405,0x0000020d,0x0000020f,0x00000211,0x00000213,
-	0x000200f9,0x00000233,0x000200f8,0x00000215,0x00050041,0x0000007a,0x00000216,0x00000077,
-	0x00000094,0x0004003d,0x00000006,0x00000217,0x00000216,0x000500b4,0x00000033,0x00000218,
-	0x00000217,0x00000147,0x000300f7,0x00000232,0x00000000,0x000400fa,0x00000218,0x00000219,
-	0x0000022f,0x000200f8,0x00000219,0x0008004f,0x0000000f,0x0000021b,0x00000415,0x00000415,
-	0x00000000,0x00000001,0x00000002,0x00050090,0x0000000f,0x0000021c,0x0000021b,0x000000dd,
-	0x00050051,0x00000006,0x0000021e,0x0000021c,0x00000000,0x00060052,0x00000018,0x000003da,
-	0x0000021e,0x0000043d,0x00000000,0x00050051,0x00000006,0x00000220,0x0000021c,0x00000001,
-	0x00060052,0x00000018,0x000003dc,0x00000220,0x000003da,0x00000001,0x00050051,0x00000006,
-	0x00000222,0x0000021c,0x00000002,0x00060052,0x00000018,0x000003de,0x00000222,0x000003dc,
-	0x00000002,0x0008004f,0x0000000f,0x00000224,0x000003de,0x000003de,0x00000000,0x00000001,
-	0x00000002,0x00050041,0x0000007a,0x00000335,0x00000077,0x000000f2,0x0004003d,0x00000006,
-	0x00000336,0x00000335,0x0005008e,0x0000000f,0x00000337,0x00000224,0x00000336,0x00050041,
-	0x0000007a,0x00000338,0x00000077,0x00000103,0x0004003d,0x00000006,0x00000339,0x00000338,
-	0x000500b7,0x00000033,0x0000033a,0x00000339,0x00000060,0x000400a8,0x00000033,0x0000033b,
-	0x0000033a,0x000300f7,0x0000034d,0x00000000,0x000400fa,0x0000033b,0x0000033c,0x0000034d,
-	0x000200f8,0x0000033c,0x00050051,0x00000006,0x0000033e,0x00000337,0x00000000,0x000500bc,
-	0x00000033,0x00000352,0x0000033e,0x00000047,0x000300f7,0x0000035c,0x00000000,0x000400fa,
-	0x00000352,0x00000353,0x00000356,0x000200f8,0x00000353,0x00050085,0x00000006,0x00000355,
-	0x0000033e,0x00000038,0x000200f9,0x0000035c,0x000200f8,0x00000356,0x0006000c,0x00000006,
-	0x00000358,0x00000001,0x00000004,0x0000033e,0x0007000c,0x00000006,0x00000359,0x00000001,
-	0x0000001a,0x00000358,0x00000050,0x0008000c,0x00000006,0x0000035b,0x00000001,0x00000032,
-	0x00000359,0x0000003f,0x00000409,0x000200f9,0x0000035c,0x000200f8,0x0000035c,0x000700f5,
-	0x00000006,0x00000416,0x00000355,0x00000353,0x0000035b,0x00000356,0x00050051,0x00000006,
-	0x00000342,0x00000337,0x00000001,0x000500bc,0x00000033,0x00000361,0x00000342,0x00000047,
-	0x000300f7,0x0000036b,0x00000000,0x000400fa,0x00000361,0x00000362,0x00000365,0x000200f8,
-	0x00000362,0x00050085,0x00000006,0x00000364,0x00000342,0x00000038,0x000200f9,0x0000036b,
-	0x000200f8,0x00000365,0x0006000c,0x00000006,0x00000367,0x00000001,0x00000004,0x00000342,
-	0x0007000c,0x00000006,0x00000368,0x00000001,0x0000001a,0x00000367,0x00000050,0x0008000c,
-	0x00000006,0x0000036a,0x00000001,0x00000032,0x00000368,0x0000003f,0x00000409,0x000200f9,
-	0x0000036b,0x000200f8,0x0000036b,0x000700f5,0x00000006,0x00000418,0x00000364,0x00000362,
-	0x0000036a,0x00000365,0x00050051,0x00000006,0x00000346,0x00000337,0x00000002,0x000500bc,
-	0x00000033,0x00000370,0x00000346,0x00000047,0x000300f7,0x0000037a,0x00000000,0x000400fa,
-	0x00000370,0x00000371,0x00000374,0x000200f8,0x00000371,0x00050085,0x00000006,0x00000373,
-	0x00000346,0x00000038,0x000200f9,0x0000037a,0x000200f8,0x00000374,0x0006000c,0x00000006,
-	0x00000376,0x00000001,0x00000004,0x00000346,0x0007000c,0x00000006,0x00000377,0x00000001,
-	0x0000001a,0x00000376,0x00000050,0x0008000c,0x00000006,0x00000379,0x00000001,0x00000032,
-	0x00000377,0x0000003f,0x00000409,0x000200f9,0x0000037a,0x000200f8,0x0000037a,0x000700f5,
-	0x00000006,0x0000041a,0x00000373,0x00000371,0x00000379,0x00000374,0x00060050,0x0000000f,
-	0x0000043a,0x00000416,0x00000418,0x0000041a,0x0008000c,0x0000000f,0x0000034c,0x00000001,
-	0x0000002b,0x0000043a,0x00000061,0x00000400,0x000200f9,0x0000034d,0x000200f8,0x0000034d,
-	0x000700f5,0x0000000f,0x0000041c,0x00000337,0x00000219,0x0000034c,0x0000037a,0x00050051,
-	0x00000006,0x00000227,0x0000041c,0x00000000,0x00050051,0x00000006,0x00000229,0x0000041c,
-	0x00000001,0x00050051,0x00000006,0x0000022b,0x0000041c,0x00000002,0x00050051,0x00000006,
-	0x0000022d,0x00000415,0x00000003,0x00070050,0x00000018,0x00000401,0x00000227,0x00000229,
-	0x0000022b,0x0000022d,0x000200f9,0x00000232,0x000200f8,0x0000022f,0x0008004f,0x0000000f,
-	0x00000380,0x00000415,0x00000415,0x00000000,0x00000001,0x00000002,0x00050041,0x0000007a,
-	0x00000381,0x00000077,0x000000f2,0x0004003d,0x00000006,0x00000382,0x00000381,0x0005008e,
-	0x0000000f,0x00000383,0x00000380,0x00000382,0x00050051,0x00000006,0x00000385,0x00000383,
-	0x00000000,0x00050051,0x00000006,0x00000387,0x00000383,0x00000001,0x00050051,0x00000006,
-	0x00000389,0x00000383,0x00000002,0x00050051,0x00000006,0x0000038b,0x00000415,0x00000003,
-	0x00070050,0x00000018,0x000003fc,0x00000385,0x00000387,0x00000389,0x0000038b,0x000200f9,
-	0x00000232,0x000200f8,0x00000232,0x000700f5,0x00000018,0x00000439,0x00000401,0x0000034d,
-	0x000003fc,0x0000022f,0x000200f9,0x00000233,0x000200f8,0x00000233,0x000700f5,0x00000018,
-	0x00000438,0x00000405,0x000002ff,0x00000439,0x00000232,0x000200f9,0x00000234,0x000200f8,
-	0x00000234,0x000700f5,0x00000018,0x00000437,0x00000408,0x000002ad,0x00000438,0x00000233,
-	0x00050085,0x00000018,0x00000238,0x00000437,0x000001bf,0x0003003e,0x000001c2,0x00000238,
-	0x000100fd,0x00010038
+	0x00000072,0x00000071,0x00000071,0x00000071,0x000a001e,0x00000075,0x00000006,0x00000006,
+	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00040020,0x00000076,
+	0x00000002,0x00000075,0x0004003b,0x00000076,0x00000077,0x00000002,0x00040015,0x00000078,
+	0x00000020,0x00000001,0x0004002b,0x00000078,0x00000079,0x00000007,0x00040020,0x0000007a,
+	0x00000002,0x00000006,0x0004002b,0x00000078,0x00000081,0x00000004,0x0004002b,0x00000006,
+	0x00000084,0x3f800000,0x0004002b,0x00000078,0x00000088,0x00000005,0x0004002b,0x00000006,
+	0x00000090,0x40000000,0x0004002b,0x00000078,0x00000094,0x00000001,0x00040018,0x0000009b,
+	0x0000000f,0x00000003,0x0004002b,0x00000006,0x0000009c,0x3f209d8c,0x0004002b,0x00000006,
+	0x0000009d,0x3ea897c8,0x0004002b,0x00000006,0x0000009e,0x3d3168f9,0x0006002c,0x0000000f,
+	0x0000009f,0x0000009c,0x0000009d,0x0000009e,0x0004002b,0x00000006,0x000000a0,0x3d8d82ba,
+	0x0004002b,0x00000006,0x000000a1,0x3f6b670a,0x0004002b,0x00000006,0x000000a2,0x3c3a27af,
+	0x0006002c,0x0000000f,0x000000a3,0x000000a0,0x000000a1,0x000000a2,0x0004002b,0x00000006,
+	0x000000a4,0x3c86466b,0x0004002b,0x00000006,0x000000a5,0x3db44029,0x0004002b,0x00000006,
+	0x000000a6,0x3f6545b7,0x0006002c,0x0000000f,0x000000a7,0x000000a4,0x000000a5,0x000000a6,
+	0x0006002c,0x0000009b,0x000000a8,0x0000009f,0x000000a3,0x000000a7,0x0004002b,0x00000078,
+	0x000000c1,0x00000006,0x0004002b,0x00000006,0x000000d1,0x3fd48b22,0x0004002b,0x00000006,
+	0x000000d2,0xbf1670a0,0x0004002b,0x00000006,0x000000d3,0xbd952d23,0x0006002c,0x0000000f,
+	0x000000d4,0x000000d1,0x000000d2,0x000000d3,0x0004002b,0x00000006,0x000000d5,0xbdff127f,
+	0x0004002b,0x00000006,0x000000d6,0x3f9102b4,0x0004002b,0x00000006,0x000000d7,0xbc08c60d,
+	0x0006002c,0x0000000f,0x000000d8,0x000000d5,0x000000d6,0x000000d7,0x0004002b,0x00000006,
+	0x000000d9,0xbc94b7b3,0x0004002b,0x00000006,0x000000da,0xbdce05cd,0x0004002b,0x00000006,
+	0x000000db,0x3f8f333c,0x0006002c,0x0000000f,0x000000dc,0x000000d9,0x000000da,0x000000db,
+	0x0006002c,0x0000009b,0x000000dd,0x000000d4,0x000000d8,0x000000dc,0x00090019,0x000000e3,
+	0x00000006,0x00000001,0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,
+	0x000000e4,0x000000e3,0x00040020,0x000000e5,0x00000000,0x000000e4,0x0004003b,0x000000e5,
+	0x000000e6,0x00000000,0x0004002b,0x00000078,0x000000f2,0x00000002,0x0004002b,0x00000078,
+	0x00000103,0x00000000,0x0004002b,0x00000006,0x00000147,0x40400000,0x00040020,0x000001b6,
+	0x00000001,0x00000018,0x00040020,0x000001ba,0x00000001,0x00000019,0x0004003b,0x000001ba,
+	0x000001bb,0x00000001,0x0004003b,0x000001b6,0x000001be,0x00000001,0x00040020,0x000001c1,
+	0x00000003,0x00000018,0x0004003b,0x000001c1,0x000001c2,0x00000003,0x0006002c,0x0000000f,
+	0x000003fa,0x0000005d,0x0000005d,0x0000005d,0x0006002c,0x0000000f,0x000003fb,0x00000064,
+	0x00000064,0x00000064,0x0006002c,0x0000000f,0x00000400,0x00000084,0x00000084,0x00000084,
+	0x0004002b,0x00000006,0x00000406,0x3f72a76f,0x0004002b,0x00000006,0x00000407,0x3d9e8391,
+	0x0004002b,0x00000006,0x00000409,0xbd6147ae,0x00030001,0x00000018,0x0000043d,0x00050036,
+	0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003d,0x00000019,
+	0x000001bc,0x000001bb,0x0004003d,0x00000018,0x000001bf,0x000001be,0x0004003d,0x000000e4,
+	0x0000023c,0x000000e6,0x00050057,0x00000018,0x0000023f,0x0000023c,0x000001bc,0x00050041,
+	0x0000007a,0x000001d8,0x00000077,0x00000094,0x0004003d,0x00000006,0x000001d9,0x000001d8,
+	0x000500b4,0x00000033,0x000001da,0x000001d9,0x00000147,0x000300f7,0x000001e5,0x00000000,
+	0x000400fa,0x000001da,0x000001db,0x000001e5,0x000200f8,0x000001db,0x0008004f,0x0000000f,
+	0x000001dd,0x0000023f,0x0000023f,0x00000000,0x00000001,0x00000002,0x0006000c,0x0000000f,
+	0x00000246,0x00000001,0x00000004,0x000001dd,0x0007000c,0x0000000f,0x00000247,0x00000001,
+	0x0000001a,0x00000246,0x0000005b,0x00050083,0x0000000f,0x00000249,0x00000247,0x000003fa,
+	0x0007000c,0x0000000f,0x0000024a,0x00000001,0x00000028,0x00000249,0x00000061,0x0006000c,
+	0x0000000f,0x0000024c,0x00000001,0x00000004,0x000001dd,0x0007000c,0x0000000f,0x0000024d,
+	0x00000001,0x0000001a,0x0000024c,0x0000005b,0x0005008e,0x0000000f,0x0000024e,0x0000024d,
+	0x00000065,0x00050083,0x0000000f,0x00000250,0x000003fb,0x0000024e,0x00050088,0x0000000f,
+	0x00000253,0x0000024a,0x00000250,0x0006000c,0x0000000f,0x00000254,0x00000001,0x00000004,
+	0x00000253,0x0007000c,0x0000000f,0x00000255,0x00000001,0x0000001a,0x00000254,0x00000072,
+	0x0005008e,0x0000000f,0x00000256,0x00000255,0x0000006c,0x00050041,0x0000007a,0x00000257,
+	0x00000077,0x00000079,0x0004003d,0x00000006,0x00000258,0x00000257,0x00060050,0x0000000f,
+	0x00000259,0x00000258,0x00000258,0x00000258,0x00050088,0x0000000f,0x0000025a,0x00000256,
+	0x00000259,0x00050051,0x00000006,0x000001e0,0x0000025a,0x00000000,0x00060052,0x00000018,
+	0x000003a7,0x000001e0,0x0000023f,0x00000000,0x00050051,0x00000006,0x000001e2,0x0000025a,
+	0x00000001,0x00060052,0x00000018,0x000003a9,0x000001e2,0x000003a7,0x00000001,0x00050051,
+	0x00000006,0x000001e4,0x0000025a,0x00000002,0x00060052,0x00000018,0x000003ab,0x000001e4,
+	0x000003a9,0x00000002,0x000200f9,0x000001e5,0x000200f8,0x000001e5,0x000700f5,0x00000018,
+	0x0000040a,0x0000023f,0x00000005,0x000003ab,0x000001db,0x00050041,0x0000007a,0x000001e6,
+	0x00000077,0x00000081,0x0004003d,0x00000006,0x000001e7,0x000001e6,0x000500b7,0x00000033,
+	0x000001e8,0x000001e7,0x00000060,0x000300f7,0x000001f3,0x00000000,0x000400fa,0x000001e8,
+	0x000001e9,0x000001f3,0x000200f8,0x000001e9,0x0008004f,0x0000000f,0x000001eb,0x0000040a,
+	0x0000040a,0x00000000,0x00000001,0x00000002,0x00050041,0x0000007a,0x0000025f,0x00000077,
+	0x00000081,0x0004003d,0x00000006,0x00000260,0x0000025f,0x000500b4,0x00000033,0x00000261,
+	0x00000260,0x00000084,0x000300f7,0x00000295,0x00000000,0x000400fa,0x00000261,0x00000262,
+	0x00000267,0x000200f8,0x00000262,0x00050041,0x0000007a,0x00000263,0x00000077,0x00000088,
+	0x0004003d,0x00000006,0x00000264,0x00000263,0x0005008e,0x0000000f,0x00000266,0x000001eb,
+	0x00000264,0x000200f9,0x00000295,0x000200f8,0x00000267,0x00050041,0x0000007a,0x00000268,
+	0x00000077,0x00000081,0x0004003d,0x00000006,0x00000269,0x00000268,0x000500b4,0x00000033,
+	0x0000026a,0x00000269,0x00000090,0x000300f7,0x00000294,0x00000000,0x000400fa,0x0000026a,
+	0x0000026b,0x00000294,0x000200f8,0x0000026b,0x00050041,0x0000007a,0x0000026c,0x00000077,
+	0x00000094,0x0004003d,0x00000006,0x0000026d,0x0000026c,0x000500b4,0x00000033,0x0000026e,
+	0x0000026d,0x00000090,0x000300f7,0x00000272,0x00000000,0x000400fa,0x0000026e,0x0000026f,
+	0x00000272,0x000200f8,0x0000026f,0x00050090,0x0000000f,0x00000271,0x000001eb,0x000000a8,
+	0x000200f9,0x00000272,0x000200f8,0x00000272,0x000700f5,0x0000000f,0x0000040b,0x000001eb,
+	0x0000026b,0x00000271,0x0000026f,0x00050051,0x00000006,0x00000274,0x0000040b,0x00000000,
+	0x00050051,0x00000006,0x00000276,0x0000040b,0x00000001,0x00050051,0x00000006,0x00000278,
+	0x0000040b,0x00000002,0x0007000c,0x00000006,0x00000279,0x00000001,0x00000028,0x00000276,
+	0x00000278,0x0007000c,0x00000006,0x0000027a,0x00000001,0x00000028,0x00000274,0x00000279,
+	0x000500ba,0x00000033,0x0000027c,0x0000027a,0x00000060,0x000300f7,0x0000028c,0x00000000,
+	0x000400fa,0x0000027c,0x0000027d,0x0000028c,0x000200f8,0x0000027d,0x00050041,0x0000007a,
+	0x0000027e,0x00000077,0x00000088,0x0004003d,0x00000006,0x0000027f,0x0000027e,0x0008000c,
+	0x00000006,0x00000282,0x00000001,0x00000032,0x0000027f,0x0000027a,0x00000084,0x00050041,
+	0x0000007a,0x00000283,0x00000077,0x000000c1,0x0004003d,0x00000006,0x00000284,0x00000283,
+	0x0008000c,0x00000006,0x00000287,0x00000001,0x00000032,0x00000284,0x0000027a,0x00000084,
+	0x00050088,0x00000006,0x00000288,0x00000282,0x00000287,0x0005008e,0x0000000f,0x0000028b,
+	0x0000040b,0x00000288,0x000200f9,0x0000028c,0x000200f8,0x0000028c,0x000700f5,0x0000000f,
+	0x0000040c,0x0000040b,0x00000272,0x0000028b,0x0000027d,0x00050041,0x0000007a,0x0000028d,
+	0x00000077,0x00000094,0x0004003d,0x00000006,0x0000028e,0x0000028d,0x000500b4,0x00000033,
+	0x0000028f,0x0000028e,0x00000090,0x000300f7,0x00000293,0x00000000,0x000400fa,0x0000028f,
+	0x00000290,0x00000293,0x000200f8,0x00000290,0x00050090,0x0000000f,0x00000292,0x0000040c,
+	0x000000dd,0x000200f9,0x00000293,0x000200f8,0x00000293,0x000700f5,0x0000000f,0x0000040f,
+	0x0000040c,0x0000028c,0x00000292,0x00000290,0x000200f9,0x00000294,0x000200f8,0x00000294,
+	0x000700f5,0x0000000f,0x0000040e,0x000001eb,0x00000267,0x0000040f,0x00000293,0x000200f9,
+	0x00000295,0x000200f8,0x00000295,0x000700f5,0x0000000f,0x0000040d,0x00000266,0x00000262,
+	0x0000040e,0x00000294,0x00050051,0x00000006,0x000001ee,0x0000040d,0x00000000,0x00060052,
+	0x00000018,0x000003b0,0x000001ee,0x0000040a,0x00000000,0x00050051,0x00000006,0x000001f0,
+	0x0000040d,0x00000001,0x00060052,0x00000018,0x000003b2,0x000001f0,0x000003b0,0x00000001,
+	0x00050051,0x00000006,0x000001f2,0x0000040d,0x00000002,0x00060052,0x00000018,0x000003b4,
+	0x000001f2,0x000003b2,0x00000002,0x000200f9,0x000001f3,0x000200f8,0x000001f3,0x000700f5,
+	0x00000018,0x00000415,0x0000040a,0x000001e5,0x000003b4,0x00000295,0x00050041,0x0000007a,
+	0x000001f4,0x00000077,0x00000094,0x0004003d,0x00000006,0x000001f5,0x000001f4,0x000500b4,
+	0x00000033,0x000001f6,0x000001f5,0x00000084,0x000300f7,0x00000234,0x00000000,0x000400fa,
+	0x000001f6,0x000001f7,0x00000204,0x000200f8,0x000001f7,0x0008004f,0x0000000f,0x000001f9,
+	0x00000415,0x00000415,0x00000000,0x00000001,0x00000002,0x00050041,0x0000007a,0x0000029d,
+	0x00000077,0x00000103,0x0004003d,0x00000006,0x0000029e,0x0000029d,0x000500b7,0x00000033,
+	0x0000029f,0x0000029e,0x00000060,0x000300f7,0x000002ad,0x00000000,0x000400fa,0x0000029f,
+	0x000002a0,0x000002ad,0x000200f8,0x000002a0,0x00050051,0x00000006,0x000002a2,0x00000415,
+	0x00000000,0x000500bc,0x00000033,0x000002b6,0x000002a2,0x00000032,0x000300f7,0x000002c0,
+	0x00000000,0x000400fa,0x000002b6,0x000002b7,0x000002ba,0x000200f8,0x000002b7,0x00050085,
+	0x00000006,0x000002b9,0x000002a2,0x00000407,0x000200f9,0x000002c0,0x000200f8,0x000002ba,
+	0x00050081,0x00000006,0x000002bc,0x000002a2,0x0000003c,0x0006000c,0x00000006,0x000002bd,
+	0x00000001,0x00000004,0x000002bc,0x00050085,0x00000006,0x000002be,0x000002bd,0x00000406,
+	0x0007000c,0x00000006,0x000002bf,0x00000001,0x0000001a,0x000002be,0x00000041,0x000200f9,
+	0x000002c0,0x000200f8,0x000002c0,0x000700f5,0x00000006,0x0000042c,0x000002b9,0x000002b7,
+	0x000002bf,0x000002ba,0x00050051,0x00000006,0x000002a6,0x00000415,0x00000001,0x000500bc,
+	0x00000033,0x000002c5,0x000002a6,0x00000032,0x000300f7,0x000002cf,0x00000000,0x000400fa,
+	0x000002c5,0x000002c6,0x000002c9,0x000200f8,0x000002c6,0x00050085,0x00000006,0x000002c8,
+	0x000002a6,0x00000407,0x000200f9,0x000002cf,0x000200f8,0x000002c9,0x00050081,0x00000006,
+	0x000002cb,0x000002a6,0x0000003c,0x0006000c,0x00000006,0x000002cc,0x00000001,0x00000004,
+	0x000002cb,0x00050085,0x00000006,0x000002cd,0x000002cc,0x00000406,0x0007000c,0x00000006,
+	0x000002ce,0x00000001,0x0000001a,0x000002cd,0x00000041,0x000200f9,0x000002cf,0x000200f8,
+	0x000002cf,0x000700f5,0x00000006,0x0000042e,0x000002c8,0x000002c6,0x000002ce,0x000002c9,
+	0x00050051,0x00000006,0x000002aa,0x00000415,0x00000002,0x000500bc,0x00000033,0x000002d4,
+	0x000002aa,0x00000032,0x000300f7,0x000002de,0x00000000,0x000400fa,0x000002d4,0x000002d5,
+	0x000002d8,0x000200f8,0x000002d5,0x00050085,0x00000006,0x000002d7,0x000002aa,0x00000407,
+	0x000200f9,0x000002de,0x000200f8,0x000002d8,0x00050081,0x00000006,0x000002da,0x000002aa,
+	0x0000003c,0x0006000c,0x00000006,0x000002db,0x00000001,0x00000004,0x000002da,0x00050085,
+	0x00000006,0x000002dc,0x000002db,0x00000406,0x0007000c,0x00000006,0x000002dd,0x00000001,
+	0x0000001a,0x000002dc,0x00000041,0x000200f9,0x000002de,0x000200f8,0x000002de,0x000700f5,
+	0x00000006,0x00000430,0x000002d7,0x000002d5,0x000002dd,0x000002d8,0x00060050,0x0000000f,
+	0x0000043c,0x0000042c,0x0000042e,0x00000430,0x000200f9,0x000002ad,0x000200f8,0x000002ad,
+	0x000700f5,0x0000000f,0x00000432,0x000001f9,0x000001f7,0x0000043c,0x000002de,0x00050041,
+	0x0000007a,0x000002af,0x00000077,0x000000f2,0x0004003d,0x00000006,0x000002b0,0x000002af,
+	0x0005008e,0x0000000f,0x000002b1,0x00000432,0x000002b0,0x00050051,0x00000006,0x000001fc,
+	0x000002b1,0x00000000,0x00050051,0x00000006,0x000001fe,0x000002b1,0x00000001,0x00050051,
+	0x00000006,0x00000200,0x000002b1,0x00000002,0x00050051,0x00000006,0x00000202,0x00000415,
+	0x00000003,0x00070050,0x00000018,0x00000408,0x000001fc,0x000001fe,0x00000200,0x00000202,
+	0x000200f9,0x00000234,0x000200f8,0x00000204,0x00050041,0x0000007a,0x00000205,0x00000077,
+	0x00000094,0x0004003d,0x00000006,0x00000206,0x00000205,0x000500b4,0x00000033,0x00000207,
+	0x00000206,0x00000090,0x000300f7,0x00000233,0x00000000,0x000400fa,0x00000207,0x00000208,
+	0x00000215,0x000200f8,0x00000208,0x0008004f,0x0000000f,0x0000020a,0x00000415,0x00000415,
+	0x00000000,0x00000001,0x00000002,0x00050041,0x0000007a,0x000002e7,0x00000077,0x000000f2,
+	0x0004003d,0x00000006,0x000002e8,0x000002e7,0x0005008e,0x0000000f,0x000002e9,0x0000020a,
+	0x000002e8,0x00050041,0x0000007a,0x000002ea,0x00000077,0x00000103,0x0004003d,0x00000006,
+	0x000002eb,0x000002ea,0x000500b7,0x00000033,0x000002ec,0x000002eb,0x00000060,0x000400a8,
+	0x00000033,0x000002ed,0x000002ec,0x000300f7,0x000002ff,0x00000000,0x000400fa,0x000002ed,
+	0x000002ee,0x000002ff,0x000200f8,0x000002ee,0x00050051,0x00000006,0x000002f0,0x000002e9,
+	0x00000000,0x000500bc,0x00000033,0x00000304,0x000002f0,0x00000047,0x000300f7,0x0000030e,
+	0x00000000,0x000400fa,0x00000304,0x00000305,0x00000308,0x000200f8,0x00000305,0x00050085,
+	0x00000006,0x00000307,0x000002f0,0x00000038,0x000200f9,0x0000030e,0x000200f8,0x00000308,
+	0x0006000c,0x00000006,0x0000030a,0x00000001,0x00000004,0x000002f0,0x0007000c,0x00000006,
+	0x0000030b,0x00000001,0x0000001a,0x0000030a,0x00000050,0x0008000c,0x00000006,0x0000030d,
+	0x00000001,0x00000032,0x0000030b,0x0000003f,0x00000409,0x000200f9,0x0000030e,0x000200f8,
+	0x0000030e,0x000700f5,0x00000006,0x00000421,0x00000307,0x00000305,0x0000030d,0x00000308,
+	0x00050051,0x00000006,0x000002f4,0x000002e9,0x00000001,0x000500bc,0x00000033,0x00000313,
+	0x000002f4,0x00000047,0x000300f7,0x0000031d,0x00000000,0x000400fa,0x00000313,0x00000314,
+	0x00000317,0x000200f8,0x00000314,0x00050085,0x00000006,0x00000316,0x000002f4,0x00000038,
+	0x000200f9,0x0000031d,0x000200f8,0x00000317,0x0006000c,0x00000006,0x00000319,0x00000001,
+	0x00000004,0x000002f4,0x0007000c,0x00000006,0x0000031a,0x00000001,0x0000001a,0x00000319,
+	0x00000050,0x0008000c,0x00000006,0x0000031c,0x00000001,0x00000032,0x0000031a,0x0000003f,
+	0x00000409,0x000200f9,0x0000031d,0x000200f8,0x0000031d,0x000700f5,0x00000006,0x00000423,
+	0x00000316,0x00000314,0x0000031c,0x00000317,0x00050051,0x00000006,0x000002f8,0x000002e9,
+	0x00000002,0x000500bc,0x00000033,0x00000322,0x000002f8,0x00000047,0x000300f7,0x0000032c,
+	0x00000000,0x000400fa,0x00000322,0x00000323,0x00000326,0x000200f8,0x00000323,0x00050085,
+	0x00000006,0x00000325,0x000002f8,0x00000038,0x000200f9,0x0000032c,0x000200f8,0x00000326,
+	0x0006000c,0x00000006,0x00000328,0x00000001,0x00000004,0x000002f8,0x0007000c,0x00000006,
+	0x00000329,0x00000001,0x0000001a,0x00000328,0x00000050,0x0008000c,0x00000006,0x0000032b,
+	0x00000001,0x00000032,0x00000329,0x0000003f,0x00000409,0x000200f9,0x0000032c,0x000200f8,
+	0x0000032c,0x000700f5,0x00000006,0x00000425,0x00000325,0x00000323,0x0000032b,0x00000326,
+	0x00060050,0x0000000f,0x0000043b,0x00000421,0x00000423,0x00000425,0x0008000c,0x0000000f,
+	0x000002fe,0x00000001,0x0000002b,0x0000043b,0x00000061,0x00000400,0x000200f9,0x000002ff,
+	0x000200f8,0x000002ff,0x000700f5,0x0000000f,0x00000427,0x000002e9,0x00000208,0x000002fe,
+	0x0000032c,0x00050051,0x00000006,0x0000020d,0x00000427,0x00000000,0x00050051,0x00000006,
+	0x0000020f,0x00000427,0x00000001,0x00050051,0x00000006,0x00000211,0x00000427,0x00000002,
+	0x00050051,0x00000006,0x00000213,0x00000415,0x00000003,0x00070050,0x00000018,0x00000405,
+	0x0000020d,0x0000020f,0x00000211,0x00000213,0x000200f9,0x00000233,0x000200f8,0x00000215,
+	0x00050041,0x0000007a,0x00000216,0x00000077,0x00000094,0x0004003d,0x00000006,0x00000217,
+	0x00000216,0x000500b4,0x00000033,0x00000218,0x00000217,0x00000147,0x000300f7,0x00000232,
+	0x00000000,0x000400fa,0x00000218,0x00000219,0x0000022f,0x000200f8,0x00000219,0x0008004f,
+	0x0000000f,0x0000021b,0x00000415,0x00000415,0x00000000,0x00000001,0x00000002,0x00050090,
+	0x0000000f,0x0000021c,0x0000021b,0x000000dd,0x00050051,0x00000006,0x0000021e,0x0000021c,
+	0x00000000,0x00060052,0x00000018,0x000003da,0x0000021e,0x0000043d,0x00000000,0x00050051,
+	0x00000006,0x00000220,0x0000021c,0x00000001,0x00060052,0x00000018,0x000003dc,0x00000220,
+	0x000003da,0x00000001,0x00050051,0x00000006,0x00000222,0x0000021c,0x00000002,0x00060052,
+	0x00000018,0x000003de,0x00000222,0x000003dc,0x00000002,0x0008004f,0x0000000f,0x00000224,
+	0x000003de,0x000003de,0x00000000,0x00000001,0x00000002,0x00050041,0x0000007a,0x00000335,
+	0x00000077,0x000000f2,0x0004003d,0x00000006,0x00000336,0x00000335,0x0005008e,0x0000000f,
+	0x00000337,0x00000224,0x00000336,0x00050041,0x0000007a,0x00000338,0x00000077,0x00000103,
+	0x0004003d,0x00000006,0x00000339,0x00000338,0x000500b7,0x00000033,0x0000033a,0x00000339,
+	0x00000060,0x000400a8,0x00000033,0x0000033b,0x0000033a,0x000300f7,0x0000034d,0x00000000,
+	0x000400fa,0x0000033b,0x0000033c,0x0000034d,0x000200f8,0x0000033c,0x00050051,0x00000006,
+	0x0000033e,0x00000337,0x00000000,0x000500bc,0x00000033,0x00000352,0x0000033e,0x00000047,
+	0x000300f7,0x0000035c,0x00000000,0x000400fa,0x00000352,0x00000353,0x00000356,0x000200f8,
+	0x00000353,0x00050085,0x00000006,0x00000355,0x0000033e,0x00000038,0x000200f9,0x0000035c,
+	0x000200f8,0x00000356,0x0006000c,0x00000006,0x00000358,0x00000001,0x00000004,0x0000033e,
+	0x0007000c,0x00000006,0x00000359,0x00000001,0x0000001a,0x00000358,0x00000050,0x0008000c,
+	0x00000006,0x0000035b,0x00000001,0x00000032,0x00000359,0x0000003f,0x00000409,0x000200f9,
+	0x0000035c,0x000200f8,0x0000035c,0x000700f5,0x00000006,0x00000416,0x00000355,0x00000353,
+	0x0000035b,0x00000356,0x00050051,0x00000006,0x00000342,0x00000337,0x00000001,0x000500bc,
+	0x00000033,0x00000361,0x00000342,0x00000047,0x000300f7,0x0000036b,0x00000000,0x000400fa,
+	0x00000361,0x00000362,0x00000365,0x000200f8,0x00000362,0x00050085,0x00000006,0x00000364,
+	0x00000342,0x00000038,0x000200f9,0x0000036b,0x000200f8,0x00000365,0x0006000c,0x00000006,
+	0x00000367,0x00000001,0x00000004,0x00000342,0x0007000c,0x00000006,0x00000368,0x00000001,
+	0x0000001a,0x00000367,0x00000050,0x0008000c,0x00000006,0x0000036a,0x00000001,0x00000032,
+	0x00000368,0x0000003f,0x00000409,0x000200f9,0x0000036b,0x000200f8,0x0000036b,0x000700f5,
+	0x00000006,0x00000418,0x00000364,0x00000362,0x0000036a,0x00000365,0x00050051,0x00000006,
+	0x00000346,0x00000337,0x00000002,0x000500bc,0x00000033,0x00000370,0x00000346,0x00000047,
+	0x000300f7,0x0000037a,0x00000000,0x000400fa,0x00000370,0x00000371,0x00000374,0x000200f8,
+	0x00000371,0x00050085,0x00000006,0x00000373,0x00000346,0x00000038,0x000200f9,0x0000037a,
+	0x000200f8,0x00000374,0x0006000c,0x00000006,0x00000376,0x00000001,0x00000004,0x00000346,
+	0x0007000c,0x00000006,0x00000377,0x00000001,0x0000001a,0x00000376,0x00000050,0x0008000c,
+	0x00000006,0x00000379,0x00000001,0x00000032,0x00000377,0x0000003f,0x00000409,0x000200f9,
+	0x0000037a,0x000200f8,0x0000037a,0x000700f5,0x00000006,0x0000041a,0x00000373,0x00000371,
+	0x00000379,0x00000374,0x00060050,0x0000000f,0x0000043a,0x00000416,0x00000418,0x0000041a,
+	0x0008000c,0x0000000f,0x0000034c,0x00000001,0x0000002b,0x0000043a,0x00000061,0x00000400,
+	0x000200f9,0x0000034d,0x000200f8,0x0000034d,0x000700f5,0x0000000f,0x0000041c,0x00000337,
+	0x00000219,0x0000034c,0x0000037a,0x00050051,0x00000006,0x00000227,0x0000041c,0x00000000,
+	0x00050051,0x00000006,0x00000229,0x0000041c,0x00000001,0x00050051,0x00000006,0x0000022b,
+	0x0000041c,0x00000002,0x00050051,0x00000006,0x0000022d,0x00000415,0x00000003,0x00070050,
+	0x00000018,0x00000401,0x00000227,0x00000229,0x0000022b,0x0000022d,0x000200f9,0x00000232,
+	0x000200f8,0x0000022f,0x0008004f,0x0000000f,0x00000380,0x00000415,0x00000415,0x00000000,
+	0x00000001,0x00000002,0x00050041,0x0000007a,0x00000381,0x00000077,0x000000f2,0x0004003d,
+	0x00000006,0x00000382,0x00000381,0x0005008e,0x0000000f,0x00000383,0x00000380,0x00000382,
+	0x00050051,0x00000006,0x00000385,0x00000383,0x00000000,0x00050051,0x00000006,0x00000387,
+	0x00000383,0x00000001,0x00050051,0x00000006,0x00000389,0x00000383,0x00000002,0x00050051,
+	0x00000006,0x0000038b,0x00000415,0x00000003,0x00070050,0x00000018,0x000003fc,0x00000385,
+	0x00000387,0x00000389,0x0000038b,0x000200f9,0x00000232,0x000200f8,0x00000232,0x000700f5,
+	0x00000018,0x00000439,0x00000401,0x0000034d,0x000003fc,0x0000022f,0x000200f9,0x00000233,
+	0x000200f8,0x00000233,0x000700f5,0x00000018,0x00000438,0x00000405,0x000002ff,0x00000439,
+	0x00000232,0x000200f9,0x00000234,0x000200f8,0x00000234,0x000700f5,0x00000018,0x00000437,
+	0x00000408,0x000002ad,0x00000438,0x00000233,0x00050085,0x00000018,0x00000238,0x00000437,
+	0x000001bf,0x0003003e,0x000001c2,0x00000238,0x000100fd,0x00010038
 };

+ 24 - 30
src/render/vulkan/VULKAN_PixelShader_Colors.h

@@ -1,4 +1,4 @@
-	// 1113.1.1
+	// 1114.0.0
 	 #pragma once
 const uint32_t VULKAN_PixelShader_Colors[] = {
 	0x07230203,0x00010000,0x0008000b,0x000000a1,0x00000000,0x00020011,0x00000001,0x0006000b,
@@ -12,36 +12,30 @@ const uint32_t VULKAN_PixelShader_Colors[] = {
 	0x00000018,0x00000004,0x656e6f74,0x5f70616d,0x6874656d,0x0000646f,0x00070006,0x00000018,
 	0x00000005,0x656e6f74,0x5f70616d,0x74636166,0x0031726f,0x00070006,0x00000018,0x00000006,
 	0x656e6f74,0x5f70616d,0x74636166,0x0032726f,0x00070006,0x00000018,0x00000007,0x5f726473,
-	0x74696877,0x6f705f65,0x00746e69,0x00050006,0x00000018,0x00000008,0x66666f59,0x00746573,
-	0x00050006,0x00000018,0x00000009,0x656f6352,0x00006666,0x00050006,0x00000018,0x0000000a,
-	0x656f6347,0x00006666,0x00050006,0x00000018,0x0000000b,0x656f6342,0x00006666,0x00030005,
-	0x0000001a,0x00000000,0x00050005,0x00000048,0x75706e69,0x6f632e74,0x00726f6c,0x00070005,
-	0x0000004c,0x746e6540,0x6f507972,0x4f746e69,0x75707475,0x00000074,0x00050048,0x00000018,
-	0x00000000,0x00000023,0x00000000,0x00050048,0x00000018,0x00000001,0x00000023,0x00000004,
-	0x00050048,0x00000018,0x00000002,0x00000023,0x00000008,0x00050048,0x00000018,0x00000003,
-	0x00000023,0x0000000c,0x00050048,0x00000018,0x00000004,0x00000023,0x00000010,0x00050048,
-	0x00000018,0x00000005,0x00000023,0x00000014,0x00050048,0x00000018,0x00000006,0x00000023,
-	0x00000018,0x00050048,0x00000018,0x00000007,0x00000023,0x0000001c,0x00050048,0x00000018,
-	0x00000008,0x00000023,0x00000020,0x00050048,0x00000018,0x00000009,0x00000023,0x00000030,
-	0x00050048,0x00000018,0x0000000a,0x00000023,0x00000040,0x00050048,0x00000018,0x0000000b,
-	0x00000023,0x00000050,0x00030047,0x00000018,0x00000002,0x00040047,0x0000001a,0x00000022,
+	0x74696877,0x6f705f65,0x00746e69,0x00030005,0x0000001a,0x00000000,0x00050005,0x00000048,
+	0x75706e69,0x6f632e74,0x00726f6c,0x00070005,0x0000004c,0x746e6540,0x6f507972,0x4f746e69,
+	0x75707475,0x00000074,0x00050048,0x00000018,0x00000000,0x00000023,0x00000000,0x00050048,
+	0x00000018,0x00000001,0x00000023,0x00000004,0x00050048,0x00000018,0x00000002,0x00000023,
+	0x00000008,0x00050048,0x00000018,0x00000003,0x00000023,0x0000000c,0x00050048,0x00000018,
+	0x00000004,0x00000023,0x00000010,0x00050048,0x00000018,0x00000005,0x00000023,0x00000014,
+	0x00050048,0x00000018,0x00000006,0x00000023,0x00000018,0x00050048,0x00000018,0x00000007,
+	0x00000023,0x0000001c,0x00030047,0x00000018,0x00000002,0x00040047,0x0000001a,0x00000022,
 	0x00000000,0x00040047,0x0000001a,0x00000021,0x00000001,0x00040047,0x00000048,0x0000001e,
 	0x00000001,0x00040047,0x0000004c,0x0000001e,0x00000000,0x00020013,0x00000002,0x00030021,
 	0x00000003,0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,
-	0x00000004,0x00040017,0x00000015,0x00000006,0x00000003,0x000e001e,0x00000018,0x00000006,
-	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000007,
-	0x00000007,0x00000007,0x00000007,0x00040020,0x00000019,0x00000002,0x00000018,0x0004003b,
-	0x00000019,0x0000001a,0x00000002,0x00040015,0x0000001b,0x00000020,0x00000001,0x0004002b,
-	0x0000001b,0x0000001c,0x00000002,0x00040020,0x0000001d,0x00000002,0x00000006,0x0004002b,
-	0x00000006,0x00000033,0x3f800000,0x00040020,0x0000003e,0x00000001,0x00000007,0x0004003b,
-	0x0000003e,0x00000048,0x00000001,0x00040020,0x0000004b,0x00000003,0x00000007,0x0004003b,
-	0x0000004b,0x0000004c,0x00000003,0x0006002c,0x00000015,0x0000009f,0x00000033,0x00000033,
-	0x00000033,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,
-	0x0004003d,0x00000007,0x00000049,0x00000048,0x00050041,0x0000001d,0x0000007e,0x0000001a,
-	0x0000001c,0x0004003d,0x00000006,0x0000007f,0x0000007e,0x0005008e,0x00000015,0x00000080,
-	0x0000009f,0x0000007f,0x00050051,0x00000006,0x00000082,0x00000080,0x00000000,0x00050051,
-	0x00000006,0x00000084,0x00000080,0x00000001,0x00050051,0x00000006,0x00000086,0x00000080,
-	0x00000002,0x00070050,0x00000007,0x000000a0,0x00000082,0x00000084,0x00000086,0x00000033,
-	0x00050085,0x00000007,0x00000078,0x000000a0,0x00000049,0x0003003e,0x0000004c,0x00000078,
-	0x000100fd,0x00010038
+	0x00000004,0x00040017,0x00000015,0x00000006,0x00000003,0x000a001e,0x00000018,0x00000006,
+	0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00040020,
+	0x00000019,0x00000002,0x00000018,0x0004003b,0x00000019,0x0000001a,0x00000002,0x00040015,
+	0x0000001b,0x00000020,0x00000001,0x0004002b,0x0000001b,0x0000001c,0x00000002,0x00040020,
+	0x0000001d,0x00000002,0x00000006,0x0004002b,0x00000006,0x00000033,0x3f800000,0x00040020,
+	0x0000003e,0x00000001,0x00000007,0x0004003b,0x0000003e,0x00000048,0x00000001,0x00040020,
+	0x0000004b,0x00000003,0x00000007,0x0004003b,0x0000004b,0x0000004c,0x00000003,0x0006002c,
+	0x00000015,0x0000009f,0x00000033,0x00000033,0x00000033,0x00050036,0x00000002,0x00000004,
+	0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003d,0x00000007,0x00000049,0x00000048,
+	0x00050041,0x0000001d,0x0000007e,0x0000001a,0x0000001c,0x0004003d,0x00000006,0x0000007f,
+	0x0000007e,0x0005008e,0x00000015,0x00000080,0x0000009f,0x0000007f,0x00050051,0x00000006,
+	0x00000082,0x00000080,0x00000000,0x00050051,0x00000006,0x00000084,0x00000080,0x00000001,
+	0x00050051,0x00000006,0x00000086,0x00000080,0x00000002,0x00070050,0x00000007,0x000000a0,
+	0x00000082,0x00000084,0x00000086,0x00000033,0x00050085,0x00000007,0x00000078,0x000000a0,
+	0x00000049,0x0003003e,0x0000004c,0x00000078,0x000100fd,0x00010038
 };

+ 0 - 5
src/render/vulkan/VULKAN_PixelShader_Common.incl

@@ -29,11 +29,6 @@ cbuffer Constants : register(b1)
     float tonemap_factor1;
     float tonemap_factor2;
     float sdr_white_point;
-
-    float4 Yoffset;
-    float4 Rcoeff;
-    float4 Gcoeff;
-    float4 Bcoeff;
 };
 
 static const float3x3 mat709to2020 = {

+ 30 - 36
src/render/vulkan/VULKAN_PixelShader_Textures.h

@@ -1,4 +1,4 @@
-	// 1113.1.1
+	// 1114.0.0
 	 #pragma once
 const uint32_t VULKAN_PixelShader_Textures[] = {
 	0x07230203,0x00010000,0x0008000b,0x000000a8,0x00000000,0x00020011,0x00000001,0x0006000b,
@@ -12,45 +12,39 @@ const uint32_t VULKAN_PixelShader_Textures[] = {
 	0x00070006,0x00000018,0x00000004,0x656e6f74,0x5f70616d,0x6874656d,0x0000646f,0x00070006,
 	0x00000018,0x00000005,0x656e6f74,0x5f70616d,0x74636166,0x0031726f,0x00070006,0x00000018,
 	0x00000006,0x656e6f74,0x5f70616d,0x74636166,0x0032726f,0x00070006,0x00000018,0x00000007,
-	0x5f726473,0x74696877,0x6f705f65,0x00746e69,0x00050006,0x00000018,0x00000008,0x66666f59,
-	0x00746573,0x00050006,0x00000018,0x00000009,0x656f6352,0x00006666,0x00050006,0x00000018,
-	0x0000000a,0x656f6347,0x00006666,0x00050006,0x00000018,0x0000000b,0x656f6342,0x00006666,
-	0x00030005,0x0000001a,0x00000000,0x00050005,0x00000036,0x74786574,0x30657275,0x00000000,
-	0x00050005,0x0000004b,0x75706e69,0x65742e74,0x00000078,0x00050005,0x0000004e,0x75706e69,
-	0x6f632e74,0x00726f6c,0x00070005,0x00000052,0x746e6540,0x6f507972,0x4f746e69,0x75707475,
-	0x00000074,0x00050048,0x00000018,0x00000000,0x00000023,0x00000000,0x00050048,0x00000018,
-	0x00000001,0x00000023,0x00000004,0x00050048,0x00000018,0x00000002,0x00000023,0x00000008,
-	0x00050048,0x00000018,0x00000003,0x00000023,0x0000000c,0x00050048,0x00000018,0x00000004,
-	0x00000023,0x00000010,0x00050048,0x00000018,0x00000005,0x00000023,0x00000014,0x00050048,
-	0x00000018,0x00000006,0x00000023,0x00000018,0x00050048,0x00000018,0x00000007,0x00000023,
-	0x0000001c,0x00050048,0x00000018,0x00000008,0x00000023,0x00000020,0x00050048,0x00000018,
-	0x00000009,0x00000023,0x00000030,0x00050048,0x00000018,0x0000000a,0x00000023,0x00000040,
-	0x00050048,0x00000018,0x0000000b,0x00000023,0x00000050,0x00030047,0x00000018,0x00000002,
+	0x5f726473,0x74696877,0x6f705f65,0x00746e69,0x00030005,0x0000001a,0x00000000,0x00050005,
+	0x00000036,0x74786574,0x30657275,0x00000000,0x00050005,0x0000004b,0x75706e69,0x65742e74,
+	0x00000078,0x00050005,0x0000004e,0x75706e69,0x6f632e74,0x00726f6c,0x00070005,0x00000052,
+	0x746e6540,0x6f507972,0x4f746e69,0x75707475,0x00000074,0x00050048,0x00000018,0x00000000,
+	0x00000023,0x00000000,0x00050048,0x00000018,0x00000001,0x00000023,0x00000004,0x00050048,
+	0x00000018,0x00000002,0x00000023,0x00000008,0x00050048,0x00000018,0x00000003,0x00000023,
+	0x0000000c,0x00050048,0x00000018,0x00000004,0x00000023,0x00000010,0x00050048,0x00000018,
+	0x00000005,0x00000023,0x00000014,0x00050048,0x00000018,0x00000006,0x00000023,0x00000018,
+	0x00050048,0x00000018,0x00000007,0x00000023,0x0000001c,0x00030047,0x00000018,0x00000002,
 	0x00040047,0x0000001a,0x00000022,0x00000000,0x00040047,0x0000001a,0x00000021,0x00000001,
 	0x00040047,0x00000036,0x00000022,0x00000000,0x00040047,0x00000036,0x00000021,0x00000000,
 	0x00040047,0x0000004b,0x0000001e,0x00000000,0x00040047,0x0000004e,0x0000001e,0x00000001,
 	0x00040047,0x00000052,0x0000001e,0x00000000,0x00020013,0x00000002,0x00030021,0x00000003,
 	0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,0x00000004,
 	0x00040017,0x0000000d,0x00000006,0x00000002,0x00040017,0x00000015,0x00000006,0x00000003,
-	0x000e001e,0x00000018,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,
-	0x00000006,0x00000006,0x00000007,0x00000007,0x00000007,0x00000007,0x00040020,0x00000019,
-	0x00000002,0x00000018,0x0004003b,0x00000019,0x0000001a,0x00000002,0x00040015,0x0000001b,
-	0x00000020,0x00000001,0x0004002b,0x0000001b,0x0000001c,0x00000002,0x00040020,0x0000001d,
-	0x00000002,0x00000006,0x00090019,0x00000033,0x00000006,0x00000001,0x00000000,0x00000000,
-	0x00000000,0x00000001,0x00000000,0x0003001b,0x00000034,0x00000033,0x00040020,0x00000035,
-	0x00000000,0x00000034,0x0004003b,0x00000035,0x00000036,0x00000000,0x00040020,0x00000046,
-	0x00000001,0x00000007,0x00040020,0x0000004a,0x00000001,0x0000000d,0x0004003b,0x0000004a,
-	0x0000004b,0x00000001,0x0004003b,0x00000046,0x0000004e,0x00000001,0x00040020,0x00000051,
-	0x00000003,0x00000007,0x0004003b,0x00000051,0x00000052,0x00000003,0x00050036,0x00000002,
-	0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003d,0x0000000d,0x0000004c,
-	0x0000004b,0x0004003d,0x00000007,0x0000004f,0x0000004e,0x0004003d,0x00000034,0x00000078,
-	0x00000036,0x00050057,0x00000007,0x0000007b,0x00000078,0x0000004c,0x0008004f,0x00000015,
-	0x00000084,0x0000007b,0x0000007b,0x00000000,0x00000001,0x00000002,0x00050041,0x0000001d,
-	0x00000085,0x0000001a,0x0000001c,0x0004003d,0x00000006,0x00000086,0x00000085,0x0005008e,
-	0x00000015,0x00000087,0x00000084,0x00000086,0x00050051,0x00000006,0x00000089,0x00000087,
-	0x00000000,0x00050051,0x00000006,0x0000008b,0x00000087,0x00000001,0x00050051,0x00000006,
-	0x0000008d,0x00000087,0x00000002,0x00050051,0x00000006,0x0000008f,0x0000007b,0x00000003,
-	0x00070050,0x00000007,0x000000a7,0x00000089,0x0000008b,0x0000008d,0x0000008f,0x00050085,
-	0x00000007,0x0000007f,0x000000a7,0x0000004f,0x0003003e,0x00000052,0x0000007f,0x000100fd,
-	0x00010038
+	0x000a001e,0x00000018,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,0x00000006,
+	0x00000006,0x00000006,0x00040020,0x00000019,0x00000002,0x00000018,0x0004003b,0x00000019,
+	0x0000001a,0x00000002,0x00040015,0x0000001b,0x00000020,0x00000001,0x0004002b,0x0000001b,
+	0x0000001c,0x00000002,0x00040020,0x0000001d,0x00000002,0x00000006,0x00090019,0x00000033,
+	0x00000006,0x00000001,0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,
+	0x00000034,0x00000033,0x00040020,0x00000035,0x00000000,0x00000034,0x0004003b,0x00000035,
+	0x00000036,0x00000000,0x00040020,0x00000046,0x00000001,0x00000007,0x00040020,0x0000004a,
+	0x00000001,0x0000000d,0x0004003b,0x0000004a,0x0000004b,0x00000001,0x0004003b,0x00000046,
+	0x0000004e,0x00000001,0x00040020,0x00000051,0x00000003,0x00000007,0x0004003b,0x00000051,
+	0x00000052,0x00000003,0x00050036,0x00000002,0x00000004,0x00000000,0x00000003,0x000200f8,
+	0x00000005,0x0004003d,0x0000000d,0x0000004c,0x0000004b,0x0004003d,0x00000007,0x0000004f,
+	0x0000004e,0x0004003d,0x00000034,0x00000078,0x00000036,0x00050057,0x00000007,0x0000007b,
+	0x00000078,0x0000004c,0x0008004f,0x00000015,0x00000084,0x0000007b,0x0000007b,0x00000000,
+	0x00000001,0x00000002,0x00050041,0x0000001d,0x00000085,0x0000001a,0x0000001c,0x0004003d,
+	0x00000006,0x00000086,0x00000085,0x0005008e,0x00000015,0x00000087,0x00000084,0x00000086,
+	0x00050051,0x00000006,0x00000089,0x00000087,0x00000000,0x00050051,0x00000006,0x0000008b,
+	0x00000087,0x00000001,0x00050051,0x00000006,0x0000008d,0x00000087,0x00000002,0x00050051,
+	0x00000006,0x0000008f,0x0000007b,0x00000003,0x00070050,0x00000007,0x000000a7,0x00000089,
+	0x0000008b,0x0000008d,0x0000008f,0x00050085,0x00000007,0x0000007f,0x000000a7,0x0000004f,
+	0x0003003e,0x00000052,0x0000007f,0x000100fd,0x00010038
 };

+ 1 - 1
src/render/vulkan/VULKAN_VertexShader.h

@@ -1,4 +1,4 @@
-	// 1113.1.1
+	// 1114.0.0
 	 #pragma once
 const uint32_t VULKAN_VertexShader[] = {
 	0x07230203,0x00010000,0x0008000b,0x000000a1,0x00000000,0x00020011,0x00000001,0x0006000b,