diff --git a/OptiScaler/OptiScaler.vcxproj b/OptiScaler/OptiScaler.vcxproj index 66cece26..46b7a25b 100644 --- a/OptiScaler/OptiScaler.vcxproj +++ b/OptiScaler/OptiScaler.vcxproj @@ -82,7 +82,7 @@ $(SolutionDir)external\vulkan\include;$(SolutionDir)external\nvngx_dlss_sdk;$(SolutionDir)external\xess\inc\xess;$(SolutionDir)external\FidelityFX-SDK\ffx-api\include\ffx_api;$(SolutionDir)external\simpleini;$(SolutionDir)external\unordered_dense\include;$(SolutionDir)external\spdlog\include;$(IncludePath) $(ProjectDir)fsr2\lib;$(ProjectDir)fsr2_212\lib;$(ProjectDir)vulkan;$(ProjectDir)d3dx;$(ProjectDir)detours;$(SolutionDir)external\xess\lib;$(LibraryPath) dxgi - D:\Folders\Games\ffxiv-dawntrail\game\ + D:\Folders\Games\Deep Rock Galactic\FSD\Binaries\Win64\ .\x64\Debug diff --git a/OptiScaler/rcas/RCAS_Common.h b/OptiScaler/rcas/RCAS_Common.h index 418c07c5..6bf377ba 100644 --- a/OptiScaler/rcas/RCAS_Common.h +++ b/OptiScaler/rcas/RCAS_Common.h @@ -54,7 +54,7 @@ RWTexture2D Dest : register(u0); float getRCASLuma(float3 rgb) { - return dot(rgb, float3(0.598, 1.174, 0.228)); + return dot(rgb, float3(0.5, 1.0, 0.5)); } [numthreads(32, 32, 1)] diff --git a/OptiScaler/rcas/precompile/RCAS_Shader.cso b/OptiScaler/rcas/precompile/RCAS_Shader.cso index ae322a6e..ffb9e97c 100644 Binary files a/OptiScaler/rcas/precompile/RCAS_Shader.cso and b/OptiScaler/rcas/precompile/RCAS_Shader.cso differ diff --git a/OptiScaler/rcas/precompile/RCAS_Shader.h b/OptiScaler/rcas/precompile/RCAS_Shader.h index d720bfce..ef171b91 100644 --- a/OptiScaler/rcas/precompile/RCAS_Shader.h +++ b/OptiScaler/rcas/precompile/RCAS_Shader.h @@ -1,9 +1,9 @@ #pragma once inline static const unsigned char rcas_cso[] = { - 0x44, 0x58, 0x42, 0x43, 0x20, 0xdb, 0xf5, 0x2d, 0x8c, 0x9e, 0x34, 0x6f, - 0xb4, 0xb9, 0x8a, 0x86, 0x92, 0x26, 0xce, 0x9a, 0x01, 0x00, 0x00, 0x00, - 0x74, 0x18, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x44, 0x58, 0x42, 0x43, 0xa9, 0x9b, 0x29, 0x48, 0xe1, 0x40, 0x4f, 0xdf, + 0x47, 0x83, 0x38, 0x04, 0xbb, 0x62, 0x4a, 0x6c, 0x01, 0x00, 0x00, 0x00, + 0x60, 0x18, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00, 0x5c, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x24, 0x01, 0x00, 0x00, 0x98, 0x0a, 0x00, 0x00, 0xb4, 0x0a, 0x00, 0x00, 0x53, 0x46, 0x49, 0x30, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -228,11 +228,11 @@ inline static const unsigned char rcas_cso[] = { 0x3e, 0x72, 0xdb, 0x46, 0xf0, 0x0c, 0x97, 0xef, 0x3c, 0x3e, 0xd5, 0x00, 0x11, 0xe6, 0x17, 0xb7, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x41, 0x53, 0x48, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x33, 0x09, 0xc1, 0x49, 0x13, 0xc2, 0xf5, 0x4f, 0xc8, 0xd0, 0x7b, 0xd6, - 0x75, 0x0b, 0x45, 0x95, 0x44, 0x58, 0x49, 0x4c, 0xb8, 0x0d, 0x00, 0x00, - 0x60, 0x00, 0x05, 0x00, 0x6e, 0x03, 0x00, 0x00, 0x44, 0x58, 0x49, 0x4c, - 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xa0, 0x0d, 0x00, 0x00, - 0x42, 0x43, 0xc0, 0xde, 0x21, 0x0c, 0x00, 0x00, 0x65, 0x03, 0x00, 0x00, + 0xa6, 0x22, 0xef, 0x1a, 0x7a, 0x10, 0x21, 0x49, 0x1d, 0x1e, 0x2b, 0xe8, + 0x77, 0x0d, 0x5f, 0x01, 0x44, 0x58, 0x49, 0x4c, 0xa4, 0x0d, 0x00, 0x00, + 0x60, 0x00, 0x05, 0x00, 0x69, 0x03, 0x00, 0x00, 0x44, 0x58, 0x49, 0x4c, + 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x8c, 0x0d, 0x00, 0x00, + 0x42, 0x43, 0xc0, 0xde, 0x21, 0x0c, 0x00, 0x00, 0x60, 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, @@ -384,143 +384,142 @@ inline static const unsigned char rcas_cso[] = { 0xf8, 0xc5, 0x6d, 0x5b, 0x80, 0x34, 0x5c, 0xbe, 0xf3, 0xf8, 0xd3, 0x11, 0x11, 0xc0, 0x20, 0x0e, 0x3e, 0x72, 0xdb, 0x46, 0xf0, 0x0c, 0x97, 0xef, 0x3c, 0x3e, 0xd5, 0x00, 0x11, 0xe6, 0x17, 0xb7, 0x0d, 0x00, 0x00, 0x00, - 0x61, 0x20, 0x00, 0x00, 0x9d, 0x01, 0x00, 0x00, 0x13, 0x04, 0x56, 0x2c, - 0x10, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x34, 0xcc, 0x00, 0x94, + 0x61, 0x20, 0x00, 0x00, 0x98, 0x01, 0x00, 0x00, 0x13, 0x04, 0x56, 0x2c, + 0x10, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x34, 0xcc, 0x00, 0x94, 0x51, 0x21, 0x15, 0x61, 0x40, 0xd9, 0x95, 0x5b, 0xc9, 0x95, 0x6e, 0x40, 0x19, 0x06, 0xd4, 0x40, 0x39, 0x10, 0x52, 0x04, 0x25, 0x50, 0x1e, 0x23, - 0x00, 0x64, 0x8c, 0x11, 0xd4, 0xa6, 0x2f, 0x9b, 0xdf, 0x18, 0x01, 0x08, - 0x82, 0x20, 0xfa, 0x8d, 0x11, 0x80, 0x20, 0x08, 0xa2, 0x60, 0x30, 0x46, - 0x00, 0x82, 0x20, 0x48, 0x83, 0xc1, 0x18, 0x01, 0x08, 0x82, 0x20, 0x0a, - 0x0e, 0x63, 0x04, 0x20, 0x08, 0x82, 0x20, 0x28, 0x8c, 0x11, 0x80, 0x20, - 0x08, 0xc2, 0xdf, 0x18, 0x01, 0x08, 0x82, 0x20, 0xf9, 0x0b, 0x63, 0x04, - 0x62, 0x1b, 0xb3, 0xf9, 0x37, 0x46, 0x70, 0xd2, 0xa5, 0x1c, 0x7f, 0x23, - 0x00, 0x63, 0x04, 0x20, 0x08, 0x82, 0xf8, 0x07, 0x23, 0x06, 0x09, 0x00, - 0x82, 0x60, 0xc0, 0xa9, 0x41, 0xf5, 0xa0, 0x01, 0x1a, 0x80, 0xc1, 0x88, - 0x41, 0x02, 0x80, 0x20, 0x18, 0x70, 0x6b, 0x60, 0x39, 0x6a, 0xa0, 0x06, - 0x61, 0x30, 0x62, 0x90, 0x00, 0x20, 0x08, 0x06, 0x1c, 0x1b, 0x5c, 0x8f, - 0x1a, 0xa8, 0x81, 0x18, 0x8c, 0x18, 0x24, 0x00, 0x08, 0x82, 0x01, 0xd7, - 0x06, 0xd8, 0xb4, 0x06, 0x6b, 0x30, 0x06, 0x23, 0x06, 0x06, 0x00, 0x82, - 0x60, 0x40, 0xd8, 0x01, 0xc6, 0x06, 0x23, 0x06, 0x06, 0x00, 0x82, 0x60, - 0x40, 0xdc, 0x41, 0xe6, 0x06, 0x23, 0x06, 0x07, 0x00, 0x82, 0x60, 0x60, - 0xc9, 0x41, 0x37, 0xb8, 0xc1, 0x68, 0x42, 0x00, 0x8c, 0x18, 0x1c, 0x00, - 0x08, 0x82, 0x41, 0x36, 0x07, 0x5f, 0x01, 0x07, 0xa3, 0x09, 0x41, 0x30, - 0xdc, 0x10, 0xc8, 0x81, 0x19, 0xcc, 0x32, 0x04, 0x4c, 0x30, 0x9a, 0x30, - 0x08, 0xc3, 0x0d, 0x01, 0x1d, 0x98, 0xc1, 0x2c, 0x83, 0x30, 0x04, 0x23, - 0x06, 0x0d, 0x00, 0x82, 0x60, 0xb0, 0xf8, 0x41, 0x19, 0x30, 0x75, 0x90, - 0x20, 0x68, 0x80, 0x06, 0x68, 0x80, 0x06, 0xa3, 0x09, 0x01, 0x30, 0x9a, - 0x20, 0x04, 0xb3, 0x04, 0xc4, 0x31, 0x46, 0x8d, 0x18, 0x1c, 0x00, 0x08, - 0x82, 0x81, 0xd5, 0x07, 0x68, 0xe0, 0xe8, 0xc1, 0x68, 0x42, 0x10, 0x58, - 0x30, 0xc8, 0xe7, 0x82, 0x81, 0x0e, 0x32, 0xca, 0x88, 0x40, 0x3e, 0x17, - 0x0c, 0x34, 0x62, 0xd0, 0x00, 0x20, 0x08, 0x06, 0x4b, 0x2a, 0xc0, 0xc1, - 0x05, 0x0a, 0x44, 0x30, 0x07, 0x73, 0x30, 0x07, 0x73, 0x30, 0x9a, 0x10, - 0x00, 0xa3, 0x09, 0x42, 0x30, 0x4b, 0x40, 0x0c, 0x54, 0x18, 0x9a, 0x40, - 0x0c, 0x03, 0x15, 0x86, 0x26, 0x10, 0xc3, 0x88, 0xc1, 0x01, 0x80, 0x20, - 0x18, 0x58, 0xa9, 0x40, 0x07, 0x9a, 0x29, 0x8c, 0x26, 0x04, 0x83, 0x05, - 0x83, 0x7c, 0x46, 0x0c, 0x0c, 0x00, 0x04, 0xc1, 0xe0, 0x79, 0x05, 0x53, - 0x08, 0x46, 0x13, 0x08, 0xc1, 0x82, 0x43, 0x3e, 0x23, 0x06, 0x06, 0x00, - 0x82, 0x60, 0xf0, 0xc8, 0x42, 0x2a, 0x04, 0x23, 0x06, 0x07, 0x00, 0x82, - 0x60, 0xd0, 0xd0, 0x82, 0x1f, 0x04, 0xc4, 0x88, 0xc1, 0x01, 0x80, 0x20, - 0x18, 0x58, 0xb1, 0xc0, 0x07, 0x62, 0xa0, 0x0a, 0xa3, 0x09, 0x01, 0x30, - 0x1c, 0x31, 0x04, 0xc2, 0x37, 0x9a, 0xb0, 0x00, 0xb3, 0x0c, 0x85, 0x21, - 0x8c, 0x26, 0x10, 0x81, 0x05, 0x44, 0x7c, 0xec, 0x08, 0xe8, 0x63, 0x44, - 0x20, 0x9f, 0x59, 0x02, 0x63, 0xa0, 0xc2, 0x10, 0x0a, 0x5f, 0x20, 0x86, - 0x23, 0x02, 0x43, 0xf8, 0x86, 0x23, 0x8e, 0x38, 0x10, 0xbe, 0x12, 0x02, - 0x9d, 0x65, 0x40, 0x8e, 0x60, 0x38, 0x82, 0x48, 0x88, 0x6f, 0x38, 0x42, - 0xa1, 0x03, 0xe2, 0x2b, 0x21, 0xd0, 0x59, 0x06, 0x24, 0x09, 0x66, 0x09, - 0x92, 0x81, 0x0a, 0x03, 0x43, 0x9c, 0xc3, 0x02, 0x37, 0x80, 0xcf, 0x70, - 0x44, 0x70, 0x07, 0xc2, 0x37, 0xcb, 0xc0, 0x28, 0xc1, 0x70, 0x84, 0x90, - 0x07, 0xc4, 0x37, 0xcb, 0xb0, 0x30, 0xc1, 0x2c, 0x01, 0x33, 0x50, 0x62, - 0xd0, 0xc3, 0x62, 0x28, 0xe2, 0x00, 0xc8, 0x43, 0x32, 0x62, 0xd0, 0x00, - 0x20, 0x08, 0x06, 0x8b, 0x3a, 0xc4, 0xc2, 0x1d, 0x84, 0x43, 0x1d, 0xd0, - 0x01, 0x2d, 0xd0, 0x02, 0x2d, 0xd0, 0xc2, 0x68, 0x42, 0x00, 0x8c, 0x26, - 0x08, 0xc1, 0x68, 0xc2, 0x20, 0x0c, 0x47, 0x14, 0x7f, 0x10, 0x7c, 0xa3, - 0x09, 0x76, 0x30, 0x0c, 0x37, 0x04, 0xe7, 0x60, 0x06, 0xb3, 0x0c, 0x0d, - 0x34, 0x54, 0x60, 0x07, 0x3a, 0x1c, 0xa1, 0x07, 0xa3, 0x20, 0x7c, 0x25, - 0x04, 0x3a, 0xcb, 0xe0, 0x3c, 0x81, 0xf1, 0x01, 0x2b, 0xc8, 0xc7, 0x82, - 0x52, 0x80, 0x8f, 0x05, 0x8a, 0x7c, 0x66, 0x09, 0x9e, 0x81, 0x0a, 0x43, - 0x70, 0xac, 0x66, 0xc4, 0xc0, 0x01, 0x40, 0x10, 0x0c, 0xa2, 0x7a, 0xd0, - 0x85, 0x53, 0x18, 0x05, 0x51, 0x10, 0x87, 0x26, 0x58, 0x9a, 0x5a, 0x98, - 0x25, 0xa8, 0x4a, 0x14, 0x72, 0x01, 0x46, 0x0c, 0x1a, 0x00, 0x04, 0xc1, - 0x60, 0xc9, 0x07, 0x70, 0x30, 0x05, 0x78, 0x20, 0x85, 0x60, 0x1c, 0xc6, - 0x61, 0x1c, 0xc6, 0x61, 0x34, 0x21, 0x00, 0x46, 0x13, 0x84, 0x60, 0x34, - 0x61, 0x10, 0x0a, 0x15, 0x7c, 0x01, 0x46, 0x0c, 0x1a, 0x00, 0x04, 0xc1, - 0x60, 0xf1, 0x87, 0x72, 0x58, 0x85, 0x7a, 0x08, 0x50, 0x01, 0x1d, 0xd0, - 0x01, 0x1d, 0xd0, 0x61, 0x34, 0x21, 0x00, 0x46, 0x13, 0x84, 0x60, 0x34, - 0x61, 0x10, 0xaa, 0x15, 0xf4, 0x01, 0x46, 0x0c, 0x1a, 0x00, 0x04, 0xc1, - 0x60, 0x19, 0x09, 0x75, 0x80, 0x05, 0x7d, 0x08, 0x5a, 0xa1, 0x1d, 0xda, - 0xa1, 0x1d, 0xda, 0x61, 0x34, 0x21, 0x00, 0x46, 0x13, 0x84, 0x60, 0x34, - 0x61, 0x10, 0x2a, 0x16, 0xfe, 0x01, 0x46, 0x0c, 0x1a, 0x00, 0x04, 0xc1, - 0x60, 0x41, 0x89, 0x77, 0xa8, 0x85, 0x7f, 0x98, 0x85, 0x40, 0x1e, 0xe4, - 0x41, 0x1e, 0xe4, 0x61, 0x34, 0x21, 0x00, 0x46, 0x13, 0x84, 0x60, 0x34, - 0x61, 0x10, 0x46, 0x0c, 0x16, 0x00, 0x04, 0xc1, 0x60, 0x42, 0x89, 0x78, - 0x90, 0x22, 0xc8, 0x17, 0x7e, 0xe1, 0x1c, 0x46, 0x0c, 0x16, 0x00, 0x04, - 0xc1, 0x60, 0x4a, 0x09, 0x79, 0x70, 0x1a, 0xe6, 0x17, 0xc0, 0x01, 0x1d, - 0x46, 0x0c, 0x16, 0x00, 0x04, 0xc1, 0x60, 0x52, 0x89, 0x79, 0x18, 0x03, - 0x31, 0x08, 0x03, 0x70, 0x08, 0x87, 0x74, 0x18, 0x31, 0x58, 0x00, 0x10, - 0x04, 0x83, 0x69, 0x25, 0xe8, 0x61, 0x51, 0x92, 0x70, 0x10, 0x07, 0x75, - 0x18, 0x31, 0x58, 0x00, 0x10, 0x04, 0x83, 0x89, 0x25, 0xea, 0xe1, 0x30, - 0x0a, 0x71, 0x18, 0x87, 0x75, 0x30, 0xa2, 0x80, 0x8f, 0x05, 0x03, 0x7c, - 0x2c, 0x18, 0xe0, 0x63, 0x81, 0x3b, 0xc8, 0xc7, 0x82, 0x23, 0x3e, 0x23, - 0x06, 0x07, 0x00, 0x82, 0x60, 0xd0, 0xd4, 0xc4, 0x3f, 0x18, 0xc7, 0x88, - 0xc1, 0x01, 0x80, 0x20, 0x18, 0x34, 0x36, 0x01, 0x12, 0x8b, 0x32, 0x62, - 0x70, 0x00, 0x20, 0x08, 0x06, 0xcd, 0x4d, 0x84, 0x44, 0x20, 0x8c, 0x18, - 0x1c, 0x00, 0x08, 0x82, 0x41, 0x83, 0x13, 0x22, 0x11, 0x2c, 0x23, 0x06, - 0x07, 0x00, 0x82, 0x60, 0xd0, 0xe4, 0x84, 0x48, 0x30, 0xcb, 0x88, 0xc1, - 0x01, 0x80, 0x20, 0x18, 0x34, 0x3a, 0x31, 0x12, 0x8f, 0x33, 0x62, 0x70, - 0x00, 0x20, 0x08, 0x06, 0xcd, 0x4e, 0x90, 0x44, 0x20, 0x8c, 0x18, 0x1c, - 0x00, 0x08, 0x82, 0x41, 0xc3, 0x13, 0x25, 0x11, 0x34, 0x56, 0x04, 0xf1, - 0x19, 0x31, 0x30, 0x00, 0x10, 0x04, 0x83, 0xa7, 0x27, 0x68, 0x42, 0x31, - 0x78, 0x10, 0xe8, 0x63, 0x81, 0x20, 0x9f, 0x11, 0x03, 0x03, 0x00, 0x41, - 0x30, 0x78, 0xc0, 0x42, 0x24, 0x02, 0x0b, 0xf0, 0x41, 0x3e, 0x46, 0x0f, - 0x41, 0x7c, 0x46, 0x0c, 0x0e, 0x00, 0x04, 0xc1, 0xa0, 0x21, 0x8b, 0x96, - 0x08, 0x03, 0x6e, 0xc4, 0xe0, 0x00, 0x40, 0x10, 0x0c, 0x9a, 0xb2, 0x70, - 0x89, 0x30, 0xe0, 0x46, 0x0c, 0x0e, 0x00, 0x04, 0xc1, 0xa0, 0x31, 0x8b, - 0x97, 0x08, 0x03, 0x6e, 0xc4, 0xe0, 0x00, 0x40, 0x10, 0x0c, 0x9a, 0xb3, - 0x80, 0x09, 0x37, 0x48, 0x83, 0x11, 0x83, 0x03, 0x00, 0x41, 0x30, 0x68, - 0xd0, 0x22, 0x26, 0xdc, 0x20, 0x0d, 0x46, 0x0c, 0x0e, 0x00, 0x04, 0xc1, - 0xa0, 0x49, 0x0b, 0x99, 0x70, 0x83, 0x34, 0x18, 0x31, 0x38, 0x00, 0x10, - 0x04, 0x83, 0x46, 0x2d, 0x66, 0x62, 0x30, 0x46, 0x0c, 0x0e, 0x00, 0x04, - 0xc1, 0xa0, 0x59, 0x0b, 0x9a, 0x18, 0x8c, 0x11, 0x83, 0x03, 0x00, 0x41, - 0x30, 0x68, 0xd8, 0xa2, 0x26, 0x06, 0x63, 0xc4, 0xe0, 0x00, 0x40, 0x10, - 0x0c, 0x9a, 0xb6, 0xb8, 0x09, 0x35, 0x28, 0x83, 0x11, 0x83, 0x03, 0x00, - 0x41, 0x30, 0x68, 0xdc, 0x02, 0x27, 0xd4, 0xa0, 0x0c, 0x46, 0x0c, 0x0e, - 0x00, 0x04, 0xc1, 0xa0, 0x79, 0x8b, 0x9c, 0x50, 0x83, 0x32, 0x18, 0x31, - 0x38, 0x00, 0x10, 0x04, 0x83, 0x06, 0x2e, 0x74, 0xe2, 0x0e, 0xe4, 0x60, - 0xc4, 0xe0, 0x00, 0x40, 0x10, 0x0c, 0x9a, 0xb8, 0xd8, 0x89, 0x3b, 0x90, - 0x83, 0x11, 0x83, 0x03, 0x00, 0x41, 0x30, 0x68, 0xe4, 0x82, 0x27, 0xee, - 0x40, 0x0e, 0x46, 0x0c, 0x0e, 0x00, 0x04, 0xc1, 0xa0, 0x99, 0x8b, 0x9e, - 0x18, 0x8c, 0x11, 0x83, 0x03, 0x00, 0x41, 0x30, 0x68, 0xe8, 0xc2, 0x27, - 0x06, 0x63, 0xc4, 0xe0, 0x00, 0x40, 0x10, 0x0c, 0x9a, 0xba, 0xf8, 0x89, - 0xc1, 0xb0, 0x98, 0x18, 0xe8, 0x63, 0x32, 0x31, 0xd0, 0xc7, 0x66, 0x62, - 0xa0, 0x8f, 0xa9, 0x84, 0x11, 0x1f, 0x5b, 0x09, 0x23, 0x3e, 0xc6, 0x12, - 0x46, 0x7c, 0x4c, 0xb2, 0x09, 0xf9, 0x98, 0x74, 0x13, 0xf2, 0x31, 0x09, - 0x27, 0xe4, 0x63, 0xc3, 0x4d, 0xc0, 0xc7, 0x06, 0x9c, 0x80, 0x8f, 0x0d, - 0x39, 0x01, 0x1f, 0x9b, 0x89, 0x81, 0x3e, 0x46, 0x13, 0x03, 0x7d, 0xac, - 0x26, 0x06, 0xfa, 0xd8, 0xc0, 0xc8, 0xc7, 0x06, 0x46, 0x3e, 0x36, 0x30, - 0xf2, 0x31, 0x4f, 0x92, 0x8f, 0x81, 0x45, 0x10, 0x1f, 0xfb, 0x26, 0xf9, - 0x98, 0x58, 0x04, 0xf1, 0x31, 0x30, 0xa0, 0xe4, 0x63, 0x64, 0x11, 0xc4, - 0x67, 0xc4, 0xe0, 0x00, 0x40, 0x10, 0x0c, 0x1a, 0xd7, 0xc0, 0x8b, 0x22, - 0x19, 0x31, 0x38, 0x00, 0x10, 0x04, 0x83, 0xe6, 0x35, 0xf2, 0x82, 0x48, - 0x46, 0x0c, 0x0e, 0x00, 0x04, 0xc1, 0xa0, 0x81, 0x0d, 0xbd, 0x18, 0x92, - 0x11, 0x83, 0x03, 0x00, 0x41, 0x30, 0x68, 0x62, 0x63, 0x2f, 0x84, 0x60, - 0xc4, 0xe0, 0x00, 0x40, 0x10, 0x0c, 0x1a, 0xd9, 0xe0, 0x0b, 0x22, 0x18, - 0x31, 0x38, 0x00, 0x10, 0x04, 0x83, 0x66, 0x36, 0xf8, 0x22, 0x28, 0x8b, - 0x11, 0x83, 0x03, 0x00, 0x41, 0x30, 0x68, 0x68, 0xc3, 0x2f, 0xd2, 0x22, - 0x30, 0x39, 0x90, 0x03, 0xf9, 0x58, 0xe0, 0x0e, 0xf2, 0xb1, 0x60, 0x90, - 0x8f, 0x05, 0x72, 0x21, 0x1f, 0x0b, 0xd4, 0x02, 0x3e, 0xb6, 0x16, 0x01, - 0x7d, 0xac, 0x17, 0xc4, 0x01, 0x3e, 0xd6, 0x0b, 0xe2, 0x00, 0x1f, 0xeb, - 0x05, 0x71, 0x80, 0x8f, 0x0d, 0xbb, 0x00, 0x1f, 0x1b, 0x76, 0x01, 0x3e, - 0x36, 0xec, 0x02, 0x7c, 0x6c, 0xc8, 0x05, 0xf8, 0xd8, 0x90, 0x0b, 0xf0, - 0xb1, 0x21, 0x17, 0xe0, 0x63, 0xcd, 0x20, 0x1f, 0x73, 0x06, 0xf9, 0xd8, - 0x33, 0xc8, 0xc7, 0x86, 0x7e, 0x80, 0x8f, 0x0d, 0xfd, 0x00, 0x1f, 0x1b, - 0xfa, 0x01, 0x3e, 0x36, 0x40, 0xf2, 0xb1, 0x21, 0x92, 0x8f, 0x0d, 0x92, - 0x7c, 0xca, 0x1f, 0xe6, 0x42, 0x67, 0x19, 0x22, 0x2a, 0x18, 0x8e, 0xb8, - 0x0b, 0x93, 0x20, 0xbe, 0x59, 0x06, 0x69, 0x0a, 0xec, 0x24, 0xf0, 0x22, - 0x3e, 0x16, 0xa4, 0x86, 0x7c, 0x2c, 0x10, 0x0d, 0xf8, 0x58, 0x80, 0xc8, - 0x67, 0x96, 0x80, 0x32, 0xbe, 0x58, 0x89, 0xf8, 0x58, 0xd0, 0x1a, 0xf2, - 0xb1, 0xc0, 0x34, 0xe0, 0x63, 0xc1, 0x22, 0x9f, 0x59, 0x02, 0x6a, 0xa0, - 0xc3, 0x50, 0x24, 0x6d, 0xd2, 0xa0, 0x81, 0x0e, 0x43, 0x93, 0x88, 0x49, - 0x83, 0x46, 0x0c, 0x1c, 0x00, 0x04, 0xc1, 0x20, 0xba, 0x0f, 0xde, 0x48, - 0x8d, 0xd2, 0x20, 0x0d, 0xf2, 0x10, 0x82, 0x46, 0xb8, 0x8d, 0x59, 0x82, - 0x0a, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + 0x00, 0x64, 0x8c, 0x11, 0x80, 0x20, 0x08, 0xa2, 0x60, 0x30, 0x46, 0x00, + 0x82, 0x20, 0x48, 0x83, 0xc1, 0x18, 0x01, 0x08, 0x82, 0x20, 0x0a, 0x0e, + 0x63, 0x04, 0x20, 0x08, 0x82, 0x20, 0x28, 0x8c, 0x11, 0x80, 0x20, 0x08, + 0x92, 0xbf, 0x30, 0x46, 0x00, 0x82, 0x20, 0x88, 0x7e, 0x23, 0x00, 0x63, + 0x04, 0x20, 0x08, 0x82, 0xf0, 0x37, 0x46, 0x00, 0x82, 0x20, 0x88, 0x7f, + 0x00, 0x00, 0x00, 0x00, 0x23, 0x06, 0x09, 0x00, 0x82, 0x60, 0xc0, 0x9d, + 0x81, 0xc4, 0x94, 0x41, 0x19, 0x74, 0x23, 0x06, 0x09, 0x00, 0x82, 0x60, + 0xc0, 0xa1, 0xc1, 0xb4, 0x9c, 0xc1, 0x19, 0x78, 0x23, 0x06, 0x09, 0x00, + 0x82, 0x60, 0xc0, 0xa5, 0x01, 0xc5, 0x9c, 0xc1, 0x19, 0x7c, 0x23, 0x06, + 0x09, 0x00, 0x82, 0x60, 0xc0, 0xa9, 0x41, 0x05, 0xa1, 0x01, 0x1a, 0x80, + 0xc1, 0x88, 0x81, 0x01, 0x80, 0x20, 0x18, 0x10, 0x73, 0x50, 0xa5, 0xc1, + 0x88, 0x81, 0x01, 0x80, 0x20, 0x18, 0x10, 0x74, 0x60, 0xad, 0xc1, 0x88, + 0xc1, 0x01, 0x80, 0x20, 0x18, 0x58, 0x6f, 0xa0, 0x0d, 0x6b, 0x30, 0x9a, + 0x10, 0x00, 0x23, 0x06, 0x07, 0x00, 0x82, 0x60, 0x90, 0xc1, 0x01, 0x57, + 0xb4, 0xc1, 0x68, 0x42, 0x10, 0x0c, 0x37, 0x04, 0x6f, 0x60, 0x06, 0xb3, + 0x0c, 0x01, 0x13, 0x8c, 0x26, 0x0c, 0xc2, 0x70, 0x43, 0x10, 0x07, 0x66, + 0x30, 0xcb, 0x20, 0x0c, 0xc1, 0x88, 0x41, 0x03, 0x80, 0x20, 0x18, 0x2c, + 0x7b, 0x20, 0x06, 0x8c, 0x1c, 0x24, 0x48, 0x19, 0x94, 0x41, 0x19, 0x94, + 0xc1, 0x68, 0x42, 0x00, 0x8c, 0x26, 0x08, 0xc1, 0x2c, 0x01, 0x71, 0x8c, + 0x51, 0x23, 0x06, 0x07, 0x00, 0x82, 0x60, 0x60, 0xe9, 0x41, 0x19, 0x38, + 0x77, 0x30, 0x9a, 0x10, 0x04, 0x16, 0x0c, 0xf2, 0xb9, 0x60, 0xa0, 0x83, + 0x8c, 0x32, 0x22, 0x90, 0xcf, 0x05, 0x03, 0x8d, 0x18, 0x34, 0x00, 0x08, + 0x82, 0xc1, 0x62, 0x0a, 0x6d, 0x70, 0xf5, 0x01, 0x11, 0xc0, 0x01, 0x1c, + 0xc0, 0x01, 0x1c, 0x8c, 0x26, 0x04, 0xc0, 0x68, 0x82, 0x10, 0xcc, 0x12, + 0x10, 0x03, 0x15, 0x86, 0x26, 0x10, 0xc3, 0x40, 0x85, 0xa1, 0x09, 0xc4, + 0x30, 0x62, 0x70, 0x00, 0x20, 0x08, 0x06, 0x96, 0x29, 0xc4, 0x81, 0x36, + 0x0a, 0xa3, 0x09, 0xc1, 0x60, 0xc1, 0x20, 0x9f, 0x11, 0x03, 0x03, 0x00, + 0x41, 0x30, 0x78, 0x58, 0x61, 0x14, 0x82, 0xd1, 0x04, 0x42, 0xb0, 0xe0, + 0x90, 0xcf, 0x88, 0x81, 0x01, 0x80, 0x20, 0x18, 0x3c, 0xaf, 0x60, 0x0a, + 0xc1, 0x88, 0xc1, 0x01, 0x80, 0x20, 0x18, 0x34, 0xb1, 0xb0, 0x07, 0x01, + 0x31, 0x62, 0x70, 0x00, 0x20, 0x08, 0x06, 0x96, 0x2b, 0xe4, 0x81, 0x18, + 0x9c, 0xc2, 0x68, 0x42, 0x00, 0x0c, 0x47, 0x0c, 0x81, 0xf0, 0x8d, 0x26, + 0x2c, 0xc0, 0x2c, 0x43, 0x61, 0x08, 0xa3, 0x09, 0x44, 0x60, 0x01, 0x11, + 0x1f, 0x3b, 0x02, 0xfa, 0x18, 0x11, 0xc8, 0x67, 0x96, 0xc0, 0x18, 0xa8, + 0x30, 0x84, 0x02, 0x1c, 0x88, 0xe1, 0x88, 0xc0, 0x10, 0xbe, 0xe1, 0x88, + 0x43, 0x0e, 0x84, 0xaf, 0x84, 0x40, 0x67, 0x19, 0x90, 0x23, 0x18, 0x8e, + 0x20, 0x12, 0xe2, 0x1b, 0x8e, 0x50, 0xea, 0x80, 0xf8, 0x4a, 0x08, 0x74, + 0x96, 0x01, 0x49, 0x82, 0x59, 0x82, 0x64, 0xa0, 0xc2, 0xc0, 0x10, 0xe7, + 0xb0, 0xc0, 0x0d, 0xe0, 0x33, 0x1c, 0x11, 0xdc, 0x81, 0xf0, 0xcd, 0x32, + 0x30, 0x4a, 0x30, 0x1c, 0x21, 0xe8, 0x01, 0xf1, 0xcd, 0x32, 0x2c, 0x4c, + 0x30, 0x4b, 0xc0, 0x0c, 0x94, 0x18, 0xf6, 0xb0, 0x18, 0x8a, 0x38, 0x00, + 0xf2, 0x90, 0x8c, 0x18, 0x34, 0x00, 0x08, 0x82, 0xc1, 0x72, 0x0e, 0xae, + 0x70, 0x07, 0xbe, 0x50, 0x07, 0x74, 0x10, 0x0b, 0xb1, 0x10, 0x0b, 0xb1, + 0x30, 0x9a, 0x10, 0x00, 0xa3, 0x09, 0x42, 0x30, 0x9a, 0x30, 0x08, 0xc3, + 0x11, 0x05, 0x28, 0x04, 0xdf, 0x68, 0x82, 0x1d, 0x0c, 0xc3, 0x0d, 0x01, + 0x39, 0x98, 0xc1, 0x2c, 0x43, 0x03, 0x0d, 0x15, 0xd8, 0x81, 0x0e, 0x47, + 0xe8, 0x01, 0x29, 0x08, 0x5f, 0x09, 0x81, 0xce, 0x32, 0x38, 0x4f, 0x60, + 0x7c, 0xb0, 0x0a, 0xf2, 0xb1, 0xa0, 0x14, 0xe0, 0x63, 0x81, 0x22, 0x9f, + 0x59, 0x82, 0x67, 0xa0, 0xc2, 0x10, 0x1c, 0xab, 0x19, 0x31, 0x70, 0x00, + 0x10, 0x04, 0x83, 0x48, 0x1e, 0x6e, 0xe1, 0x14, 0x46, 0x41, 0x14, 0x7e, + 0xa1, 0x09, 0x96, 0x46, 0x16, 0x66, 0x09, 0xaa, 0x12, 0x05, 0x5b, 0x80, + 0x11, 0x83, 0x06, 0x00, 0x41, 0x30, 0x58, 0xec, 0xa1, 0x17, 0x4c, 0xa1, + 0x1d, 0x48, 0x21, 0x00, 0x07, 0x70, 0x00, 0x07, 0x70, 0x18, 0x4d, 0x08, + 0x80, 0xd1, 0x04, 0x21, 0x18, 0x4d, 0x18, 0x84, 0x42, 0x85, 0x5d, 0x80, + 0x11, 0x83, 0x06, 0x00, 0x41, 0x30, 0x58, 0xf6, 0x41, 0x1c, 0x56, 0x41, + 0x1e, 0x02, 0x54, 0x28, 0x87, 0x72, 0x28, 0x87, 0x72, 0x18, 0x4d, 0x08, + 0x80, 0xd1, 0x04, 0x21, 0x18, 0x4d, 0x18, 0x84, 0x6a, 0x85, 0x7b, 0x80, + 0x11, 0x83, 0x06, 0x00, 0x41, 0x30, 0x58, 0x40, 0xe2, 0x1c, 0x60, 0xe1, + 0x1e, 0x82, 0x56, 0x50, 0x07, 0x75, 0x50, 0x07, 0x75, 0x18, 0x4d, 0x08, + 0x80, 0xd1, 0x04, 0x21, 0x18, 0x4d, 0x18, 0x84, 0x8a, 0x05, 0x7e, 0x80, + 0x11, 0x83, 0x06, 0x00, 0x41, 0x30, 0x58, 0x4a, 0x82, 0x1d, 0x6a, 0x81, + 0x1f, 0x66, 0x21, 0x78, 0x87, 0x77, 0x78, 0x87, 0x77, 0x18, 0x4d, 0x08, + 0x80, 0xd1, 0x04, 0x21, 0x18, 0x4d, 0x18, 0x84, 0x11, 0x83, 0x05, 0x00, + 0x41, 0x30, 0x98, 0x4a, 0xc2, 0x1d, 0xa4, 0x08, 0xea, 0x05, 0x5e, 0xe8, + 0x85, 0x11, 0x83, 0x05, 0x00, 0x41, 0x30, 0x98, 0x4c, 0xe2, 0x1d, 0x9c, + 0x86, 0xf1, 0x85, 0x5e, 0xf0, 0x85, 0x11, 0x83, 0x05, 0x00, 0x41, 0x30, + 0x98, 0x4e, 0x02, 0x1e, 0xc6, 0x40, 0x0c, 0xc2, 0xe0, 0x17, 0x7c, 0xe1, + 0x17, 0x46, 0x0c, 0x16, 0x00, 0x04, 0xc1, 0x60, 0x42, 0x89, 0x78, 0x58, + 0x94, 0x04, 0x1c, 0x7e, 0x01, 0x1c, 0x46, 0x0c, 0x16, 0x00, 0x04, 0xc1, + 0x60, 0x4a, 0x09, 0x79, 0x38, 0x8c, 0x22, 0x1c, 0xc0, 0x21, 0x1c, 0x8c, + 0x28, 0xe0, 0x63, 0xc1, 0x00, 0x1f, 0x0b, 0x06, 0xf8, 0x58, 0x70, 0x0e, + 0xf2, 0xb1, 0xe0, 0x88, 0xcf, 0x88, 0xc1, 0x01, 0x80, 0x20, 0x18, 0x34, + 0x32, 0xc1, 0x0f, 0xc6, 0x31, 0x62, 0x70, 0x00, 0x20, 0x08, 0x06, 0xcd, + 0x4c, 0xf4, 0xc3, 0xa2, 0x8c, 0x18, 0x1c, 0x00, 0x08, 0x82, 0x41, 0x43, + 0x13, 0xfe, 0x10, 0x08, 0x23, 0x06, 0x07, 0x00, 0x82, 0x60, 0xd0, 0xd4, + 0xc4, 0x3f, 0x04, 0xcb, 0x88, 0xc1, 0x01, 0x80, 0x20, 0x18, 0x34, 0x36, + 0xf1, 0x0f, 0xcc, 0x32, 0x62, 0x70, 0x00, 0x20, 0x08, 0x06, 0xcd, 0x4d, + 0x80, 0xc4, 0xe3, 0x8c, 0x18, 0x1c, 0x00, 0x08, 0x82, 0x41, 0x83, 0x13, + 0x21, 0x11, 0x08, 0x23, 0x06, 0x07, 0x00, 0x82, 0x60, 0xd0, 0xe4, 0x84, + 0x48, 0x04, 0x8d, 0x15, 0x41, 0x7c, 0x46, 0x0c, 0x0c, 0x00, 0x04, 0xc1, + 0xe0, 0xd1, 0x89, 0x98, 0x50, 0x0c, 0x1e, 0x04, 0xfa, 0x58, 0x20, 0xc8, + 0x67, 0xc4, 0xc0, 0x00, 0x40, 0x10, 0x0c, 0x9e, 0x9e, 0xf8, 0x87, 0xc0, + 0x02, 0x7a, 0x90, 0x8f, 0xd1, 0x43, 0x10, 0x9f, 0x11, 0x83, 0x03, 0x00, + 0x41, 0x30, 0x68, 0xc2, 0x42, 0x25, 0xc2, 0x80, 0x1b, 0x31, 0x38, 0x00, + 0x10, 0x04, 0x83, 0x46, 0x2c, 0x56, 0x22, 0x0c, 0xb8, 0x11, 0x83, 0x03, + 0x00, 0x41, 0x30, 0x68, 0xc6, 0x82, 0x25, 0xc2, 0x80, 0x1b, 0x31, 0x38, + 0x00, 0x10, 0x04, 0x83, 0x86, 0x2c, 0x5a, 0xc2, 0x0d, 0xd2, 0x60, 0xc4, + 0xe0, 0x00, 0x40, 0x10, 0x0c, 0x9a, 0xb2, 0x70, 0x09, 0x37, 0x48, 0x83, + 0x11, 0x83, 0x03, 0x00, 0x41, 0x30, 0x68, 0xcc, 0xe2, 0x25, 0xdc, 0x20, + 0x0d, 0x46, 0x0c, 0x0e, 0x00, 0x04, 0xc1, 0xa0, 0x39, 0x0b, 0x98, 0x18, + 0x8c, 0x11, 0x83, 0x03, 0x00, 0x41, 0x30, 0x68, 0xd0, 0x22, 0x26, 0x06, + 0x63, 0xc4, 0xe0, 0x00, 0x40, 0x10, 0x0c, 0x9a, 0xb4, 0x90, 0x89, 0xc1, + 0x18, 0x31, 0x38, 0x00, 0x10, 0x04, 0x83, 0x46, 0x2d, 0x68, 0x42, 0x0d, + 0xca, 0x60, 0xc4, 0xe0, 0x00, 0x40, 0x10, 0x0c, 0x9a, 0xb5, 0xa8, 0x09, + 0x35, 0x28, 0x83, 0x11, 0x83, 0x03, 0x00, 0x41, 0x30, 0x68, 0xd8, 0xc2, + 0x26, 0xd4, 0xa0, 0x0c, 0x46, 0x0c, 0x0e, 0x00, 0x04, 0xc1, 0xa0, 0x69, + 0x8b, 0x9b, 0xb8, 0x03, 0x39, 0x18, 0x31, 0x38, 0x00, 0x10, 0x04, 0x83, + 0xc6, 0x2d, 0x70, 0xe2, 0x0e, 0xe4, 0x60, 0xc4, 0xe0, 0x00, 0x40, 0x10, + 0x0c, 0x9a, 0xb7, 0xc8, 0x89, 0x3b, 0x90, 0x83, 0x11, 0x83, 0x03, 0x00, + 0x41, 0x30, 0x68, 0xe0, 0x42, 0x27, 0x06, 0x63, 0xc4, 0xe0, 0x00, 0x40, + 0x10, 0x0c, 0x9a, 0xb8, 0xd8, 0x89, 0xc1, 0x18, 0x31, 0x38, 0x00, 0x10, + 0x04, 0x83, 0x46, 0x2e, 0x78, 0x62, 0x30, 0x4c, 0x25, 0x06, 0xfa, 0xd8, + 0x4a, 0x0c, 0xf4, 0x31, 0x96, 0x18, 0xe8, 0x63, 0x2a, 0x61, 0xc4, 0xc7, + 0x56, 0xc2, 0x88, 0x8f, 0xb1, 0x84, 0x11, 0x1f, 0x93, 0x6a, 0x42, 0x3e, + 0x26, 0xd9, 0x84, 0x7c, 0x4c, 0xba, 0x09, 0xf9, 0xd8, 0x60, 0x13, 0xf0, + 0xb1, 0xe1, 0x26, 0xe0, 0x63, 0x03, 0x4e, 0xc0, 0xc7, 0x66, 0x62, 0xa0, + 0x8f, 0xd1, 0xc4, 0x40, 0x1f, 0xab, 0x89, 0x81, 0x3e, 0x36, 0x30, 0xf2, + 0xb1, 0x81, 0x91, 0x8f, 0x0d, 0x8c, 0x7c, 0xcc, 0x93, 0xe4, 0x63, 0x3f, + 0x11, 0xc4, 0xc7, 0xbe, 0x49, 0x3e, 0x16, 0x16, 0x41, 0x7c, 0x0c, 0x0c, + 0x28, 0xf9, 0xd8, 0x58, 0x04, 0xf1, 0x19, 0x31, 0x38, 0x00, 0x10, 0x04, + 0x83, 0x66, 0x35, 0xea, 0xa2, 0x48, 0x46, 0x0c, 0x0e, 0x00, 0x04, 0xc1, + 0xa0, 0x61, 0x0d, 0xbb, 0x20, 0x92, 0x11, 0x83, 0x03, 0x00, 0x41, 0x30, + 0x68, 0x5a, 0xe3, 0x2e, 0x86, 0x64, 0xc4, 0xe0, 0x00, 0x40, 0x10, 0x0c, + 0x1a, 0xd7, 0xc0, 0x0b, 0x21, 0x18, 0x31, 0x38, 0x00, 0x10, 0x04, 0x83, + 0xe6, 0x35, 0xf2, 0x82, 0x08, 0x46, 0x0c, 0x0e, 0x00, 0x04, 0xc1, 0xa0, + 0x81, 0x8d, 0xbc, 0x08, 0xcc, 0x62, 0xc4, 0xe0, 0x00, 0x40, 0x10, 0x0c, + 0x9a, 0xd8, 0xd8, 0x8b, 0xb4, 0x08, 0x4c, 0x0e, 0xe4, 0x40, 0x3e, 0x16, + 0xb8, 0x83, 0x7c, 0x2c, 0x18, 0xe4, 0x63, 0x41, 0x5c, 0xc8, 0xc7, 0x02, + 0xb5, 0x80, 0x8f, 0xad, 0x45, 0x40, 0x1f, 0xeb, 0x05, 0x71, 0x80, 0x8f, + 0xf5, 0x82, 0x38, 0xc0, 0xc7, 0x7a, 0x41, 0x1c, 0xe0, 0x63, 0xc3, 0x2e, + 0xc0, 0xc7, 0x86, 0x5d, 0x80, 0x8f, 0x0d, 0xbb, 0x00, 0x1f, 0x1b, 0x72, + 0x01, 0x3e, 0x36, 0xe4, 0x02, 0x7c, 0x6c, 0xc8, 0x05, 0xf8, 0x58, 0x33, + 0xc8, 0xc7, 0x9c, 0x41, 0x3e, 0xf6, 0x0c, 0xf2, 0xb1, 0xa1, 0x1f, 0xe0, + 0x63, 0x43, 0x3f, 0xc0, 0xc7, 0x86, 0x7e, 0x80, 0x8f, 0x0d, 0x90, 0x7c, + 0x6c, 0x88, 0xe4, 0x63, 0x83, 0x24, 0x9f, 0xf2, 0x87, 0xb9, 0xd0, 0x59, + 0x86, 0x88, 0x0a, 0x86, 0x23, 0xee, 0xc2, 0x24, 0x88, 0x6f, 0x96, 0x41, + 0x9a, 0x02, 0x3b, 0x09, 0xbc, 0x88, 0x8f, 0x05, 0xa8, 0x21, 0x1f, 0x0b, + 0x44, 0x03, 0x3e, 0x16, 0x20, 0xf2, 0x99, 0x25, 0xa0, 0x8c, 0x2f, 0x56, + 0x22, 0x3e, 0x16, 0xb0, 0x86, 0x7c, 0x2c, 0x30, 0x0d, 0xf8, 0x58, 0xb0, + 0xc8, 0x67, 0x96, 0x80, 0x1a, 0xe8, 0x30, 0x14, 0x49, 0x9b, 0x34, 0x68, + 0xa0, 0xc3, 0xd0, 0x24, 0x62, 0xd2, 0xa0, 0x11, 0x03, 0x07, 0x00, 0x41, + 0x30, 0x88, 0xe8, 0x23, 0x37, 0x52, 0xa3, 0x34, 0x48, 0x23, 0x3c, 0x84, + 0xa0, 0x11, 0x68, 0x63, 0x96, 0xa0, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00 + }; diff --git a/OptiScaler/rcas/precompile/RCAS_Shader_Dx11.cso b/OptiScaler/rcas/precompile/RCAS_Shader_Dx11.cso index 988ba426..0be21285 100644 Binary files a/OptiScaler/rcas/precompile/RCAS_Shader_Dx11.cso and b/OptiScaler/rcas/precompile/RCAS_Shader_Dx11.cso differ diff --git a/OptiScaler/rcas/precompile/rcas.hlsl b/OptiScaler/rcas/precompile/rcas.hlsl index dca73689..b53b55ac 100644 --- a/OptiScaler/rcas/precompile/rcas.hlsl +++ b/OptiScaler/rcas/precompile/rcas.hlsl @@ -26,7 +26,7 @@ RWTexture2D Dest : register(u0); float getRCASLuma(float3 rgb) { - return dot(rgb, float3(0.598, 1.174, 0.228)); + return dot(rgb, float3(0.5, 1.0, 0.5)); } [numthreads(32, 32, 1)]