diff --git a/src/xenia/gpu/d3d12/d3d12_texture_cache.cc b/src/xenia/gpu/d3d12/d3d12_texture_cache.cc index 84f245f63..6f1500f97 100644 --- a/src/xenia/gpu/d3d12/d3d12_texture_cache.cc +++ b/src/xenia/gpu/d3d12/d3d12_texture_cache.cc @@ -44,7 +44,7 @@ namespace shaders { #include "xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_64bpb_scaled_cs.h" #include "xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_8bpb_cs.h" #include "xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_8bpb_scaled_cs.h" -#include "xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_bgrg8_rgba8_cs.h" +#include "xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_bgrg8_rgb8_cs.h" #include "xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_bgrg8_rgbg8_cs.h" #include "xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_ctx1_cs.h" #include "xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_depth_float_cs.h" @@ -59,7 +59,7 @@ namespace shaders { #include "xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_dxt5_rgba8_cs.h" #include "xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_dxt5a_r8_cs.h" #include "xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_gbgr8_grgb8_cs.h" -#include "xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_gbgr8_rgba8_cs.h" +#include "xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_gbgr8_rgb8_cs.h" #include "xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_r10g11b11_rgba16_cs.h" #include "xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_r10g11b11_rgba16_scaled_cs.h" #include "xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_r10g11b11_rgba16_snorm_cs.h" @@ -133,15 +133,21 @@ const D3D12TextureCache::HostFormat D3D12TextureCache::host_formats_[64] = { LoadMode::kUnknown, xenos::XE_GPU_TEXTURE_SWIZZLE_RGGG}, // k_Cr_Y1_Cb_Y0_REP // Red and blue swapped in the load shader for simplicity. + // TODO(Triang3l): The DXGI_FORMAT_R8G8B8A8_U/SNORM conversion is usable for + // the signed version, separate unsigned and signed load modes completely + // (as one doesn't need decompression for this format, while another does). {DXGI_FORMAT_G8R8_G8B8_UNORM, DXGI_FORMAT_G8R8_G8B8_UNORM, LoadMode::kGBGR8ToGRGB8, DXGI_FORMAT_UNKNOWN, LoadMode::kUnknown, true, - DXGI_FORMAT_R8G8B8A8_UNORM, LoadMode::kGBGR8ToRGBA8, + DXGI_FORMAT_R8G8B8A8_UNORM, LoadMode::kGBGR8ToRGB8, xenos::XE_GPU_TEXTURE_SWIZZLE_RGBB}, // k_Y1_Cr_Y0_Cb_REP // Red and blue swapped in the load shader for simplicity. + // TODO(Triang3l): The DXGI_FORMAT_R8G8B8A8_U/SNORM conversion is usable for + // the signed version, separate unsigned and signed load modes completely + // (as one doesn't need decompression for this format, while another does). {DXGI_FORMAT_R8G8_B8G8_UNORM, DXGI_FORMAT_R8G8_B8G8_UNORM, LoadMode::kBGRG8ToRGBG8, DXGI_FORMAT_UNKNOWN, LoadMode::kUnknown, true, - DXGI_FORMAT_R8G8B8A8_UNORM, LoadMode::kBGRG8ToRGBA8, + DXGI_FORMAT_R8G8B8A8_UNORM, LoadMode::kBGRG8ToRGB8, xenos::XE_GPU_TEXTURE_SWIZZLE_RGBB}, // k_16_16_EDRAM // Not usable as a texture, also has -32...32 range. @@ -405,12 +411,12 @@ const D3D12TextureCache::LoadModeInfo D3D12TextureCache::load_mode_info_[] = { sizeof(shaders::texture_load_r4g4b4a4_b4g4r4a4_scaled_cs), 4, 4, 2, 4}, {shaders::texture_load_gbgr8_grgb8_cs, sizeof(shaders::texture_load_gbgr8_grgb8_cs), nullptr, 0, 4, 4, 4, 3}, - {shaders::texture_load_gbgr8_rgba8_cs, - sizeof(shaders::texture_load_gbgr8_rgba8_cs), nullptr, 0, 4, 4, 8, 3}, + {shaders::texture_load_gbgr8_rgb8_cs, + sizeof(shaders::texture_load_gbgr8_rgb8_cs), nullptr, 0, 4, 4, 8, 3}, {shaders::texture_load_bgrg8_rgbg8_cs, sizeof(shaders::texture_load_bgrg8_rgbg8_cs), nullptr, 0, 4, 4, 4, 3}, - {shaders::texture_load_bgrg8_rgba8_cs, - sizeof(shaders::texture_load_bgrg8_rgba8_cs), nullptr, 0, 4, 4, 8, 3}, + {shaders::texture_load_bgrg8_rgb8_cs, + sizeof(shaders::texture_load_bgrg8_rgb8_cs), nullptr, 0, 4, 4, 8, 3}, {shaders::texture_load_r10g11b11_rgba16_cs, sizeof(shaders::texture_load_r10g11b11_rgba16_cs), shaders::texture_load_r10g11b11_rgba16_scaled_cs, diff --git a/src/xenia/gpu/d3d12/d3d12_texture_cache.h b/src/xenia/gpu/d3d12/d3d12_texture_cache.h index 9864e28a3..9fb7bcf13 100644 --- a/src/xenia/gpu/d3d12/d3d12_texture_cache.h +++ b/src/xenia/gpu/d3d12/d3d12_texture_cache.h @@ -190,9 +190,9 @@ class D3D12TextureCache final : public TextureCache { kR5G5B6ToB5G6R5WithRBGASwizzle, kR4G4B4A4ToB4G4R4A4, kGBGR8ToGRGB8, - kGBGR8ToRGBA8, + kGBGR8ToRGB8, kBGRG8ToRGBG8, - kBGRG8ToRGBA8, + kBGRG8ToRGB8, kR10G11B11ToRGBA16, kR10G11B11ToRGBA16SNorm, kR11G11B10ToRGBA16, diff --git a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_bgrg8_rgba8_cs.h b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_bgrg8_rgb8_cs.h similarity index 87% rename from src/xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_bgrg8_rgba8_cs.h rename to src/xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_bgrg8_rgb8_cs.h index 10c1c1940..15fb94b25 100644 --- a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_bgrg8_rgba8_cs.h +++ b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_bgrg8_rgb8_cs.h @@ -135,15 +135,15 @@ if_nz r2.y endif ushr r2.zw, r1.xxxy, l(0, 0, 16, 16) bfi r3.xyzw, l(8, 8, 8, 8), l(16, 16, 16, 16), r1.xxyy, l(0, 0, 0, 0) +imul null, r3.xyzw, r3.xyzw, l(257, 257, 257, 257) bfi r3.xyzw, l(8, 8, 8, 8), l(0, 0, 0, 0), r2.zzww, r3.xyzw -iadd r3.xyzw, r3.xyzw, l(0xff000000, 0xff000000, 0xff000000, 0xff000000) and r4.xz, r1.xxyx, l(0x0000ff00, 0, 0x0000ff00, 0) and r4.yw, r2.zzzw, l(0, 0x0000ff00, 0, 0x0000ff00) iadd r3.xyzw, r3.xyzw, r4.xyzw ushr r1.xy, r1.zwzz, l(16, 16, 0, 0) bfi r4.xyzw, l(8, 8, 8, 8), l(16, 16, 16, 16), r1.zzww, l(0, 0, 0, 0) +imul null, r4.xyzw, r4.xyzw, l(257, 257, 257, 257) bfi r4.xyzw, l(8, 8, 8, 8), l(0, 0, 0, 0), r1.xxyy, r4.xyzw -iadd r4.xyzw, r4.xyzw, l(0xff000000, 0xff000000, 0xff000000, 0xff000000) and r5.xyzw, r1.zxwy, l(0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00) iadd r1.xyzw, r4.xyzw, r5.xyzw store_uav_typed U0[0].xyzw, r0.yyyy, r3.xyzw @@ -170,15 +170,15 @@ if_nz r2.y endif ushr r0.xz, r1.xxyx, l(16, 0, 16, 0) bfi r2.xyzw, l(8, 8, 8, 8), l(16, 16, 16, 16), r1.xxyy, l(0, 0, 0, 0) +imul null, r2.xyzw, r2.xyzw, l(257, 257, 257, 257) bfi r2.xyzw, l(8, 8, 8, 8), l(0, 0, 0, 0), r0.xxzz, r2.xyzw -iadd r2.xyzw, r2.xyzw, l(0xff000000, 0xff000000, 0xff000000, 0xff000000) and r4.xz, r1.xxyx, l(0x0000ff00, 0, 0x0000ff00, 0) and r4.yw, r0.xxxz, l(0, 0x0000ff00, 0, 0x0000ff00) iadd r2.xyzw, r2.xyzw, r4.xyzw ushr r0.xz, r1.zzwz, l(16, 0, 16, 0) bfi r4.xyzw, l(8, 8, 8, 8), l(16, 16, 16, 16), r1.zzww, l(0, 0, 0, 0) +imul null, r4.xyzw, r4.xyzw, l(257, 257, 257, 257) bfi r4.xyzw, l(8, 8, 8, 8), l(0, 0, 0, 0), r0.xxzz, r4.xyzw -iadd r4.xyzw, r4.xyzw, l(0xff000000, 0xff000000, 0xff000000, 0xff000000) and r1.xz, r1.zzwz, l(0x0000ff00, 0, 0x0000ff00, 0) and r1.yw, r0.xxxz, l(0, 0x0000ff00, 0, 0x0000ff00) iadd r1.xyzw, r1.xyzw, r4.xyzw @@ -188,17 +188,17 @@ ret // Approximately 136 instruction slots used #endif -const BYTE texture_load_bgrg8_rgba8_cs[] = +const BYTE texture_load_bgrg8_rgb8_cs[] = { - 68, 88, 66, 67, 50, 170, - 137, 93, 249, 183, 205, 57, - 180, 173, 235, 247, 158, 49, - 140, 60, 1, 0, 0, 0, - 52, 24, 0, 0, 5, 0, + 68, 88, 66, 67, 145, 217, + 49, 0, 102, 181, 111, 82, + 114, 133, 108, 183, 242, 49, + 237, 241, 1, 0, 0, 0, + 68, 24, 0, 0, 5, 0, 0, 0, 52, 0, 0, 0, 32, 4, 0, 0, 48, 4, 0, 0, 64, 4, 0, 0, - 152, 23, 0, 0, 82, 68, + 168, 23, 0, 0, 82, 68, 69, 70, 228, 3, 0, 0, 1, 0, 0, 0, 252, 0, 0, 0, 3, 0, 0, 0, @@ -372,8 +372,8 @@ const BYTE texture_load_bgrg8_rgba8_cs[] = 71, 78, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 83, 72, 69, 88, - 80, 19, 0, 0, 81, 0, - 5, 0, 212, 4, 0, 0, + 96, 19, 0, 0, 81, 0, + 5, 0, 216, 4, 0, 0, 106, 8, 0, 1, 89, 0, 0, 7, 70, 142, 48, 0, 0, 0, 0, 0, 0, 0, @@ -891,62 +891,70 @@ const BYTE texture_load_bgrg8_rgba8_cs[] = 2, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 140, 0, 0, 17, - 242, 0, 16, 0, 3, 0, + 0, 0, 38, 0, 0, 11, + 0, 208, 0, 0, 242, 0, + 16, 0, 3, 0, 0, 0, + 70, 14, 16, 0, 3, 0, 0, 0, 2, 64, 0, 0, + 1, 1, 0, 0, 1, 1, + 0, 0, 1, 1, 0, 0, + 1, 1, 0, 0, 140, 0, + 0, 17, 242, 0, 16, 0, + 3, 0, 0, 0, 2, 64, + 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, - 8, 0, 0, 0, 2, 64, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 166, 15, 16, 0, 2, 0, - 0, 0, 70, 14, 16, 0, - 3, 0, 0, 0, 30, 0, - 0, 10, 242, 0, 16, 0, - 3, 0, 0, 0, 70, 14, - 16, 0, 3, 0, 0, 0, 2, 64, 0, 0, 0, 0, - 0, 255, 0, 0, 0, 255, - 0, 0, 0, 255, 0, 0, - 0, 255, 1, 0, 0, 10, - 82, 0, 16, 0, 4, 0, - 0, 0, 6, 1, 16, 0, - 1, 0, 0, 0, 2, 64, - 0, 0, 0, 255, 0, 0, - 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 10, 162, 0, - 16, 0, 4, 0, 0, 0, - 166, 14, 16, 0, 2, 0, - 0, 0, 2, 64, 0, 0, - 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, - 0, 255, 0, 0, 30, 0, - 0, 7, 242, 0, 16, 0, - 3, 0, 0, 0, 70, 14, + 0, 0, 166, 15, 16, 0, + 2, 0, 0, 0, 70, 14, 16, 0, 3, 0, 0, 0, - 70, 14, 16, 0, 4, 0, - 0, 0, 85, 0, 0, 10, - 50, 0, 16, 0, 1, 0, - 0, 0, 230, 10, 16, 0, - 1, 0, 0, 0, 2, 64, - 0, 0, 16, 0, 0, 0, - 16, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 140, 0, 0, 20, 242, 0, + 1, 0, 0, 10, 82, 0, 16, 0, 4, 0, 0, 0, - 2, 64, 0, 0, 8, 0, - 0, 0, 8, 0, 0, 0, - 8, 0, 0, 0, 8, 0, + 6, 1, 16, 0, 1, 0, + 0, 0, 2, 64, 0, 0, + 0, 255, 0, 0, 0, 0, + 0, 0, 0, 255, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 10, 162, 0, 16, 0, + 4, 0, 0, 0, 166, 14, + 16, 0, 2, 0, 0, 0, + 2, 64, 0, 0, 0, 0, + 0, 0, 0, 255, 0, 0, + 0, 0, 0, 0, 0, 255, + 0, 0, 30, 0, 0, 7, + 242, 0, 16, 0, 3, 0, + 0, 0, 70, 14, 16, 0, + 3, 0, 0, 0, 70, 14, + 16, 0, 4, 0, 0, 0, + 85, 0, 0, 10, 50, 0, + 16, 0, 1, 0, 0, 0, + 230, 10, 16, 0, 1, 0, 0, 0, 2, 64, 0, 0, 16, 0, 0, 0, 16, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 140, 0, + 0, 20, 242, 0, 16, 0, + 4, 0, 0, 0, 2, 64, + 0, 0, 8, 0, 0, 0, + 8, 0, 0, 0, 8, 0, + 0, 0, 8, 0, 0, 0, + 2, 64, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, - 16, 0, 0, 0, 166, 15, - 16, 0, 1, 0, 0, 0, - 2, 64, 0, 0, 0, 0, + 16, 0, 0, 0, 16, 0, + 0, 0, 166, 15, 16, 0, + 1, 0, 0, 0, 2, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 38, 0, 0, 11, 0, 208, + 0, 0, 242, 0, 16, 0, + 4, 0, 0, 0, 70, 14, + 16, 0, 4, 0, 0, 0, + 2, 64, 0, 0, 1, 1, + 0, 0, 1, 1, 0, 0, + 1, 1, 0, 0, 1, 1, 0, 0, 140, 0, 0, 17, 242, 0, 16, 0, 4, 0, 0, 0, 2, 64, 0, 0, @@ -958,160 +966,154 @@ const BYTE texture_load_bgrg8_rgba8_cs[] = 0, 0, 0, 0, 0, 0, 6, 5, 16, 0, 1, 0, 0, 0, 70, 14, 16, 0, - 4, 0, 0, 0, 30, 0, + 4, 0, 0, 0, 1, 0, 0, 10, 242, 0, 16, 0, - 4, 0, 0, 0, 70, 14, - 16, 0, 4, 0, 0, 0, - 2, 64, 0, 0, 0, 0, - 0, 255, 0, 0, 0, 255, - 0, 0, 0, 255, 0, 0, - 0, 255, 1, 0, 0, 10, - 242, 0, 16, 0, 5, 0, - 0, 0, 38, 7, 16, 0, - 1, 0, 0, 0, 2, 64, - 0, 0, 0, 255, 0, 0, - 0, 255, 0, 0, 0, 255, - 0, 0, 0, 255, 0, 0, - 30, 0, 0, 7, 242, 0, + 5, 0, 0, 0, 38, 7, 16, 0, 1, 0, 0, 0, - 70, 14, 16, 0, 4, 0, + 2, 64, 0, 0, 0, 255, + 0, 0, 0, 255, 0, 0, + 0, 255, 0, 0, 0, 255, + 0, 0, 30, 0, 0, 7, + 242, 0, 16, 0, 1, 0, 0, 0, 70, 14, 16, 0, - 5, 0, 0, 0, 164, 0, - 0, 8, 242, 224, 33, 0, - 0, 0, 0, 0, 0, 0, + 4, 0, 0, 0, 70, 14, + 16, 0, 5, 0, 0, 0, + 164, 0, 0, 8, 242, 224, + 33, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 86, 5, + 16, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 3, 0, + 0, 0, 30, 0, 0, 10, + 114, 0, 16, 0, 3, 0, 0, 0, 86, 5, 16, 0, - 0, 0, 0, 0, 70, 14, - 16, 0, 3, 0, 0, 0, - 30, 0, 0, 10, 114, 0, - 16, 0, 3, 0, 0, 0, - 86, 5, 16, 0, 0, 0, - 0, 0, 2, 64, 0, 0, - 1, 0, 0, 0, 2, 0, - 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 164, 0, - 0, 8, 242, 224, 33, 0, + 0, 0, 0, 0, 2, 64, + 0, 0, 1, 0, 0, 0, + 2, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 6, 0, 16, 0, - 3, 0, 0, 0, 70, 14, - 16, 0, 1, 0, 0, 0, - 31, 0, 4, 3, 42, 0, - 16, 0, 0, 0, 0, 0, - 54, 0, 0, 5, 66, 0, - 16, 0, 0, 0, 0, 0, - 1, 64, 0, 0, 32, 0, - 0, 0, 18, 0, 0, 1, - 54, 0, 0, 5, 66, 0, - 16, 0, 0, 0, 0, 0, - 1, 64, 0, 0, 16, 0, - 0, 0, 21, 0, 0, 1, - 85, 0, 0, 7, 66, 0, + 164, 0, 0, 8, 242, 224, + 33, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 6, 0, + 16, 0, 3, 0, 0, 0, + 70, 14, 16, 0, 1, 0, + 0, 0, 31, 0, 4, 3, + 42, 0, 16, 0, 0, 0, + 0, 0, 54, 0, 0, 5, + 66, 0, 16, 0, 0, 0, + 0, 0, 1, 64, 0, 0, + 32, 0, 0, 0, 18, 0, + 0, 1, 54, 0, 0, 5, + 66, 0, 16, 0, 0, 0, + 0, 0, 1, 64, 0, 0, + 16, 0, 0, 0, 21, 0, + 0, 1, 85, 0, 0, 7, + 66, 0, 16, 0, 0, 0, + 0, 0, 42, 0, 16, 0, + 0, 0, 0, 0, 1, 64, + 0, 0, 4, 0, 0, 0, + 30, 0, 0, 7, 18, 0, 16, 0, 0, 0, 0, 0, 42, 0, 16, 0, 0, 0, - 0, 0, 1, 64, 0, 0, - 4, 0, 0, 0, 30, 0, - 0, 7, 18, 0, 16, 0, - 0, 0, 0, 0, 42, 0, + 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 45, 0, + 0, 8, 242, 0, 16, 0, + 1, 0, 0, 0, 6, 0, 16, 0, 0, 0, 0, 0, - 10, 0, 16, 0, 0, 0, - 0, 0, 45, 0, 0, 8, - 242, 0, 16, 0, 1, 0, - 0, 0, 6, 0, 16, 0, - 0, 0, 0, 0, 70, 126, - 32, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 31, 0, - 4, 3, 10, 0, 16, 0, - 2, 0, 0, 0, 41, 0, - 0, 10, 242, 0, 16, 0, - 4, 0, 0, 0, 70, 14, - 16, 0, 1, 0, 0, 0, - 2, 64, 0, 0, 8, 0, - 0, 0, 8, 0, 0, 0, - 8, 0, 0, 0, 8, 0, - 0, 0, 1, 0, 0, 10, - 242, 0, 16, 0, 4, 0, - 0, 0, 70, 14, 16, 0, - 4, 0, 0, 0, 2, 64, - 0, 0, 0, 255, 0, 255, - 0, 255, 0, 255, 0, 255, - 0, 255, 0, 255, 0, 255, - 85, 0, 0, 10, 242, 0, - 16, 0, 5, 0, 0, 0, + 70, 126, 32, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 31, 0, 4, 3, 10, 0, + 16, 0, 2, 0, 0, 0, + 41, 0, 0, 10, 242, 0, + 16, 0, 4, 0, 0, 0, 70, 14, 16, 0, 1, 0, 0, 0, 2, 64, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 1, 0, 0, 10, 242, 0, 16, 0, - 5, 0, 0, 0, 70, 14, - 16, 0, 5, 0, 0, 0, - 2, 64, 0, 0, 255, 0, - 255, 0, 255, 0, 255, 0, - 255, 0, 255, 0, 255, 0, - 255, 0, 30, 0, 0, 7, - 242, 0, 16, 0, 1, 0, - 0, 0, 70, 14, 16, 0, 4, 0, 0, 0, 70, 14, + 16, 0, 4, 0, 0, 0, + 2, 64, 0, 0, 0, 255, + 0, 255, 0, 255, 0, 255, + 0, 255, 0, 255, 0, 255, + 0, 255, 85, 0, 0, 10, + 242, 0, 16, 0, 5, 0, + 0, 0, 70, 14, 16, 0, + 1, 0, 0, 0, 2, 64, + 0, 0, 8, 0, 0, 0, + 8, 0, 0, 0, 8, 0, + 0, 0, 8, 0, 0, 0, + 1, 0, 0, 10, 242, 0, 16, 0, 5, 0, 0, 0, - 21, 0, 0, 1, 31, 0, - 4, 3, 26, 0, 16, 0, - 2, 0, 0, 0, 85, 0, - 0, 10, 242, 0, 16, 0, - 2, 0, 0, 0, 70, 14, - 16, 0, 1, 0, 0, 0, + 70, 14, 16, 0, 5, 0, + 0, 0, 2, 64, 0, 0, + 255, 0, 255, 0, 255, 0, + 255, 0, 255, 0, 255, 0, + 255, 0, 255, 0, 30, 0, + 0, 7, 242, 0, 16, 0, + 1, 0, 0, 0, 70, 14, + 16, 0, 4, 0, 0, 0, + 70, 14, 16, 0, 5, 0, + 0, 0, 21, 0, 0, 1, + 31, 0, 4, 3, 26, 0, + 16, 0, 2, 0, 0, 0, + 85, 0, 0, 10, 242, 0, + 16, 0, 2, 0, 0, 0, + 70, 14, 16, 0, 1, 0, + 0, 0, 2, 64, 0, 0, + 16, 0, 0, 0, 16, 0, + 0, 0, 16, 0, 0, 0, + 16, 0, 0, 0, 140, 0, + 0, 17, 242, 0, 16, 0, + 1, 0, 0, 0, 2, 64, + 0, 0, 16, 0, 0, 0, + 16, 0, 0, 0, 16, 0, + 0, 0, 16, 0, 0, 0, 2, 64, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 16, 0, - 0, 0, 140, 0, 0, 17, - 242, 0, 16, 0, 1, 0, - 0, 0, 2, 64, 0, 0, - 16, 0, 0, 0, 16, 0, - 0, 0, 16, 0, 0, 0, - 16, 0, 0, 0, 2, 64, - 0, 0, 16, 0, 0, 0, - 16, 0, 0, 0, 16, 0, - 0, 0, 16, 0, 0, 0, - 70, 14, 16, 0, 1, 0, 0, 0, 70, 14, 16, 0, - 2, 0, 0, 0, 21, 0, - 0, 1, 85, 0, 0, 10, - 82, 0, 16, 0, 0, 0, - 0, 0, 6, 1, 16, 0, - 1, 0, 0, 0, 2, 64, - 0, 0, 16, 0, 0, 0, - 0, 0, 0, 0, 16, 0, - 0, 0, 0, 0, 0, 0, - 140, 0, 0, 20, 242, 0, + 1, 0, 0, 0, 70, 14, 16, 0, 2, 0, 0, 0, - 2, 64, 0, 0, 8, 0, - 0, 0, 8, 0, 0, 0, - 8, 0, 0, 0, 8, 0, - 0, 0, 2, 64, 0, 0, - 16, 0, 0, 0, 16, 0, - 0, 0, 16, 0, 0, 0, - 16, 0, 0, 0, 6, 5, + 21, 0, 0, 1, 85, 0, + 0, 10, 82, 0, 16, 0, + 0, 0, 0, 0, 6, 1, 16, 0, 1, 0, 0, 0, - 2, 64, 0, 0, 0, 0, + 2, 64, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 140, 0, 0, 17, + 16, 0, 0, 0, 0, 0, + 0, 0, 140, 0, 0, 20, 242, 0, 16, 0, 2, 0, 0, 0, 2, 64, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 2, 64, + 0, 0, 16, 0, 0, 0, + 16, 0, 0, 0, 16, 0, + 0, 0, 16, 0, 0, 0, + 6, 5, 16, 0, 1, 0, + 0, 0, 2, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 6, 10, 16, 0, 0, 0, + 0, 0, 0, 0, 38, 0, + 0, 11, 0, 208, 0, 0, + 242, 0, 16, 0, 2, 0, 0, 0, 70, 14, 16, 0, - 2, 0, 0, 0, 30, 0, - 0, 10, 242, 0, 16, 0, - 2, 0, 0, 0, 70, 14, + 2, 0, 0, 0, 2, 64, + 0, 0, 1, 1, 0, 0, + 1, 1, 0, 0, 1, 1, + 0, 0, 1, 1, 0, 0, + 140, 0, 0, 17, 242, 0, 16, 0, 2, 0, 0, 0, - 2, 64, 0, 0, 0, 0, - 0, 255, 0, 0, 0, 255, - 0, 0, 0, 255, 0, 0, - 0, 255, 1, 0, 0, 10, + 2, 64, 0, 0, 8, 0, + 0, 0, 8, 0, 0, 0, + 8, 0, 0, 0, 8, 0, + 0, 0, 2, 64, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 6, 10, + 16, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 2, 0, + 0, 0, 1, 0, 0, 10, 82, 0, 16, 0, 4, 0, 0, 0, 6, 1, 16, 0, 1, 0, 0, 0, 2, 64, @@ -1149,68 +1151,69 @@ const BYTE texture_load_bgrg8_rgba8_cs[] = 2, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 140, 0, 0, 17, - 242, 0, 16, 0, 4, 0, + 0, 0, 38, 0, 0, 11, + 0, 208, 0, 0, 242, 0, + 16, 0, 4, 0, 0, 0, + 70, 14, 16, 0, 4, 0, 0, 0, 2, 64, 0, 0, + 1, 1, 0, 0, 1, 1, + 0, 0, 1, 1, 0, 0, + 1, 1, 0, 0, 140, 0, + 0, 17, 242, 0, 16, 0, + 4, 0, 0, 0, 2, 64, + 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, - 8, 0, 0, 0, 2, 64, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 6, 10, 16, 0, 0, 0, - 0, 0, 70, 14, 16, 0, - 4, 0, 0, 0, 30, 0, - 0, 10, 242, 0, 16, 0, - 4, 0, 0, 0, 70, 14, - 16, 0, 4, 0, 0, 0, 2, 64, 0, 0, 0, 0, - 0, 255, 0, 0, 0, 255, - 0, 0, 0, 255, 0, 0, - 0, 255, 1, 0, 0, 10, - 82, 0, 16, 0, 1, 0, - 0, 0, 166, 11, 16, 0, - 1, 0, 0, 0, 2, 64, - 0, 0, 0, 255, 0, 0, - 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 10, 162, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 6, 10, 16, 0, + 0, 0, 0, 0, 70, 14, + 16, 0, 4, 0, 0, 0, + 1, 0, 0, 10, 82, 0, 16, 0, 1, 0, 0, 0, - 6, 8, 16, 0, 0, 0, + 166, 11, 16, 0, 1, 0, 0, 0, 2, 64, 0, 0, + 0, 255, 0, 0, 0, 0, + 0, 0, 0, 255, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 10, 162, 0, 16, 0, + 1, 0, 0, 0, 6, 8, + 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 0, 0, + 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, 0, 255, - 0, 0, 0, 0, 0, 0, - 0, 255, 0, 0, 30, 0, - 0, 7, 242, 0, 16, 0, + 0, 0, 30, 0, 0, 7, + 242, 0, 16, 0, 1, 0, + 0, 0, 70, 14, 16, 0, 1, 0, 0, 0, 70, 14, - 16, 0, 1, 0, 0, 0, - 70, 14, 16, 0, 4, 0, + 16, 0, 4, 0, 0, 0, + 164, 0, 0, 8, 242, 224, + 33, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 86, 5, + 16, 0, 3, 0, 0, 0, + 70, 14, 16, 0, 2, 0, 0, 0, 164, 0, 0, 8, 242, 224, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 86, 5, 16, 0, 3, 0, + 166, 10, 16, 0, 3, 0, 0, 0, 70, 14, 16, 0, - 2, 0, 0, 0, 164, 0, - 0, 8, 242, 224, 33, 0, + 1, 0, 0, 0, 62, 0, + 0, 1, 83, 84, 65, 84, + 148, 0, 0, 0, 136, 0, + 0, 0, 6, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 166, 10, 16, 0, - 3, 0, 0, 0, 70, 14, - 16, 0, 1, 0, 0, 0, - 62, 0, 0, 1, 83, 84, - 65, 84, 148, 0, 0, 0, - 136, 0, 0, 0, 6, 0, - 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, - 0, 0, 43, 0, 0, 0, - 33, 0, 0, 0, 5, 0, - 0, 0, 8, 0, 0, 0, + 43, 0, 0, 0, 33, 0, + 0, 0, 5, 0, 0, 0, + 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, - 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 3, 0, + 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1221,6 +1224,6 @@ const BYTE texture_load_bgrg8_rgba8_cs[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 4, 0, 0, 0 + 0, 0, 0, 0, 4, 0, + 0, 0 }; diff --git a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_gbgr8_rgba8_cs.h b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_gbgr8_rgb8_cs.h similarity index 88% rename from src/xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_gbgr8_rgba8_cs.h rename to src/xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_gbgr8_rgb8_cs.h index a25af7173..5a8320ee5 100644 --- a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_gbgr8_rgba8_cs.h +++ b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/texture_load_gbgr8_rgb8_cs.h @@ -136,16 +136,14 @@ endif ushr r3.xyzw, r1.xyxy, l(24, 24, 8, 8) ishl r4.xyzw, r1.xxyy, l(8, 8, 8, 8) and r4.xyzw, r4.xyzw, l(0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000) -iadd r4.xyzw, r3.xxyy, r4.xyzw -iadd r4.xyzw, r4.xyzw, l(0xff000000, 0xff000000, 0xff000000, 0xff000000) +imad r4.xyzw, r4.xyzw, l(257, 257, 257, 257), r3.xxyy bfi r5.xz, l(8, 0, 8, 0), l(8, 0, 8, 0), r1.xxyx, l(0, 0, 0, 0) and r5.yw, r3.zzzw, l(0, 0x0000ff00, 0, 0x0000ff00) iadd r3.xyzw, r4.xyzw, r5.xyzw ushr r4.xyzw, r1.zwzw, l(24, 24, 8, 8) ishl r5.xyzw, r1.zzww, l(8, 8, 8, 8) and r5.xyzw, r5.xyzw, l(0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000) -iadd r5.xyzw, r4.xxyy, r5.xyzw -iadd r5.xyzw, r5.xyzw, l(0xff000000, 0xff000000, 0xff000000, 0xff000000) +imad r5.xyzw, r5.xyzw, l(257, 257, 257, 257), r4.xxyy bfi r1.xz, l(8, 0, 8, 0), l(8, 0, 8, 0), r1.zzwz, l(0, 0, 0, 0) and r1.yw, r4.zzzw, l(0, 0x0000ff00, 0, 0x0000ff00) iadd r1.xyzw, r1.xyzw, r5.xyzw @@ -174,36 +172,34 @@ endif ushr r2.xyzw, r1.xyxy, l(24, 24, 8, 8) ishl r4.xyzw, r1.xxyy, l(8, 8, 8, 8) and r4.xyzw, r4.xyzw, l(0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000) -iadd r4.xyzw, r2.xxyy, r4.xyzw -iadd r4.xyzw, r4.xyzw, l(0xff000000, 0xff000000, 0xff000000, 0xff000000) +imad r4.xyzw, r4.xyzw, l(257, 257, 257, 257), r2.xxyy bfi r5.xz, l(8, 0, 8, 0), l(8, 0, 8, 0), r1.xxyx, l(0, 0, 0, 0) and r5.yw, r2.zzzw, l(0, 0x0000ff00, 0, 0x0000ff00) iadd r2.xyzw, r4.xyzw, r5.xyzw ushr r4.xyzw, r1.zwzw, l(24, 24, 8, 8) ishl r5.xyzw, r1.zzww, l(8, 8, 8, 8) and r5.xyzw, r5.xyzw, l(0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000) -iadd r5.xyzw, r4.xxyy, r5.xyzw -iadd r5.xyzw, r5.xyzw, l(0xff000000, 0xff000000, 0xff000000, 0xff000000) +imad r5.xyzw, r5.xyzw, l(257, 257, 257, 257), r4.xxyy bfi r1.xz, l(8, 0, 8, 0), l(8, 0, 8, 0), r1.zzwz, l(0, 0, 0, 0) and r1.yw, r4.zzzw, l(0, 0x0000ff00, 0, 0x0000ff00) iadd r1.xyzw, r1.xyzw, r5.xyzw store_uav_typed U0[0].xyzw, r3.yyyy, r2.xyzw store_uav_typed U0[0].xyzw, r3.zzzz, r1.xyzw ret -// Approximately 141 instruction slots used +// Approximately 137 instruction slots used #endif -const BYTE texture_load_gbgr8_rgba8_cs[] = +const BYTE texture_load_gbgr8_rgb8_cs[] = { - 68, 88, 66, 67, 66, 234, - 58, 60, 17, 14, 65, 217, - 196, 222, 106, 101, 176, 251, - 140, 191, 1, 0, 0, 0, - 92, 24, 0, 0, 5, 0, + 68, 88, 66, 67, 234, 180, + 67, 88, 223, 186, 193, 237, + 114, 174, 90, 240, 193, 95, + 73, 182, 1, 0, 0, 0, + 12, 24, 0, 0, 5, 0, 0, 0, 52, 0, 0, 0, 32, 4, 0, 0, 48, 4, 0, 0, 64, 4, 0, 0, - 192, 23, 0, 0, 82, 68, + 112, 23, 0, 0, 82, 68, 69, 70, 228, 3, 0, 0, 1, 0, 0, 0, 252, 0, 0, 0, 3, 0, 0, 0, @@ -377,8 +373,8 @@ const BYTE texture_load_gbgr8_rgba8_cs[] = 71, 78, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 83, 72, 69, 88, - 120, 19, 0, 0, 81, 0, - 5, 0, 222, 4, 0, 0, + 40, 19, 0, 0, 81, 0, + 5, 0, 202, 4, 0, 0, 106, 8, 0, 1, 89, 0, 0, 7, 70, 142, 48, 0, 0, 0, 0, 0, 0, 0, @@ -896,158 +892,48 @@ const BYTE texture_load_gbgr8_rgba8_cs[] = 2, 64, 0, 0, 0, 0, 255, 0, 0, 0, 255, 0, 0, 0, 255, 0, 0, 0, - 255, 0, 30, 0, 0, 7, + 255, 0, 35, 0, 0, 12, 242, 0, 16, 0, 4, 0, - 0, 0, 6, 5, 16, 0, - 3, 0, 0, 0, 70, 14, - 16, 0, 4, 0, 0, 0, - 30, 0, 0, 10, 242, 0, - 16, 0, 4, 0, 0, 0, - 70, 14, 16, 0, 4, 0, + 0, 0, 70, 14, 16, 0, + 4, 0, 0, 0, 2, 64, + 0, 0, 1, 1, 0, 0, + 1, 1, 0, 0, 1, 1, + 0, 0, 1, 1, 0, 0, + 6, 5, 16, 0, 3, 0, + 0, 0, 140, 0, 0, 20, + 82, 0, 16, 0, 5, 0, 0, 0, 2, 64, 0, 0, - 0, 0, 0, 255, 0, 0, - 0, 255, 0, 0, 0, 255, - 0, 0, 0, 255, 140, 0, - 0, 20, 82, 0, 16, 0, - 5, 0, 0, 0, 2, 64, + 8, 0, 0, 0, 0, 0, + 0, 0, 8, 0, 0, 0, + 0, 0, 0, 0, 2, 64, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, - 2, 64, 0, 0, 8, 0, - 0, 0, 0, 0, 0, 0, - 8, 0, 0, 0, 0, 0, - 0, 0, 6, 1, 16, 0, - 1, 0, 0, 0, 2, 64, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 1, 0, 0, 10, 162, 0, - 16, 0, 5, 0, 0, 0, - 166, 14, 16, 0, 3, 0, + 6, 1, 16, 0, 1, 0, 0, 0, 2, 64, 0, 0, - 0, 0, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0, - 0, 255, 0, 0, 30, 0, - 0, 7, 242, 0, 16, 0, - 3, 0, 0, 0, 70, 14, - 16, 0, 4, 0, 0, 0, - 70, 14, 16, 0, 5, 0, - 0, 0, 85, 0, 0, 10, - 242, 0, 16, 0, 4, 0, - 0, 0, 230, 14, 16, 0, - 1, 0, 0, 0, 2, 64, - 0, 0, 24, 0, 0, 0, - 24, 0, 0, 0, 8, 0, - 0, 0, 8, 0, 0, 0, - 41, 0, 0, 10, 242, 0, - 16, 0, 5, 0, 0, 0, - 166, 15, 16, 0, 1, 0, - 0, 0, 2, 64, 0, 0, - 8, 0, 0, 0, 8, 0, - 0, 0, 8, 0, 0, 0, - 8, 0, 0, 0, 1, 0, - 0, 10, 242, 0, 16, 0, - 5, 0, 0, 0, 70, 14, - 16, 0, 5, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 10, 162, 0, 16, 0, + 5, 0, 0, 0, 166, 14, + 16, 0, 3, 0, 0, 0, 2, 64, 0, 0, 0, 0, - 255, 0, 0, 0, 255, 0, - 0, 0, 255, 0, 0, 0, - 255, 0, 30, 0, 0, 7, - 242, 0, 16, 0, 5, 0, - 0, 0, 6, 5, 16, 0, + 0, 0, 0, 255, 0, 0, + 0, 0, 0, 0, 0, 255, + 0, 0, 30, 0, 0, 7, + 242, 0, 16, 0, 3, 0, + 0, 0, 70, 14, 16, 0, 4, 0, 0, 0, 70, 14, 16, 0, 5, 0, 0, 0, - 30, 0, 0, 10, 242, 0, - 16, 0, 5, 0, 0, 0, - 70, 14, 16, 0, 5, 0, - 0, 0, 2, 64, 0, 0, - 0, 0, 0, 255, 0, 0, - 0, 255, 0, 0, 0, 255, - 0, 0, 0, 255, 140, 0, - 0, 20, 82, 0, 16, 0, - 1, 0, 0, 0, 2, 64, - 0, 0, 8, 0, 0, 0, - 0, 0, 0, 0, 8, 0, - 0, 0, 0, 0, 0, 0, - 2, 64, 0, 0, 8, 0, - 0, 0, 0, 0, 0, 0, - 8, 0, 0, 0, 0, 0, - 0, 0, 166, 11, 16, 0, - 1, 0, 0, 0, 2, 64, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 1, 0, 0, 10, 162, 0, - 16, 0, 1, 0, 0, 0, - 166, 14, 16, 0, 4, 0, - 0, 0, 2, 64, 0, 0, - 0, 0, 0, 0, 0, 255, - 0, 0, 0, 0, 0, 0, - 0, 255, 0, 0, 30, 0, - 0, 7, 242, 0, 16, 0, - 1, 0, 0, 0, 70, 14, - 16, 0, 1, 0, 0, 0, - 70, 14, 16, 0, 5, 0, - 0, 0, 164, 0, 0, 8, - 242, 224, 33, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 86, 5, 16, 0, 0, 0, - 0, 0, 70, 14, 16, 0, - 3, 0, 0, 0, 30, 0, - 0, 10, 114, 0, 16, 0, - 3, 0, 0, 0, 86, 5, - 16, 0, 0, 0, 0, 0, - 2, 64, 0, 0, 1, 0, - 0, 0, 2, 0, 0, 0, - 3, 0, 0, 0, 0, 0, - 0, 0, 164, 0, 0, 8, - 242, 224, 33, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 6, 0, 16, 0, 3, 0, - 0, 0, 70, 14, 16, 0, - 1, 0, 0, 0, 31, 0, - 4, 3, 42, 0, 16, 0, - 0, 0, 0, 0, 54, 0, - 0, 5, 66, 0, 16, 0, - 0, 0, 0, 0, 1, 64, - 0, 0, 32, 0, 0, 0, - 18, 0, 0, 1, 54, 0, - 0, 5, 66, 0, 16, 0, - 0, 0, 0, 0, 1, 64, - 0, 0, 16, 0, 0, 0, - 21, 0, 0, 1, 85, 0, - 0, 7, 66, 0, 16, 0, - 0, 0, 0, 0, 42, 0, - 16, 0, 0, 0, 0, 0, - 1, 64, 0, 0, 4, 0, - 0, 0, 30, 0, 0, 7, - 18, 0, 16, 0, 0, 0, - 0, 0, 42, 0, 16, 0, - 0, 0, 0, 0, 10, 0, - 16, 0, 0, 0, 0, 0, - 45, 0, 0, 8, 242, 0, - 16, 0, 1, 0, 0, 0, - 6, 0, 16, 0, 0, 0, - 0, 0, 70, 126, 32, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 31, 0, 4, 3, - 10, 0, 16, 0, 2, 0, - 0, 0, 41, 0, 0, 10, - 242, 0, 16, 0, 4, 0, - 0, 0, 70, 14, 16, 0, - 1, 0, 0, 0, 2, 64, - 0, 0, 8, 0, 0, 0, - 8, 0, 0, 0, 8, 0, - 0, 0, 8, 0, 0, 0, - 1, 0, 0, 10, 242, 0, + 85, 0, 0, 10, 242, 0, 16, 0, 4, 0, 0, 0, - 70, 14, 16, 0, 4, 0, + 230, 14, 16, 0, 1, 0, 0, 0, 2, 64, 0, 0, - 0, 255, 0, 255, 0, 255, - 0, 255, 0, 255, 0, 255, - 0, 255, 0, 255, 85, 0, + 24, 0, 0, 0, 24, 0, + 0, 0, 8, 0, 0, 0, + 8, 0, 0, 0, 41, 0, 0, 10, 242, 0, 16, 0, - 5, 0, 0, 0, 70, 14, + 5, 0, 0, 0, 166, 15, 16, 0, 1, 0, 0, 0, 2, 64, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, @@ -1056,44 +942,88 @@ const BYTE texture_load_gbgr8_rgba8_cs[] = 242, 0, 16, 0, 5, 0, 0, 0, 70, 14, 16, 0, 5, 0, 0, 0, 2, 64, - 0, 0, 255, 0, 255, 0, - 255, 0, 255, 0, 255, 0, - 255, 0, 255, 0, 255, 0, + 0, 0, 0, 0, 255, 0, + 0, 0, 255, 0, 0, 0, + 255, 0, 0, 0, 255, 0, + 35, 0, 0, 12, 242, 0, + 16, 0, 5, 0, 0, 0, + 70, 14, 16, 0, 5, 0, + 0, 0, 2, 64, 0, 0, + 1, 1, 0, 0, 1, 1, + 0, 0, 1, 1, 0, 0, + 1, 1, 0, 0, 6, 5, + 16, 0, 4, 0, 0, 0, + 140, 0, 0, 20, 82, 0, + 16, 0, 1, 0, 0, 0, + 2, 64, 0, 0, 8, 0, + 0, 0, 0, 0, 0, 0, + 8, 0, 0, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 8, 0, 0, 0, 0, 0, + 0, 0, 8, 0, 0, 0, + 0, 0, 0, 0, 166, 11, + 16, 0, 1, 0, 0, 0, + 2, 64, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 10, + 162, 0, 16, 0, 1, 0, + 0, 0, 166, 14, 16, 0, + 4, 0, 0, 0, 2, 64, + 0, 0, 0, 0, 0, 0, + 0, 255, 0, 0, 0, 0, + 0, 0, 0, 255, 0, 0, 30, 0, 0, 7, 242, 0, 16, 0, 1, 0, 0, 0, - 70, 14, 16, 0, 4, 0, + 70, 14, 16, 0, 1, 0, 0, 0, 70, 14, 16, 0, - 5, 0, 0, 0, 21, 0, - 0, 1, 31, 0, 4, 3, - 26, 0, 16, 0, 2, 0, - 0, 0, 85, 0, 0, 10, - 242, 0, 16, 0, 2, 0, - 0, 0, 70, 14, 16, 0, - 1, 0, 0, 0, 2, 64, - 0, 0, 16, 0, 0, 0, - 16, 0, 0, 0, 16, 0, - 0, 0, 16, 0, 0, 0, - 140, 0, 0, 17, 242, 0, - 16, 0, 1, 0, 0, 0, - 2, 64, 0, 0, 16, 0, - 0, 0, 16, 0, 0, 0, - 16, 0, 0, 0, 16, 0, + 5, 0, 0, 0, 164, 0, + 0, 8, 242, 224, 33, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 86, 5, 16, 0, + 0, 0, 0, 0, 70, 14, + 16, 0, 3, 0, 0, 0, + 30, 0, 0, 10, 114, 0, + 16, 0, 3, 0, 0, 0, + 86, 5, 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, - 16, 0, 0, 0, 16, 0, - 0, 0, 16, 0, 0, 0, - 16, 0, 0, 0, 70, 14, + 1, 0, 0, 0, 2, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 164, 0, + 0, 8, 242, 224, 33, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 6, 0, 16, 0, + 3, 0, 0, 0, 70, 14, 16, 0, 1, 0, 0, 0, - 70, 14, 16, 0, 2, 0, + 31, 0, 4, 3, 42, 0, + 16, 0, 0, 0, 0, 0, + 54, 0, 0, 5, 66, 0, + 16, 0, 0, 0, 0, 0, + 1, 64, 0, 0, 32, 0, + 0, 0, 18, 0, 0, 1, + 54, 0, 0, 5, 66, 0, + 16, 0, 0, 0, 0, 0, + 1, 64, 0, 0, 16, 0, 0, 0, 21, 0, 0, 1, - 85, 0, 0, 10, 242, 0, - 16, 0, 2, 0, 0, 0, - 70, 4, 16, 0, 1, 0, - 0, 0, 2, 64, 0, 0, - 24, 0, 0, 0, 24, 0, - 0, 0, 8, 0, 0, 0, - 8, 0, 0, 0, 41, 0, + 85, 0, 0, 7, 66, 0, + 16, 0, 0, 0, 0, 0, + 42, 0, 16, 0, 0, 0, + 0, 0, 1, 64, 0, 0, + 4, 0, 0, 0, 30, 0, + 0, 7, 18, 0, 16, 0, + 0, 0, 0, 0, 42, 0, + 16, 0, 0, 0, 0, 0, + 10, 0, 16, 0, 0, 0, + 0, 0, 45, 0, 0, 8, + 242, 0, 16, 0, 1, 0, + 0, 0, 6, 0, 16, 0, + 0, 0, 0, 0, 70, 126, + 32, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 31, 0, + 4, 3, 10, 0, 16, 0, + 2, 0, 0, 0, 41, 0, 0, 10, 242, 0, 16, 0, - 4, 0, 0, 0, 6, 5, + 4, 0, 0, 0, 70, 14, 16, 0, 1, 0, 0, 0, 2, 64, 0, 0, 8, 0, 0, 0, 8, 0, 0, 0, @@ -1102,21 +1032,77 @@ const BYTE texture_load_gbgr8_rgba8_cs[] = 242, 0, 16, 0, 4, 0, 0, 0, 70, 14, 16, 0, 4, 0, 0, 0, 2, 64, - 0, 0, 0, 0, 255, 0, - 0, 0, 255, 0, 0, 0, - 255, 0, 0, 0, 255, 0, - 30, 0, 0, 7, 242, 0, - 16, 0, 4, 0, 0, 0, - 6, 5, 16, 0, 2, 0, + 0, 0, 0, 255, 0, 255, + 0, 255, 0, 255, 0, 255, + 0, 255, 0, 255, 0, 255, + 85, 0, 0, 10, 242, 0, + 16, 0, 5, 0, 0, 0, + 70, 14, 16, 0, 1, 0, + 0, 0, 2, 64, 0, 0, + 8, 0, 0, 0, 8, 0, + 0, 0, 8, 0, 0, 0, + 8, 0, 0, 0, 1, 0, + 0, 10, 242, 0, 16, 0, + 5, 0, 0, 0, 70, 14, + 16, 0, 5, 0, 0, 0, + 2, 64, 0, 0, 255, 0, + 255, 0, 255, 0, 255, 0, + 255, 0, 255, 0, 255, 0, + 255, 0, 30, 0, 0, 7, + 242, 0, 16, 0, 1, 0, 0, 0, 70, 14, 16, 0, - 4, 0, 0, 0, 30, 0, + 4, 0, 0, 0, 70, 14, + 16, 0, 5, 0, 0, 0, + 21, 0, 0, 1, 31, 0, + 4, 3, 26, 0, 16, 0, + 2, 0, 0, 0, 85, 0, + 0, 10, 242, 0, 16, 0, + 2, 0, 0, 0, 70, 14, + 16, 0, 1, 0, 0, 0, + 2, 64, 0, 0, 16, 0, + 0, 0, 16, 0, 0, 0, + 16, 0, 0, 0, 16, 0, + 0, 0, 140, 0, 0, 17, + 242, 0, 16, 0, 1, 0, + 0, 0, 2, 64, 0, 0, + 16, 0, 0, 0, 16, 0, + 0, 0, 16, 0, 0, 0, + 16, 0, 0, 0, 2, 64, + 0, 0, 16, 0, 0, 0, + 16, 0, 0, 0, 16, 0, + 0, 0, 16, 0, 0, 0, + 70, 14, 16, 0, 1, 0, + 0, 0, 70, 14, 16, 0, + 2, 0, 0, 0, 21, 0, + 0, 1, 85, 0, 0, 10, + 242, 0, 16, 0, 2, 0, + 0, 0, 70, 4, 16, 0, + 1, 0, 0, 0, 2, 64, + 0, 0, 24, 0, 0, 0, + 24, 0, 0, 0, 8, 0, + 0, 0, 8, 0, 0, 0, + 41, 0, 0, 10, 242, 0, + 16, 0, 4, 0, 0, 0, + 6, 5, 16, 0, 1, 0, + 0, 0, 2, 64, 0, 0, + 8, 0, 0, 0, 8, 0, + 0, 0, 8, 0, 0, 0, + 8, 0, 0, 0, 1, 0, 0, 10, 242, 0, 16, 0, 4, 0, 0, 0, 70, 14, 16, 0, 4, 0, 0, 0, 2, 64, 0, 0, 0, 0, - 0, 255, 0, 0, 0, 255, - 0, 0, 0, 255, 0, 0, - 0, 255, 140, 0, 0, 20, + 255, 0, 0, 0, 255, 0, + 0, 0, 255, 0, 0, 0, + 255, 0, 35, 0, 0, 12, + 242, 0, 16, 0, 4, 0, + 0, 0, 70, 14, 16, 0, + 4, 0, 0, 0, 2, 64, + 0, 0, 1, 1, 0, 0, + 1, 1, 0, 0, 1, 1, + 0, 0, 1, 1, 0, 0, + 6, 5, 16, 0, 2, 0, + 0, 0, 140, 0, 0, 20, 82, 0, 16, 0, 5, 0, 0, 0, 2, 64, 0, 0, 8, 0, 0, 0, 0, 0, @@ -1161,68 +1147,65 @@ const BYTE texture_load_gbgr8_rgba8_cs[] = 0, 0, 0, 0, 255, 0, 0, 0, 255, 0, 0, 0, 255, 0, 0, 0, 255, 0, - 30, 0, 0, 7, 242, 0, + 35, 0, 0, 12, 242, 0, 16, 0, 5, 0, 0, 0, - 6, 5, 16, 0, 4, 0, - 0, 0, 70, 14, 16, 0, - 5, 0, 0, 0, 30, 0, - 0, 10, 242, 0, 16, 0, - 5, 0, 0, 0, 70, 14, - 16, 0, 5, 0, 0, 0, - 2, 64, 0, 0, 0, 0, - 0, 255, 0, 0, 0, 255, - 0, 0, 0, 255, 0, 0, - 0, 255, 140, 0, 0, 20, - 82, 0, 16, 0, 1, 0, + 70, 14, 16, 0, 5, 0, + 0, 0, 2, 64, 0, 0, + 1, 1, 0, 0, 1, 1, + 0, 0, 1, 1, 0, 0, + 1, 1, 0, 0, 6, 5, + 16, 0, 4, 0, 0, 0, + 140, 0, 0, 20, 82, 0, + 16, 0, 1, 0, 0, 0, + 2, 64, 0, 0, 8, 0, + 0, 0, 0, 0, 0, 0, + 8, 0, 0, 0, 0, 0, 0, 0, 2, 64, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, - 0, 0, 0, 0, 2, 64, - 0, 0, 8, 0, 0, 0, - 0, 0, 0, 0, 8, 0, - 0, 0, 0, 0, 0, 0, - 166, 11, 16, 0, 1, 0, - 0, 0, 2, 64, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 0, - 0, 10, 162, 0, 16, 0, - 1, 0, 0, 0, 166, 14, - 16, 0, 4, 0, 0, 0, + 0, 0, 0, 0, 166, 11, + 16, 0, 1, 0, 0, 0, 2, 64, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 10, + 162, 0, 16, 0, 1, 0, + 0, 0, 166, 14, 16, 0, + 4, 0, 0, 0, 2, 64, + 0, 0, 0, 0, 0, 0, + 0, 255, 0, 0, 0, 0, 0, 0, 0, 255, 0, 0, - 0, 0, 0, 0, 0, 255, - 0, 0, 30, 0, 0, 7, - 242, 0, 16, 0, 1, 0, + 30, 0, 0, 7, 242, 0, + 16, 0, 1, 0, 0, 0, + 70, 14, 16, 0, 1, 0, 0, 0, 70, 14, 16, 0, - 1, 0, 0, 0, 70, 14, - 16, 0, 5, 0, 0, 0, + 5, 0, 0, 0, 164, 0, + 0, 8, 242, 224, 33, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 86, 5, 16, 0, + 3, 0, 0, 0, 70, 14, + 16, 0, 2, 0, 0, 0, 164, 0, 0, 8, 242, 224, 33, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 86, 5, + 0, 0, 0, 0, 166, 10, 16, 0, 3, 0, 0, 0, - 70, 14, 16, 0, 2, 0, - 0, 0, 164, 0, 0, 8, - 242, 224, 33, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 166, 10, 16, 0, 3, 0, - 0, 0, 70, 14, 16, 0, - 1, 0, 0, 0, 62, 0, - 0, 1, 83, 84, 65, 84, - 148, 0, 0, 0, 141, 0, - 0, 0, 6, 0, 0, 0, - 0, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, - 51, 0, 0, 0, 34, 0, - 0, 0, 5, 0, 0, 0, - 8, 0, 0, 0, 0, 0, + 70, 14, 16, 0, 1, 0, + 0, 0, 62, 0, 0, 1, + 83, 84, 65, 84, 148, 0, + 0, 0, 137, 0, 0, 0, + 6, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 47, 0, + 0, 0, 34, 0, 0, 0, + 5, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1233,6 +1216,5 @@ const BYTE texture_load_gbgr8_rgba8_cs[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 4, 0, - 0, 0 + 0, 0, 4, 0, 0, 0 }; diff --git a/src/xenia/gpu/shaders/bytecode/vulkan_spirv/texture_load_bgrg8_rgba8_cs.h b/src/xenia/gpu/shaders/bytecode/vulkan_spirv/texture_load_bgrg8_rgb8_cs.h similarity index 50% rename from src/xenia/gpu/shaders/bytecode/vulkan_spirv/texture_load_bgrg8_rgba8_cs.h rename to src/xenia/gpu/shaders/bytecode/vulkan_spirv/texture_load_bgrg8_rgb8_cs.h index 25edfae9c..f07c832a3 100644 --- a/src/xenia/gpu/shaders/bytecode/vulkan_spirv/texture_load_bgrg8_rgba8_cs.h +++ b/src/xenia/gpu/shaders/bytecode/vulkan_spirv/texture_load_bgrg8_rgb8_cs.h @@ -48,8 +48,9 @@ %uint_16711680 = OpConstant %uint 16711680 %uint_16 = OpConstant %uint 16 %uint_255 = OpConstant %uint 255 -%uint_4278190080 = OpConstant %uint 4278190080 + %uint_257 = OpConstant %uint 257 %uint_65280 = OpConstant %uint 65280 +%uint_4278190080 = OpConstant %uint 4278190080 %uint_1 = OpConstant %uint 1 %uint_2 = OpConstant %uint 2 %uint_16711935 = OpConstant %uint 16711935 @@ -105,8 +106,9 @@ %2993 = OpConstantComposite %v2uint %uint_16711680 %uint_16711680 %2143 = OpConstantComposite %v2uint %uint_16 %uint_16 %1140 = OpConstantComposite %v2uint %uint_255 %uint_255 - %2014 = OpConstantComposite %v2uint %uint_4278190080 %uint_4278190080 + %1182 = OpConstantComposite %v2uint %uint_257 %uint_257 %2682 = OpConstantComposite %v2uint %uint_65280 %uint_65280 + %2014 = OpConstantComposite %v2uint %uint_4278190080 %uint_4278190080 %5663 = OpFunction %void None %1282 %15110 = OpLabel OpSelectionMerge %19578 None @@ -315,38 +317,38 @@ %21173 = OpVectorShuffle %v2uint %19948 %19948 0 1 %12738 = OpBitwiseAnd %v2uint %21173 %2993 %21619 = OpShiftRightLogical %v2uint %12738 %2143 - %8190 = OpBitwiseAnd %v2uint %21173 %1140 - %24090 = OpShiftLeftLogical %v2uint %8190 %2143 - %17486 = OpBitwiseOr %v2uint %21619 %24090 - %17700 = OpBitwiseOr %v2uint %17486 %2014 - %17868 = OpBitwiseAnd %v2uint %21173 %2682 + %6955 = OpBitwiseAnd %v2uint %21173 %1140 + %16264 = OpShiftLeftLogical %v2uint %6955 %2143 + %22500 = OpIMul %v2uint %16264 %1182 + %9857 = OpBitwiseOr %v2uint %21619 %22500 + %7416 = OpBitwiseAnd %v2uint %21173 %2682 %16088 = OpBitwiseAnd %v2uint %21173 %2014 %21002 = OpShiftRightLogical %v2uint %16088 %2143 - %7420 = OpCompositeExtract %uint %17868 0 - %24539 = OpCompositeExtract %uint %17868 1 + %7420 = OpCompositeExtract %uint %7416 0 + %24539 = OpCompositeExtract %uint %7416 1 %7641 = OpCompositeExtract %uint %21002 0 %7795 = OpCompositeExtract %uint %21002 1 %16161 = OpCompositeConstruct %v4uint %7420 %24539 %7641 %7795 %7774 = OpVectorShuffle %v4uint %16161 %16161 0 2 1 3 - %6860 = OpVectorShuffle %v4uint %17700 %17700 0 0 1 1 + %6860 = OpVectorShuffle %v4uint %9857 %9857 0 0 1 1 %24909 = OpBitwiseOr %v4uint %6860 %7774 %17181 = OpVectorShuffle %v2uint %19948 %19948 2 3 %6311 = OpBitwiseAnd %v2uint %17181 %2993 %21620 = OpShiftRightLogical %v2uint %6311 %2143 - %8191 = OpBitwiseAnd %v2uint %17181 %1140 - %24091 = OpShiftLeftLogical %v2uint %8191 %2143 - %17487 = OpBitwiseOr %v2uint %21620 %24091 - %17701 = OpBitwiseOr %v2uint %17487 %2014 - %17869 = OpBitwiseAnd %v2uint %17181 %2682 + %6956 = OpBitwiseAnd %v2uint %17181 %1140 + %16265 = OpShiftLeftLogical %v2uint %6956 %2143 + %22501 = OpIMul %v2uint %16265 %1182 + %9858 = OpBitwiseOr %v2uint %21620 %22501 + %7417 = OpBitwiseAnd %v2uint %17181 %2682 %16089 = OpBitwiseAnd %v2uint %17181 %2014 %21003 = OpShiftRightLogical %v2uint %16089 %2143 - %7421 = OpCompositeExtract %uint %17869 0 - %24540 = OpCompositeExtract %uint %17869 1 + %7421 = OpCompositeExtract %uint %7417 0 + %24540 = OpCompositeExtract %uint %7417 1 %7642 = OpCompositeExtract %uint %21003 0 %7796 = OpCompositeExtract %uint %21003 1 %16162 = OpCompositeConstruct %v4uint %7421 %24540 %7642 %7796 %7775 = OpVectorShuffle %v4uint %16162 %16162 0 2 1 3 - %6594 = OpVectorShuffle %v4uint %17701 %17701 0 0 1 1 + %6594 = OpVectorShuffle %v4uint %9858 %9858 0 0 1 1 %24728 = OpBitwiseOr %v4uint %6594 %7775 %8219 = OpAccessChain %_ptr_Uniform_v4uint %5134 %int_0 %21670 OpStore %8219 %24909 @@ -381,38 +383,38 @@ %21174 = OpVectorShuffle %v2uint %19949 %19949 0 1 %12739 = OpBitwiseAnd %v2uint %21174 %2993 %21621 = OpShiftRightLogical %v2uint %12739 %2143 - %8192 = OpBitwiseAnd %v2uint %21174 %1140 - %24092 = OpShiftLeftLogical %v2uint %8192 %2143 - %17488 = OpBitwiseOr %v2uint %21621 %24092 - %17702 = OpBitwiseOr %v2uint %17488 %2014 - %17870 = OpBitwiseAnd %v2uint %21174 %2682 + %6957 = OpBitwiseAnd %v2uint %21174 %1140 + %16266 = OpShiftLeftLogical %v2uint %6957 %2143 + %22502 = OpIMul %v2uint %16266 %1182 + %9859 = OpBitwiseOr %v2uint %21621 %22502 + %7418 = OpBitwiseAnd %v2uint %21174 %2682 %16090 = OpBitwiseAnd %v2uint %21174 %2014 %21004 = OpShiftRightLogical %v2uint %16090 %2143 - %7422 = OpCompositeExtract %uint %17870 0 - %24541 = OpCompositeExtract %uint %17870 1 + %7422 = OpCompositeExtract %uint %7418 0 + %24541 = OpCompositeExtract %uint %7418 1 %7643 = OpCompositeExtract %uint %21004 0 %7797 = OpCompositeExtract %uint %21004 1 %16163 = OpCompositeConstruct %v4uint %7422 %24541 %7643 %7797 %7776 = OpVectorShuffle %v4uint %16163 %16163 0 2 1 3 - %6861 = OpVectorShuffle %v4uint %17702 %17702 0 0 1 1 + %6861 = OpVectorShuffle %v4uint %9859 %9859 0 0 1 1 %24910 = OpBitwiseOr %v4uint %6861 %7776 %17182 = OpVectorShuffle %v2uint %19949 %19949 2 3 %6312 = OpBitwiseAnd %v2uint %17182 %2993 %21622 = OpShiftRightLogical %v2uint %6312 %2143 - %8193 = OpBitwiseAnd %v2uint %17182 %1140 - %24093 = OpShiftLeftLogical %v2uint %8193 %2143 - %17489 = OpBitwiseOr %v2uint %21622 %24093 - %17703 = OpBitwiseOr %v2uint %17489 %2014 - %17871 = OpBitwiseAnd %v2uint %17182 %2682 + %6958 = OpBitwiseAnd %v2uint %17182 %1140 + %16267 = OpShiftLeftLogical %v2uint %6958 %2143 + %22503 = OpIMul %v2uint %16267 %1182 + %9860 = OpBitwiseOr %v2uint %21622 %22503 + %7419 = OpBitwiseAnd %v2uint %17182 %2682 %16091 = OpBitwiseAnd %v2uint %17182 %2014 %21005 = OpShiftRightLogical %v2uint %16091 %2143 - %7423 = OpCompositeExtract %uint %17871 0 - %24542 = OpCompositeExtract %uint %17871 1 + %7423 = OpCompositeExtract %uint %7419 0 + %24542 = OpCompositeExtract %uint %7419 1 %7644 = OpCompositeExtract %uint %21005 0 %7798 = OpCompositeExtract %uint %21005 1 %16164 = OpCompositeConstruct %v4uint %7423 %24542 %7644 %7798 %7777 = OpVectorShuffle %v4uint %16164 %16164 0 2 1 3 - %7791 = OpVectorShuffle %v4uint %17703 %17703 0 0 1 1 + %7791 = OpVectorShuffle %v4uint %9860 %9860 0 0 1 1 %13886 = OpBitwiseOr %v4uint %7791 %7777 %17818 = OpIAdd %uint %21670 %uint_2 %6441 = OpAccessChain %_ptr_Uniform_v4uint %5134 %int_0 %17818 @@ -426,7 +428,7 @@ OpFunctionEnd #endif -const uint32_t texture_load_bgrg8_rgba8_cs[] = { +const uint32_t texture_load_bgrg8_rgb8_cs[] = { 0x07230203, 0x00010000, 0x0008000A, 0x0000625B, 0x00000000, 0x00020011, 0x00000001, 0x0006000B, 0x00000001, 0x4C534C47, 0x6474732E, 0x3035342E, 0x00000000, 0x0003000E, 0x00000000, 0x00000001, 0x0006000F, 0x00000005, @@ -457,298 +459,300 @@ const uint32_t texture_load_bgrg8_rgba8_cs[] = { 0x0000000C, 0x00000003, 0x00020014, 0x00000009, 0x00040017, 0x00000014, 0x0000000B, 0x00000003, 0x0004002B, 0x0000000B, 0x000005A9, 0x00FF0000, 0x0004002B, 0x0000000B, 0x00000A3A, 0x00000010, 0x0004002B, 0x0000000B, - 0x00000144, 0x000000FF, 0x0004002B, 0x0000000B, 0x00000580, 0xFF000000, + 0x00000144, 0x000000FF, 0x0004002B, 0x0000000B, 0x0000014A, 0x00000101, 0x0004002B, 0x0000000B, 0x00000A87, 0x0000FF00, 0x0004002B, 0x0000000B, - 0x00000A0D, 0x00000001, 0x0004002B, 0x0000000B, 0x00000A10, 0x00000002, - 0x0004002B, 0x0000000B, 0x000008A6, 0x00FF00FF, 0x0004002B, 0x0000000B, - 0x00000A22, 0x00000008, 0x0004002B, 0x0000000B, 0x000005FD, 0xFF00FF00, - 0x0004002B, 0x0000000B, 0x00000A13, 0x00000003, 0x0004002B, 0x0000000B, - 0x00000A0A, 0x00000000, 0x0004002B, 0x0000000C, 0x00000A1A, 0x00000005, - 0x0004002B, 0x0000000B, 0x00000A19, 0x00000005, 0x0004002B, 0x0000000C, - 0x00000A20, 0x00000007, 0x0004002B, 0x0000000C, 0x00000A35, 0x0000000E, - 0x0004002B, 0x0000000C, 0x00000A11, 0x00000002, 0x0004002B, 0x0000000C, - 0x000009DB, 0xFFFFFFF0, 0x0004002B, 0x0000000C, 0x00000A0E, 0x00000001, - 0x0004002B, 0x0000000C, 0x00000A38, 0x0000000F, 0x0004002B, 0x0000000C, - 0x00000A17, 0x00000004, 0x0004002B, 0x0000000C, 0x0000040B, 0xFFFFFE00, - 0x0004002B, 0x0000000C, 0x00000A14, 0x00000003, 0x0004002B, 0x0000000C, - 0x00000A3B, 0x00000010, 0x0004002B, 0x0000000C, 0x00000388, 0x000001C0, - 0x0004002B, 0x0000000C, 0x00000A23, 0x00000008, 0x0004002B, 0x0000000C, - 0x00000A1D, 0x00000006, 0x0004002B, 0x0000000C, 0x00000AC8, 0x0000003F, - 0x0004002B, 0x0000000B, 0x00000A16, 0x00000004, 0x0004002B, 0x0000000C, - 0x0000078B, 0x0FFFFFFF, 0x0004002B, 0x0000000C, 0x00000A05, 0xFFFFFFFE, - 0x0004002B, 0x0000000B, 0x00000A6A, 0x00000020, 0x000A001E, 0x00000489, - 0x0000000B, 0x0000000B, 0x0000000B, 0x0000000B, 0x00000014, 0x0000000B, - 0x0000000B, 0x0000000B, 0x00040020, 0x00000706, 0x00000002, 0x00000489, - 0x0004003B, 0x00000706, 0x0000147D, 0x00000002, 0x0004002B, 0x0000000C, - 0x00000A0B, 0x00000000, 0x00040020, 0x00000288, 0x00000002, 0x0000000B, - 0x00040020, 0x00000291, 0x00000002, 0x00000014, 0x00040020, 0x00000292, - 0x00000001, 0x00000014, 0x0004003B, 0x00000292, 0x00000F48, 0x00000001, - 0x0006002C, 0x00000014, 0x00000A2B, 0x00000A13, 0x00000A0A, 0x00000A0A, - 0x00040017, 0x0000000F, 0x00000009, 0x00000002, 0x0003001D, 0x000007DC, - 0x00000017, 0x0003001E, 0x000007B4, 0x000007DC, 0x00040020, 0x00000A31, - 0x00000002, 0x000007B4, 0x0004003B, 0x00000A31, 0x0000107A, 0x00000002, - 0x00040020, 0x00000294, 0x00000002, 0x00000017, 0x0003001D, 0x000007DD, - 0x00000017, 0x0003001E, 0x000007B5, 0x000007DD, 0x00040020, 0x00000A32, - 0x00000002, 0x000007B5, 0x0004003B, 0x00000A32, 0x0000140E, 0x00000002, - 0x0006002C, 0x00000014, 0x00000BC3, 0x00000A16, 0x00000A6A, 0x00000A0D, - 0x0004002B, 0x0000000B, 0x00000A25, 0x00000009, 0x0007002C, 0x00000017, - 0x000009CE, 0x000008A6, 0x000008A6, 0x000008A6, 0x000008A6, 0x0007002C, - 0x00000017, 0x0000013D, 0x00000A22, 0x00000A22, 0x00000A22, 0x00000A22, - 0x0007002C, 0x00000017, 0x0000072E, 0x000005FD, 0x000005FD, 0x000005FD, - 0x000005FD, 0x0007002C, 0x00000017, 0x000002ED, 0x00000A3A, 0x00000A3A, - 0x00000A3A, 0x00000A3A, 0x0005002C, 0x00000011, 0x00000BB1, 0x000005A9, - 0x000005A9, 0x0005002C, 0x00000011, 0x0000085F, 0x00000A3A, 0x00000A3A, - 0x0005002C, 0x00000011, 0x00000474, 0x00000144, 0x00000144, 0x0005002C, - 0x00000011, 0x000007DE, 0x00000580, 0x00000580, 0x0005002C, 0x00000011, - 0x00000A7A, 0x00000A87, 0x00000A87, 0x00050036, 0x00000008, 0x0000161F, - 0x00000000, 0x00000502, 0x000200F8, 0x00003B06, 0x000300F7, 0x00004C7A, - 0x00000000, 0x000300FB, 0x00000A0A, 0x00003B21, 0x000200F8, 0x00003B21, - 0x0004003D, 0x00000014, 0x0000312F, 0x00000F48, 0x000500C4, 0x00000014, - 0x000027F5, 0x0000312F, 0x00000A2B, 0x00050041, 0x00000291, 0x0000625A, - 0x0000147D, 0x00000A17, 0x0004003D, 0x00000014, 0x000059B5, 0x0000625A, - 0x0007004F, 0x00000011, 0x00004993, 0x000027F5, 0x000027F5, 0x00000000, - 0x00000001, 0x0007004F, 0x00000011, 0x000019E2, 0x000059B5, 0x000059B5, - 0x00000000, 0x00000001, 0x000500AE, 0x0000000F, 0x00004288, 0x00004993, - 0x000019E2, 0x0004009A, 0x00000009, 0x00006067, 0x00004288, 0x000300F7, - 0x0000188A, 0x00000002, 0x000400FA, 0x00006067, 0x000055E8, 0x0000188A, - 0x000200F8, 0x000055E8, 0x000200F9, 0x00004C7A, 0x000200F8, 0x0000188A, - 0x0004007C, 0x00000016, 0x00001A8B, 0x000027F5, 0x00050041, 0x00000288, - 0x00004968, 0x0000147D, 0x00000A1D, 0x0004003D, 0x0000000B, 0x0000263C, - 0x00004968, 0x00050051, 0x0000000B, 0x00004F98, 0x000059B5, 0x00000001, - 0x00050051, 0x0000000C, 0x00003964, 0x00001A8B, 0x00000000, 0x00050084, - 0x0000000C, 0x0000591A, 0x00003964, 0x00000A23, 0x00050051, 0x0000000C, - 0x000018DA, 0x00001A8B, 0x00000002, 0x0004007C, 0x0000000C, 0x000038A9, - 0x00004F98, 0x00050084, 0x0000000C, 0x00002C0F, 0x000018DA, 0x000038A9, - 0x00050051, 0x0000000C, 0x000044BE, 0x00001A8B, 0x00000001, 0x00050080, - 0x0000000C, 0x000056D4, 0x00002C0F, 0x000044BE, 0x0004007C, 0x0000000C, - 0x00005785, 0x0000263C, 0x00050084, 0x0000000C, 0x00005FD7, 0x000056D4, - 0x00005785, 0x00050080, 0x0000000C, 0x00001B95, 0x0000591A, 0x00005FD7, - 0x0004007C, 0x0000000B, 0x00004B46, 0x00001B95, 0x00050041, 0x00000288, - 0x00004C04, 0x0000147D, 0x00000A1A, 0x0004003D, 0x0000000B, 0x0000595B, - 0x00004C04, 0x00050080, 0x0000000B, 0x00002145, 0x00004B46, 0x0000595B, - 0x000500C2, 0x0000000B, 0x000054A6, 0x00002145, 0x00000A16, 0x00050041, - 0x00000288, 0x000051D6, 0x0000147D, 0x00000A0B, 0x0004003D, 0x0000000B, - 0x000053A3, 0x000051D6, 0x000500C7, 0x0000000B, 0x000018ED, 0x000053A3, - 0x00000A0D, 0x000500AB, 0x00000009, 0x000028E3, 0x000018ED, 0x00000A0A, - 0x000300F7, 0x00005AE2, 0x00000002, 0x000400FA, 0x000028E3, 0x0000277C, - 0x00002A0D, 0x000200F8, 0x0000277C, 0x000500C7, 0x0000000B, 0x00005BD4, - 0x000053A3, 0x00000A10, 0x000500AB, 0x00000009, 0x00003FAC, 0x00005BD4, - 0x00000A0A, 0x000300F7, 0x00001E0B, 0x00000002, 0x000400FA, 0x00003FAC, - 0x00002F61, 0x00006228, 0x000200F8, 0x00002F61, 0x00050041, 0x00000288, - 0x00004722, 0x0000147D, 0x00000A11, 0x0004003D, 0x0000000B, 0x00003D0B, - 0x00004722, 0x00050041, 0x00000288, 0x00005860, 0x0000147D, 0x00000A14, - 0x0004003D, 0x0000000B, 0x0000541F, 0x00005860, 0x000500C3, 0x0000000C, - 0x00003A4B, 0x000044BE, 0x00000A17, 0x000500C3, 0x0000000C, 0x00004955, - 0x000018DA, 0x00000A11, 0x000500C2, 0x0000000B, 0x00004947, 0x0000541F, - 0x00000A16, 0x0004007C, 0x0000000C, 0x000018AA, 0x00004947, 0x00050084, - 0x0000000C, 0x00005321, 0x00004955, 0x000018AA, 0x00050080, 0x0000000C, - 0x00003B27, 0x00003A4B, 0x00005321, 0x000500C2, 0x0000000B, 0x00002348, - 0x00003D0B, 0x00000A19, 0x0004007C, 0x0000000C, 0x00003901, 0x00002348, - 0x00050084, 0x0000000C, 0x000020F4, 0x00003B27, 0x00003901, 0x000500C3, - 0x0000000C, 0x000032BA, 0x00003964, 0x00000A1A, 0x00050080, 0x0000000C, - 0x00005FEE, 0x000032BA, 0x000020F4, 0x000500C4, 0x0000000C, 0x0000225D, - 0x00005FEE, 0x00000A22, 0x000500C7, 0x0000000C, 0x00002CF6, 0x0000225D, - 0x0000078B, 0x000500C4, 0x0000000C, 0x000049FA, 0x00002CF6, 0x00000A0E, - 0x000500C7, 0x0000000C, 0x00004D38, 0x00003964, 0x00000A20, 0x000500C7, - 0x0000000C, 0x00003138, 0x000044BE, 0x00000A1D, 0x000500C4, 0x0000000C, - 0x0000454D, 0x00003138, 0x00000A11, 0x00050080, 0x0000000C, 0x0000434B, - 0x00004D38, 0x0000454D, 0x000500C4, 0x0000000C, 0x00001B88, 0x0000434B, - 0x00000A22, 0x000500C3, 0x0000000C, 0x00005DE3, 0x00001B88, 0x00000A1D, - 0x000500C3, 0x0000000C, 0x00002215, 0x000044BE, 0x00000A14, 0x00050080, - 0x0000000C, 0x000035A3, 0x00002215, 0x00004955, 0x000500C7, 0x0000000C, - 0x00005A0C, 0x000035A3, 0x00000A0E, 0x000500C3, 0x0000000C, 0x00004112, - 0x00003964, 0x00000A14, 0x000500C4, 0x0000000C, 0x0000496A, 0x00005A0C, - 0x00000A0E, 0x00050080, 0x0000000C, 0x000034BD, 0x00004112, 0x0000496A, - 0x000500C7, 0x0000000C, 0x00004ADD, 0x000034BD, 0x00000A14, 0x000500C4, - 0x0000000C, 0x0000544A, 0x00004ADD, 0x00000A0E, 0x00050080, 0x0000000C, - 0x00003C4B, 0x00005A0C, 0x0000544A, 0x000500C7, 0x0000000C, 0x0000335E, - 0x00005DE3, 0x000009DB, 0x00050080, 0x0000000C, 0x00004F70, 0x000049FA, - 0x0000335E, 0x000500C4, 0x0000000C, 0x00005B31, 0x00004F70, 0x00000A0E, - 0x000500C7, 0x0000000C, 0x00005AEA, 0x00005DE3, 0x00000A38, 0x00050080, - 0x0000000C, 0x0000285C, 0x00005B31, 0x00005AEA, 0x000500C7, 0x0000000C, - 0x000047B4, 0x000018DA, 0x00000A14, 0x000500C4, 0x0000000C, 0x0000544B, - 0x000047B4, 0x00000A22, 0x00050080, 0x0000000C, 0x00004157, 0x0000285C, - 0x0000544B, 0x000500C7, 0x0000000C, 0x00004ADE, 0x000044BE, 0x00000A0E, - 0x000500C4, 0x0000000C, 0x0000544C, 0x00004ADE, 0x00000A17, 0x00050080, - 0x0000000C, 0x00004158, 0x00004157, 0x0000544C, 0x000500C7, 0x0000000C, - 0x00004FD6, 0x00003C4B, 0x00000A0E, 0x000500C4, 0x0000000C, 0x00002703, - 0x00004FD6, 0x00000A14, 0x000500C3, 0x0000000C, 0x00003332, 0x00004158, - 0x00000A1D, 0x000500C7, 0x0000000C, 0x000036D6, 0x00003332, 0x00000A20, - 0x00050080, 0x0000000C, 0x00003412, 0x00002703, 0x000036D6, 0x000500C4, - 0x0000000C, 0x00005B32, 0x00003412, 0x00000A14, 0x000500C7, 0x0000000C, - 0x00005AB1, 0x00003C4B, 0x00000A05, 0x00050080, 0x0000000C, 0x00002A9C, - 0x00005B32, 0x00005AB1, 0x000500C4, 0x0000000C, 0x00005B33, 0x00002A9C, - 0x00000A11, 0x000500C7, 0x0000000C, 0x00005AB2, 0x00004158, 0x0000040B, - 0x00050080, 0x0000000C, 0x00002A9D, 0x00005B33, 0x00005AB2, 0x000500C4, - 0x0000000C, 0x00005B34, 0x00002A9D, 0x00000A14, 0x000500C7, 0x0000000C, - 0x00005EA0, 0x00004158, 0x00000AC8, 0x00050080, 0x0000000C, 0x000054ED, - 0x00005B34, 0x00005EA0, 0x000200F9, 0x00001E0B, 0x000200F8, 0x00006228, - 0x0004007C, 0x00000012, 0x00001A8C, 0x00004993, 0x00050041, 0x00000288, - 0x00004969, 0x0000147D, 0x00000A11, 0x0004003D, 0x0000000B, 0x00002EB2, - 0x00004969, 0x00050051, 0x0000000C, 0x00004944, 0x00001A8C, 0x00000000, - 0x000500C3, 0x0000000C, 0x00004CF5, 0x00004944, 0x00000A1A, 0x00050051, - 0x0000000C, 0x00002747, 0x00001A8C, 0x00000001, 0x000500C3, 0x0000000C, - 0x0000405C, 0x00002747, 0x00000A1A, 0x000500C2, 0x0000000B, 0x00005B4D, - 0x00002EB2, 0x00000A19, 0x0004007C, 0x0000000C, 0x000018AB, 0x00005B4D, - 0x00050084, 0x0000000C, 0x00005347, 0x0000405C, 0x000018AB, 0x00050080, - 0x0000000C, 0x00003F5E, 0x00004CF5, 0x00005347, 0x000500C4, 0x0000000C, - 0x00004A8E, 0x00003F5E, 0x00000A25, 0x000500C7, 0x0000000C, 0x00002AB6, - 0x00004944, 0x00000A20, 0x000500C7, 0x0000000C, 0x00003139, 0x00002747, - 0x00000A35, 0x000500C4, 0x0000000C, 0x0000454E, 0x00003139, 0x00000A11, - 0x00050080, 0x0000000C, 0x00004397, 0x00002AB6, 0x0000454E, 0x000500C4, - 0x0000000C, 0x000018E7, 0x00004397, 0x00000A10, 0x000500C7, 0x0000000C, - 0x000027B1, 0x000018E7, 0x000009DB, 0x000500C4, 0x0000000C, 0x00002F76, - 0x000027B1, 0x00000A0E, 0x00050080, 0x0000000C, 0x00003C4C, 0x00004A8E, - 0x00002F76, 0x000500C7, 0x0000000C, 0x00003397, 0x000018E7, 0x00000A38, - 0x00050080, 0x0000000C, 0x00004D30, 0x00003C4C, 0x00003397, 0x000500C7, - 0x0000000C, 0x000047B5, 0x00002747, 0x00000A0E, 0x000500C4, 0x0000000C, - 0x0000544D, 0x000047B5, 0x00000A17, 0x00050080, 0x0000000C, 0x00004159, - 0x00004D30, 0x0000544D, 0x000500C7, 0x0000000C, 0x00005022, 0x00004159, - 0x0000040B, 0x000500C4, 0x0000000C, 0x00002416, 0x00005022, 0x00000A14, - 0x000500C7, 0x0000000C, 0x00004A33, 0x00002747, 0x00000A3B, 0x000500C4, - 0x0000000C, 0x00002F77, 0x00004A33, 0x00000A20, 0x00050080, 0x0000000C, - 0x0000415A, 0x00002416, 0x00002F77, 0x000500C7, 0x0000000C, 0x00004ADF, - 0x00004159, 0x00000388, 0x000500C4, 0x0000000C, 0x0000544E, 0x00004ADF, - 0x00000A11, 0x00050080, 0x0000000C, 0x00004144, 0x0000415A, 0x0000544E, - 0x000500C7, 0x0000000C, 0x00005083, 0x00002747, 0x00000A23, 0x000500C3, - 0x0000000C, 0x000041BF, 0x00005083, 0x00000A11, 0x000500C3, 0x0000000C, - 0x00001EEC, 0x00004944, 0x00000A14, 0x00050080, 0x0000000C, 0x000035B6, - 0x000041BF, 0x00001EEC, 0x000500C7, 0x0000000C, 0x00005453, 0x000035B6, - 0x00000A14, 0x000500C4, 0x0000000C, 0x0000544F, 0x00005453, 0x00000A1D, - 0x00050080, 0x0000000C, 0x00003C4D, 0x00004144, 0x0000544F, 0x000500C7, - 0x0000000C, 0x0000374D, 0x00004159, 0x00000AC8, 0x00050080, 0x0000000C, - 0x00002F42, 0x00003C4D, 0x0000374D, 0x000200F9, 0x00001E0B, 0x000200F8, - 0x00001E0B, 0x000700F5, 0x0000000C, 0x0000292C, 0x000054ED, 0x00002F61, - 0x00002F42, 0x00006228, 0x000200F9, 0x00005AE2, 0x000200F8, 0x00002A0D, - 0x00050041, 0x00000288, 0x00005098, 0x0000147D, 0x00000A11, 0x0004003D, - 0x0000000B, 0x00003D0C, 0x00005098, 0x00050041, 0x00000288, 0x000053B3, - 0x0000147D, 0x00000A14, 0x0004003D, 0x0000000B, 0x00002EEE, 0x000053B3, - 0x00050084, 0x0000000C, 0x00002007, 0x00003964, 0x00000A17, 0x0004007C, - 0x0000000C, 0x00002DD8, 0x00002EEE, 0x00050084, 0x0000000C, 0x000021F2, - 0x000018DA, 0x00002DD8, 0x00050080, 0x0000000C, 0x0000208E, 0x000021F2, - 0x000044BE, 0x0004007C, 0x0000000C, 0x000022F8, 0x00003D0C, 0x00050084, - 0x0000000C, 0x00001E9F, 0x0000208E, 0x000022F8, 0x00050080, 0x0000000C, - 0x00001F30, 0x00002007, 0x00001E9F, 0x000200F9, 0x00005AE2, 0x000200F8, - 0x00005AE2, 0x000700F5, 0x0000000C, 0x00004D24, 0x0000292C, 0x00001E0B, - 0x00001F30, 0x00002A0D, 0x00050041, 0x00000288, 0x0000615A, 0x0000147D, - 0x00000A0E, 0x0004003D, 0x0000000B, 0x00001D4E, 0x0000615A, 0x0004007C, - 0x0000000C, 0x00003D46, 0x00001D4E, 0x00050080, 0x0000000C, 0x00003CDB, - 0x00003D46, 0x00004D24, 0x0004007C, 0x0000000B, 0x0000487C, 0x00003CDB, - 0x000500C2, 0x0000000B, 0x000053F5, 0x0000487C, 0x00000A16, 0x000500C2, - 0x0000000B, 0x00003A95, 0x000053A3, 0x00000A10, 0x000500C7, 0x0000000B, - 0x000020CA, 0x00003A95, 0x00000A13, 0x00060041, 0x00000294, 0x000050F7, - 0x0000107A, 0x00000A0B, 0x000053F5, 0x0004003D, 0x00000017, 0x00001FCE, - 0x000050F7, 0x000500AA, 0x00000009, 0x000035C0, 0x000020CA, 0x00000A0D, - 0x000500AA, 0x00000009, 0x00005376, 0x000020CA, 0x00000A10, 0x000500A6, - 0x00000009, 0x00005686, 0x000035C0, 0x00005376, 0x000300F7, 0x00003463, - 0x00000000, 0x000400FA, 0x00005686, 0x00002957, 0x00003463, 0x000200F8, - 0x00002957, 0x000500C7, 0x00000017, 0x0000475F, 0x00001FCE, 0x000009CE, - 0x000500C4, 0x00000017, 0x000024D1, 0x0000475F, 0x0000013D, 0x000500C7, - 0x00000017, 0x000050AC, 0x00001FCE, 0x0000072E, 0x000500C2, 0x00000017, - 0x0000448D, 0x000050AC, 0x0000013D, 0x000500C5, 0x00000017, 0x00003FF8, - 0x000024D1, 0x0000448D, 0x000200F9, 0x00003463, 0x000200F8, 0x00003463, - 0x000700F5, 0x00000017, 0x00005879, 0x00001FCE, 0x00005AE2, 0x00003FF8, - 0x00002957, 0x000500AA, 0x00000009, 0x00004CB6, 0x000020CA, 0x00000A13, - 0x000500A6, 0x00000009, 0x00003B23, 0x00005376, 0x00004CB6, 0x000300F7, - 0x00002DA2, 0x00000000, 0x000400FA, 0x00003B23, 0x00002B38, 0x00002DA2, - 0x000200F8, 0x00002B38, 0x000500C4, 0x00000017, 0x00005E17, 0x00005879, - 0x000002ED, 0x000500C2, 0x00000017, 0x00003BE7, 0x00005879, 0x000002ED, - 0x000500C5, 0x00000017, 0x000029E8, 0x00005E17, 0x00003BE7, 0x000200F9, - 0x00002DA2, 0x000200F8, 0x00002DA2, 0x000700F5, 0x00000017, 0x00004DEC, - 0x00005879, 0x00003463, 0x000029E8, 0x00002B38, 0x0007004F, 0x00000011, - 0x000052B5, 0x00004DEC, 0x00004DEC, 0x00000000, 0x00000001, 0x000500C7, - 0x00000011, 0x000031C2, 0x000052B5, 0x00000BB1, 0x000500C2, 0x00000011, - 0x00005473, 0x000031C2, 0x0000085F, 0x000500C7, 0x00000011, 0x00001FFE, - 0x000052B5, 0x00000474, 0x000500C4, 0x00000011, 0x00005E1A, 0x00001FFE, - 0x0000085F, 0x000500C5, 0x00000011, 0x0000444E, 0x00005473, 0x00005E1A, - 0x000500C5, 0x00000011, 0x00004524, 0x0000444E, 0x000007DE, 0x000500C7, - 0x00000011, 0x000045CC, 0x000052B5, 0x00000A7A, 0x000500C7, 0x00000011, - 0x00003ED8, 0x000052B5, 0x000007DE, 0x000500C2, 0x00000011, 0x0000520A, - 0x00003ED8, 0x0000085F, 0x00050051, 0x0000000B, 0x00001CFC, 0x000045CC, - 0x00000000, 0x00050051, 0x0000000B, 0x00005FDB, 0x000045CC, 0x00000001, - 0x00050051, 0x0000000B, 0x00001DD9, 0x0000520A, 0x00000000, 0x00050051, - 0x0000000B, 0x00001E73, 0x0000520A, 0x00000001, 0x00070050, 0x00000017, - 0x00003F21, 0x00001CFC, 0x00005FDB, 0x00001DD9, 0x00001E73, 0x0009004F, - 0x00000017, 0x00001E5E, 0x00003F21, 0x00003F21, 0x00000000, 0x00000002, - 0x00000001, 0x00000003, 0x0009004F, 0x00000017, 0x00001ACC, 0x00004524, - 0x00004524, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x000500C5, - 0x00000017, 0x0000614D, 0x00001ACC, 0x00001E5E, 0x0007004F, 0x00000011, - 0x0000431D, 0x00004DEC, 0x00004DEC, 0x00000002, 0x00000003, 0x000500C7, - 0x00000011, 0x000018A7, 0x0000431D, 0x00000BB1, 0x000500C2, 0x00000011, - 0x00005474, 0x000018A7, 0x0000085F, 0x000500C7, 0x00000011, 0x00001FFF, - 0x0000431D, 0x00000474, 0x000500C4, 0x00000011, 0x00005E1B, 0x00001FFF, - 0x0000085F, 0x000500C5, 0x00000011, 0x0000444F, 0x00005474, 0x00005E1B, - 0x000500C5, 0x00000011, 0x00004525, 0x0000444F, 0x000007DE, 0x000500C7, - 0x00000011, 0x000045CD, 0x0000431D, 0x00000A7A, 0x000500C7, 0x00000011, - 0x00003ED9, 0x0000431D, 0x000007DE, 0x000500C2, 0x00000011, 0x0000520B, - 0x00003ED9, 0x0000085F, 0x00050051, 0x0000000B, 0x00001CFD, 0x000045CD, - 0x00000000, 0x00050051, 0x0000000B, 0x00005FDC, 0x000045CD, 0x00000001, - 0x00050051, 0x0000000B, 0x00001DDA, 0x0000520B, 0x00000000, 0x00050051, - 0x0000000B, 0x00001E74, 0x0000520B, 0x00000001, 0x00070050, 0x00000017, - 0x00003F22, 0x00001CFD, 0x00005FDC, 0x00001DDA, 0x00001E74, 0x0009004F, - 0x00000017, 0x00001E5F, 0x00003F22, 0x00003F22, 0x00000000, 0x00000002, - 0x00000001, 0x00000003, 0x0009004F, 0x00000017, 0x000019C2, 0x00004525, - 0x00004525, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x000500C5, - 0x00000017, 0x00006098, 0x000019C2, 0x00001E5F, 0x00060041, 0x00000294, - 0x0000201B, 0x0000140E, 0x00000A0B, 0x000054A6, 0x0003003E, 0x0000201B, - 0x0000614D, 0x00050080, 0x0000000B, 0x00002CC1, 0x000054A6, 0x00000A0D, - 0x00060041, 0x00000294, 0x00005C66, 0x0000140E, 0x00000A0B, 0x00002CC1, - 0x0003003E, 0x00005C66, 0x00006098, 0x000600A9, 0x0000000B, 0x000041BE, - 0x000028E3, 0x00000A6A, 0x00000A3A, 0x000500C2, 0x0000000B, 0x0000593C, - 0x000041BE, 0x00000A16, 0x00050080, 0x0000000B, 0x0000367B, 0x000053F5, - 0x0000593C, 0x00060041, 0x00000294, 0x0000571A, 0x0000107A, 0x00000A0B, - 0x0000367B, 0x0004003D, 0x00000017, 0x000019B2, 0x0000571A, 0x000300F7, - 0x00003A1A, 0x00000000, 0x000400FA, 0x00005686, 0x00002958, 0x00003A1A, - 0x000200F8, 0x00002958, 0x000500C7, 0x00000017, 0x00004760, 0x000019B2, - 0x000009CE, 0x000500C4, 0x00000017, 0x000024D2, 0x00004760, 0x0000013D, - 0x000500C7, 0x00000017, 0x000050AD, 0x000019B2, 0x0000072E, 0x000500C2, - 0x00000017, 0x0000448E, 0x000050AD, 0x0000013D, 0x000500C5, 0x00000017, - 0x00003FF9, 0x000024D2, 0x0000448E, 0x000200F9, 0x00003A1A, 0x000200F8, - 0x00003A1A, 0x000700F5, 0x00000017, 0x00002AAC, 0x000019B2, 0x00002DA2, - 0x00003FF9, 0x00002958, 0x000300F7, 0x00002DA3, 0x00000000, 0x000400FA, - 0x00003B23, 0x00002B39, 0x00002DA3, 0x000200F8, 0x00002B39, 0x000500C4, - 0x00000017, 0x00005E18, 0x00002AAC, 0x000002ED, 0x000500C2, 0x00000017, - 0x00003BE8, 0x00002AAC, 0x000002ED, 0x000500C5, 0x00000017, 0x000029E9, - 0x00005E18, 0x00003BE8, 0x000200F9, 0x00002DA3, 0x000200F8, 0x00002DA3, - 0x000700F5, 0x00000017, 0x00004DED, 0x00002AAC, 0x00003A1A, 0x000029E9, - 0x00002B39, 0x0007004F, 0x00000011, 0x000052B6, 0x00004DED, 0x00004DED, - 0x00000000, 0x00000001, 0x000500C7, 0x00000011, 0x000031C3, 0x000052B6, - 0x00000BB1, 0x000500C2, 0x00000011, 0x00005475, 0x000031C3, 0x0000085F, - 0x000500C7, 0x00000011, 0x00002000, 0x000052B6, 0x00000474, 0x000500C4, - 0x00000011, 0x00005E1C, 0x00002000, 0x0000085F, 0x000500C5, 0x00000011, - 0x00004450, 0x00005475, 0x00005E1C, 0x000500C5, 0x00000011, 0x00004526, - 0x00004450, 0x000007DE, 0x000500C7, 0x00000011, 0x000045CE, 0x000052B6, - 0x00000A7A, 0x000500C7, 0x00000011, 0x00003EDA, 0x000052B6, 0x000007DE, - 0x000500C2, 0x00000011, 0x0000520C, 0x00003EDA, 0x0000085F, 0x00050051, - 0x0000000B, 0x00001CFE, 0x000045CE, 0x00000000, 0x00050051, 0x0000000B, - 0x00005FDD, 0x000045CE, 0x00000001, 0x00050051, 0x0000000B, 0x00001DDB, - 0x0000520C, 0x00000000, 0x00050051, 0x0000000B, 0x00001E75, 0x0000520C, - 0x00000001, 0x00070050, 0x00000017, 0x00003F23, 0x00001CFE, 0x00005FDD, - 0x00001DDB, 0x00001E75, 0x0009004F, 0x00000017, 0x00001E60, 0x00003F23, - 0x00003F23, 0x00000000, 0x00000002, 0x00000001, 0x00000003, 0x0009004F, - 0x00000017, 0x00001ACD, 0x00004526, 0x00004526, 0x00000000, 0x00000000, - 0x00000001, 0x00000001, 0x000500C5, 0x00000017, 0x0000614E, 0x00001ACD, - 0x00001E60, 0x0007004F, 0x00000011, 0x0000431E, 0x00004DED, 0x00004DED, - 0x00000002, 0x00000003, 0x000500C7, 0x00000011, 0x000018A8, 0x0000431E, - 0x00000BB1, 0x000500C2, 0x00000011, 0x00005476, 0x000018A8, 0x0000085F, - 0x000500C7, 0x00000011, 0x00002001, 0x0000431E, 0x00000474, 0x000500C4, - 0x00000011, 0x00005E1D, 0x00002001, 0x0000085F, 0x000500C5, 0x00000011, - 0x00004451, 0x00005476, 0x00005E1D, 0x000500C5, 0x00000011, 0x00004527, - 0x00004451, 0x000007DE, 0x000500C7, 0x00000011, 0x000045CF, 0x0000431E, - 0x00000A7A, 0x000500C7, 0x00000011, 0x00003EDB, 0x0000431E, 0x000007DE, - 0x000500C2, 0x00000011, 0x0000520D, 0x00003EDB, 0x0000085F, 0x00050051, - 0x0000000B, 0x00001CFF, 0x000045CF, 0x00000000, 0x00050051, 0x0000000B, - 0x00005FDE, 0x000045CF, 0x00000001, 0x00050051, 0x0000000B, 0x00001DDC, - 0x0000520D, 0x00000000, 0x00050051, 0x0000000B, 0x00001E76, 0x0000520D, - 0x00000001, 0x00070050, 0x00000017, 0x00003F24, 0x00001CFF, 0x00005FDE, - 0x00001DDC, 0x00001E76, 0x0009004F, 0x00000017, 0x00001E61, 0x00003F24, - 0x00003F24, 0x00000000, 0x00000002, 0x00000001, 0x00000003, 0x0009004F, - 0x00000017, 0x00001E6F, 0x00004527, 0x00004527, 0x00000000, 0x00000000, - 0x00000001, 0x00000001, 0x000500C5, 0x00000017, 0x0000363E, 0x00001E6F, - 0x00001E61, 0x00050080, 0x0000000B, 0x0000459A, 0x000054A6, 0x00000A10, - 0x00060041, 0x00000294, 0x00001929, 0x0000140E, 0x00000A0B, 0x0000459A, - 0x0003003E, 0x00001929, 0x0000614E, 0x00050080, 0x0000000B, 0x00002CC2, - 0x000054A6, 0x00000A13, 0x00060041, 0x00000294, 0x00006256, 0x0000140E, - 0x00000A0B, 0x00002CC2, 0x0003003E, 0x00006256, 0x0000363E, 0x000200F9, - 0x00004C7A, 0x000200F8, 0x00004C7A, 0x000100FD, 0x00010038, + 0x00000580, 0xFF000000, 0x0004002B, 0x0000000B, 0x00000A0D, 0x00000001, + 0x0004002B, 0x0000000B, 0x00000A10, 0x00000002, 0x0004002B, 0x0000000B, + 0x000008A6, 0x00FF00FF, 0x0004002B, 0x0000000B, 0x00000A22, 0x00000008, + 0x0004002B, 0x0000000B, 0x000005FD, 0xFF00FF00, 0x0004002B, 0x0000000B, + 0x00000A13, 0x00000003, 0x0004002B, 0x0000000B, 0x00000A0A, 0x00000000, + 0x0004002B, 0x0000000C, 0x00000A1A, 0x00000005, 0x0004002B, 0x0000000B, + 0x00000A19, 0x00000005, 0x0004002B, 0x0000000C, 0x00000A20, 0x00000007, + 0x0004002B, 0x0000000C, 0x00000A35, 0x0000000E, 0x0004002B, 0x0000000C, + 0x00000A11, 0x00000002, 0x0004002B, 0x0000000C, 0x000009DB, 0xFFFFFFF0, + 0x0004002B, 0x0000000C, 0x00000A0E, 0x00000001, 0x0004002B, 0x0000000C, + 0x00000A38, 0x0000000F, 0x0004002B, 0x0000000C, 0x00000A17, 0x00000004, + 0x0004002B, 0x0000000C, 0x0000040B, 0xFFFFFE00, 0x0004002B, 0x0000000C, + 0x00000A14, 0x00000003, 0x0004002B, 0x0000000C, 0x00000A3B, 0x00000010, + 0x0004002B, 0x0000000C, 0x00000388, 0x000001C0, 0x0004002B, 0x0000000C, + 0x00000A23, 0x00000008, 0x0004002B, 0x0000000C, 0x00000A1D, 0x00000006, + 0x0004002B, 0x0000000C, 0x00000AC8, 0x0000003F, 0x0004002B, 0x0000000B, + 0x00000A16, 0x00000004, 0x0004002B, 0x0000000C, 0x0000078B, 0x0FFFFFFF, + 0x0004002B, 0x0000000C, 0x00000A05, 0xFFFFFFFE, 0x0004002B, 0x0000000B, + 0x00000A6A, 0x00000020, 0x000A001E, 0x00000489, 0x0000000B, 0x0000000B, + 0x0000000B, 0x0000000B, 0x00000014, 0x0000000B, 0x0000000B, 0x0000000B, + 0x00040020, 0x00000706, 0x00000002, 0x00000489, 0x0004003B, 0x00000706, + 0x0000147D, 0x00000002, 0x0004002B, 0x0000000C, 0x00000A0B, 0x00000000, + 0x00040020, 0x00000288, 0x00000002, 0x0000000B, 0x00040020, 0x00000291, + 0x00000002, 0x00000014, 0x00040020, 0x00000292, 0x00000001, 0x00000014, + 0x0004003B, 0x00000292, 0x00000F48, 0x00000001, 0x0006002C, 0x00000014, + 0x00000A2B, 0x00000A13, 0x00000A0A, 0x00000A0A, 0x00040017, 0x0000000F, + 0x00000009, 0x00000002, 0x0003001D, 0x000007DC, 0x00000017, 0x0003001E, + 0x000007B4, 0x000007DC, 0x00040020, 0x00000A31, 0x00000002, 0x000007B4, + 0x0004003B, 0x00000A31, 0x0000107A, 0x00000002, 0x00040020, 0x00000294, + 0x00000002, 0x00000017, 0x0003001D, 0x000007DD, 0x00000017, 0x0003001E, + 0x000007B5, 0x000007DD, 0x00040020, 0x00000A32, 0x00000002, 0x000007B5, + 0x0004003B, 0x00000A32, 0x0000140E, 0x00000002, 0x0006002C, 0x00000014, + 0x00000BC3, 0x00000A16, 0x00000A6A, 0x00000A0D, 0x0004002B, 0x0000000B, + 0x00000A25, 0x00000009, 0x0007002C, 0x00000017, 0x000009CE, 0x000008A6, + 0x000008A6, 0x000008A6, 0x000008A6, 0x0007002C, 0x00000017, 0x0000013D, + 0x00000A22, 0x00000A22, 0x00000A22, 0x00000A22, 0x0007002C, 0x00000017, + 0x0000072E, 0x000005FD, 0x000005FD, 0x000005FD, 0x000005FD, 0x0007002C, + 0x00000017, 0x000002ED, 0x00000A3A, 0x00000A3A, 0x00000A3A, 0x00000A3A, + 0x0005002C, 0x00000011, 0x00000BB1, 0x000005A9, 0x000005A9, 0x0005002C, + 0x00000011, 0x0000085F, 0x00000A3A, 0x00000A3A, 0x0005002C, 0x00000011, + 0x00000474, 0x00000144, 0x00000144, 0x0005002C, 0x00000011, 0x0000049E, + 0x0000014A, 0x0000014A, 0x0005002C, 0x00000011, 0x00000A7A, 0x00000A87, + 0x00000A87, 0x0005002C, 0x00000011, 0x000007DE, 0x00000580, 0x00000580, + 0x00050036, 0x00000008, 0x0000161F, 0x00000000, 0x00000502, 0x000200F8, + 0x00003B06, 0x000300F7, 0x00004C7A, 0x00000000, 0x000300FB, 0x00000A0A, + 0x00003B21, 0x000200F8, 0x00003B21, 0x0004003D, 0x00000014, 0x0000312F, + 0x00000F48, 0x000500C4, 0x00000014, 0x000027F5, 0x0000312F, 0x00000A2B, + 0x00050041, 0x00000291, 0x0000625A, 0x0000147D, 0x00000A17, 0x0004003D, + 0x00000014, 0x000059B5, 0x0000625A, 0x0007004F, 0x00000011, 0x00004993, + 0x000027F5, 0x000027F5, 0x00000000, 0x00000001, 0x0007004F, 0x00000011, + 0x000019E2, 0x000059B5, 0x000059B5, 0x00000000, 0x00000001, 0x000500AE, + 0x0000000F, 0x00004288, 0x00004993, 0x000019E2, 0x0004009A, 0x00000009, + 0x00006067, 0x00004288, 0x000300F7, 0x0000188A, 0x00000002, 0x000400FA, + 0x00006067, 0x000055E8, 0x0000188A, 0x000200F8, 0x000055E8, 0x000200F9, + 0x00004C7A, 0x000200F8, 0x0000188A, 0x0004007C, 0x00000016, 0x00001A8B, + 0x000027F5, 0x00050041, 0x00000288, 0x00004968, 0x0000147D, 0x00000A1D, + 0x0004003D, 0x0000000B, 0x0000263C, 0x00004968, 0x00050051, 0x0000000B, + 0x00004F98, 0x000059B5, 0x00000001, 0x00050051, 0x0000000C, 0x00003964, + 0x00001A8B, 0x00000000, 0x00050084, 0x0000000C, 0x0000591A, 0x00003964, + 0x00000A23, 0x00050051, 0x0000000C, 0x000018DA, 0x00001A8B, 0x00000002, + 0x0004007C, 0x0000000C, 0x000038A9, 0x00004F98, 0x00050084, 0x0000000C, + 0x00002C0F, 0x000018DA, 0x000038A9, 0x00050051, 0x0000000C, 0x000044BE, + 0x00001A8B, 0x00000001, 0x00050080, 0x0000000C, 0x000056D4, 0x00002C0F, + 0x000044BE, 0x0004007C, 0x0000000C, 0x00005785, 0x0000263C, 0x00050084, + 0x0000000C, 0x00005FD7, 0x000056D4, 0x00005785, 0x00050080, 0x0000000C, + 0x00001B95, 0x0000591A, 0x00005FD7, 0x0004007C, 0x0000000B, 0x00004B46, + 0x00001B95, 0x00050041, 0x00000288, 0x00004C04, 0x0000147D, 0x00000A1A, + 0x0004003D, 0x0000000B, 0x0000595B, 0x00004C04, 0x00050080, 0x0000000B, + 0x00002145, 0x00004B46, 0x0000595B, 0x000500C2, 0x0000000B, 0x000054A6, + 0x00002145, 0x00000A16, 0x00050041, 0x00000288, 0x000051D6, 0x0000147D, + 0x00000A0B, 0x0004003D, 0x0000000B, 0x000053A3, 0x000051D6, 0x000500C7, + 0x0000000B, 0x000018ED, 0x000053A3, 0x00000A0D, 0x000500AB, 0x00000009, + 0x000028E3, 0x000018ED, 0x00000A0A, 0x000300F7, 0x00005AE2, 0x00000002, + 0x000400FA, 0x000028E3, 0x0000277C, 0x00002A0D, 0x000200F8, 0x0000277C, + 0x000500C7, 0x0000000B, 0x00005BD4, 0x000053A3, 0x00000A10, 0x000500AB, + 0x00000009, 0x00003FAC, 0x00005BD4, 0x00000A0A, 0x000300F7, 0x00001E0B, + 0x00000002, 0x000400FA, 0x00003FAC, 0x00002F61, 0x00006228, 0x000200F8, + 0x00002F61, 0x00050041, 0x00000288, 0x00004722, 0x0000147D, 0x00000A11, + 0x0004003D, 0x0000000B, 0x00003D0B, 0x00004722, 0x00050041, 0x00000288, + 0x00005860, 0x0000147D, 0x00000A14, 0x0004003D, 0x0000000B, 0x0000541F, + 0x00005860, 0x000500C3, 0x0000000C, 0x00003A4B, 0x000044BE, 0x00000A17, + 0x000500C3, 0x0000000C, 0x00004955, 0x000018DA, 0x00000A11, 0x000500C2, + 0x0000000B, 0x00004947, 0x0000541F, 0x00000A16, 0x0004007C, 0x0000000C, + 0x000018AA, 0x00004947, 0x00050084, 0x0000000C, 0x00005321, 0x00004955, + 0x000018AA, 0x00050080, 0x0000000C, 0x00003B27, 0x00003A4B, 0x00005321, + 0x000500C2, 0x0000000B, 0x00002348, 0x00003D0B, 0x00000A19, 0x0004007C, + 0x0000000C, 0x00003901, 0x00002348, 0x00050084, 0x0000000C, 0x000020F4, + 0x00003B27, 0x00003901, 0x000500C3, 0x0000000C, 0x000032BA, 0x00003964, + 0x00000A1A, 0x00050080, 0x0000000C, 0x00005FEE, 0x000032BA, 0x000020F4, + 0x000500C4, 0x0000000C, 0x0000225D, 0x00005FEE, 0x00000A22, 0x000500C7, + 0x0000000C, 0x00002CF6, 0x0000225D, 0x0000078B, 0x000500C4, 0x0000000C, + 0x000049FA, 0x00002CF6, 0x00000A0E, 0x000500C7, 0x0000000C, 0x00004D38, + 0x00003964, 0x00000A20, 0x000500C7, 0x0000000C, 0x00003138, 0x000044BE, + 0x00000A1D, 0x000500C4, 0x0000000C, 0x0000454D, 0x00003138, 0x00000A11, + 0x00050080, 0x0000000C, 0x0000434B, 0x00004D38, 0x0000454D, 0x000500C4, + 0x0000000C, 0x00001B88, 0x0000434B, 0x00000A22, 0x000500C3, 0x0000000C, + 0x00005DE3, 0x00001B88, 0x00000A1D, 0x000500C3, 0x0000000C, 0x00002215, + 0x000044BE, 0x00000A14, 0x00050080, 0x0000000C, 0x000035A3, 0x00002215, + 0x00004955, 0x000500C7, 0x0000000C, 0x00005A0C, 0x000035A3, 0x00000A0E, + 0x000500C3, 0x0000000C, 0x00004112, 0x00003964, 0x00000A14, 0x000500C4, + 0x0000000C, 0x0000496A, 0x00005A0C, 0x00000A0E, 0x00050080, 0x0000000C, + 0x000034BD, 0x00004112, 0x0000496A, 0x000500C7, 0x0000000C, 0x00004ADD, + 0x000034BD, 0x00000A14, 0x000500C4, 0x0000000C, 0x0000544A, 0x00004ADD, + 0x00000A0E, 0x00050080, 0x0000000C, 0x00003C4B, 0x00005A0C, 0x0000544A, + 0x000500C7, 0x0000000C, 0x0000335E, 0x00005DE3, 0x000009DB, 0x00050080, + 0x0000000C, 0x00004F70, 0x000049FA, 0x0000335E, 0x000500C4, 0x0000000C, + 0x00005B31, 0x00004F70, 0x00000A0E, 0x000500C7, 0x0000000C, 0x00005AEA, + 0x00005DE3, 0x00000A38, 0x00050080, 0x0000000C, 0x0000285C, 0x00005B31, + 0x00005AEA, 0x000500C7, 0x0000000C, 0x000047B4, 0x000018DA, 0x00000A14, + 0x000500C4, 0x0000000C, 0x0000544B, 0x000047B4, 0x00000A22, 0x00050080, + 0x0000000C, 0x00004157, 0x0000285C, 0x0000544B, 0x000500C7, 0x0000000C, + 0x00004ADE, 0x000044BE, 0x00000A0E, 0x000500C4, 0x0000000C, 0x0000544C, + 0x00004ADE, 0x00000A17, 0x00050080, 0x0000000C, 0x00004158, 0x00004157, + 0x0000544C, 0x000500C7, 0x0000000C, 0x00004FD6, 0x00003C4B, 0x00000A0E, + 0x000500C4, 0x0000000C, 0x00002703, 0x00004FD6, 0x00000A14, 0x000500C3, + 0x0000000C, 0x00003332, 0x00004158, 0x00000A1D, 0x000500C7, 0x0000000C, + 0x000036D6, 0x00003332, 0x00000A20, 0x00050080, 0x0000000C, 0x00003412, + 0x00002703, 0x000036D6, 0x000500C4, 0x0000000C, 0x00005B32, 0x00003412, + 0x00000A14, 0x000500C7, 0x0000000C, 0x00005AB1, 0x00003C4B, 0x00000A05, + 0x00050080, 0x0000000C, 0x00002A9C, 0x00005B32, 0x00005AB1, 0x000500C4, + 0x0000000C, 0x00005B33, 0x00002A9C, 0x00000A11, 0x000500C7, 0x0000000C, + 0x00005AB2, 0x00004158, 0x0000040B, 0x00050080, 0x0000000C, 0x00002A9D, + 0x00005B33, 0x00005AB2, 0x000500C4, 0x0000000C, 0x00005B34, 0x00002A9D, + 0x00000A14, 0x000500C7, 0x0000000C, 0x00005EA0, 0x00004158, 0x00000AC8, + 0x00050080, 0x0000000C, 0x000054ED, 0x00005B34, 0x00005EA0, 0x000200F9, + 0x00001E0B, 0x000200F8, 0x00006228, 0x0004007C, 0x00000012, 0x00001A8C, + 0x00004993, 0x00050041, 0x00000288, 0x00004969, 0x0000147D, 0x00000A11, + 0x0004003D, 0x0000000B, 0x00002EB2, 0x00004969, 0x00050051, 0x0000000C, + 0x00004944, 0x00001A8C, 0x00000000, 0x000500C3, 0x0000000C, 0x00004CF5, + 0x00004944, 0x00000A1A, 0x00050051, 0x0000000C, 0x00002747, 0x00001A8C, + 0x00000001, 0x000500C3, 0x0000000C, 0x0000405C, 0x00002747, 0x00000A1A, + 0x000500C2, 0x0000000B, 0x00005B4D, 0x00002EB2, 0x00000A19, 0x0004007C, + 0x0000000C, 0x000018AB, 0x00005B4D, 0x00050084, 0x0000000C, 0x00005347, + 0x0000405C, 0x000018AB, 0x00050080, 0x0000000C, 0x00003F5E, 0x00004CF5, + 0x00005347, 0x000500C4, 0x0000000C, 0x00004A8E, 0x00003F5E, 0x00000A25, + 0x000500C7, 0x0000000C, 0x00002AB6, 0x00004944, 0x00000A20, 0x000500C7, + 0x0000000C, 0x00003139, 0x00002747, 0x00000A35, 0x000500C4, 0x0000000C, + 0x0000454E, 0x00003139, 0x00000A11, 0x00050080, 0x0000000C, 0x00004397, + 0x00002AB6, 0x0000454E, 0x000500C4, 0x0000000C, 0x000018E7, 0x00004397, + 0x00000A10, 0x000500C7, 0x0000000C, 0x000027B1, 0x000018E7, 0x000009DB, + 0x000500C4, 0x0000000C, 0x00002F76, 0x000027B1, 0x00000A0E, 0x00050080, + 0x0000000C, 0x00003C4C, 0x00004A8E, 0x00002F76, 0x000500C7, 0x0000000C, + 0x00003397, 0x000018E7, 0x00000A38, 0x00050080, 0x0000000C, 0x00004D30, + 0x00003C4C, 0x00003397, 0x000500C7, 0x0000000C, 0x000047B5, 0x00002747, + 0x00000A0E, 0x000500C4, 0x0000000C, 0x0000544D, 0x000047B5, 0x00000A17, + 0x00050080, 0x0000000C, 0x00004159, 0x00004D30, 0x0000544D, 0x000500C7, + 0x0000000C, 0x00005022, 0x00004159, 0x0000040B, 0x000500C4, 0x0000000C, + 0x00002416, 0x00005022, 0x00000A14, 0x000500C7, 0x0000000C, 0x00004A33, + 0x00002747, 0x00000A3B, 0x000500C4, 0x0000000C, 0x00002F77, 0x00004A33, + 0x00000A20, 0x00050080, 0x0000000C, 0x0000415A, 0x00002416, 0x00002F77, + 0x000500C7, 0x0000000C, 0x00004ADF, 0x00004159, 0x00000388, 0x000500C4, + 0x0000000C, 0x0000544E, 0x00004ADF, 0x00000A11, 0x00050080, 0x0000000C, + 0x00004144, 0x0000415A, 0x0000544E, 0x000500C7, 0x0000000C, 0x00005083, + 0x00002747, 0x00000A23, 0x000500C3, 0x0000000C, 0x000041BF, 0x00005083, + 0x00000A11, 0x000500C3, 0x0000000C, 0x00001EEC, 0x00004944, 0x00000A14, + 0x00050080, 0x0000000C, 0x000035B6, 0x000041BF, 0x00001EEC, 0x000500C7, + 0x0000000C, 0x00005453, 0x000035B6, 0x00000A14, 0x000500C4, 0x0000000C, + 0x0000544F, 0x00005453, 0x00000A1D, 0x00050080, 0x0000000C, 0x00003C4D, + 0x00004144, 0x0000544F, 0x000500C7, 0x0000000C, 0x0000374D, 0x00004159, + 0x00000AC8, 0x00050080, 0x0000000C, 0x00002F42, 0x00003C4D, 0x0000374D, + 0x000200F9, 0x00001E0B, 0x000200F8, 0x00001E0B, 0x000700F5, 0x0000000C, + 0x0000292C, 0x000054ED, 0x00002F61, 0x00002F42, 0x00006228, 0x000200F9, + 0x00005AE2, 0x000200F8, 0x00002A0D, 0x00050041, 0x00000288, 0x00005098, + 0x0000147D, 0x00000A11, 0x0004003D, 0x0000000B, 0x00003D0C, 0x00005098, + 0x00050041, 0x00000288, 0x000053B3, 0x0000147D, 0x00000A14, 0x0004003D, + 0x0000000B, 0x00002EEE, 0x000053B3, 0x00050084, 0x0000000C, 0x00002007, + 0x00003964, 0x00000A17, 0x0004007C, 0x0000000C, 0x00002DD8, 0x00002EEE, + 0x00050084, 0x0000000C, 0x000021F2, 0x000018DA, 0x00002DD8, 0x00050080, + 0x0000000C, 0x0000208E, 0x000021F2, 0x000044BE, 0x0004007C, 0x0000000C, + 0x000022F8, 0x00003D0C, 0x00050084, 0x0000000C, 0x00001E9F, 0x0000208E, + 0x000022F8, 0x00050080, 0x0000000C, 0x00001F30, 0x00002007, 0x00001E9F, + 0x000200F9, 0x00005AE2, 0x000200F8, 0x00005AE2, 0x000700F5, 0x0000000C, + 0x00004D24, 0x0000292C, 0x00001E0B, 0x00001F30, 0x00002A0D, 0x00050041, + 0x00000288, 0x0000615A, 0x0000147D, 0x00000A0E, 0x0004003D, 0x0000000B, + 0x00001D4E, 0x0000615A, 0x0004007C, 0x0000000C, 0x00003D46, 0x00001D4E, + 0x00050080, 0x0000000C, 0x00003CDB, 0x00003D46, 0x00004D24, 0x0004007C, + 0x0000000B, 0x0000487C, 0x00003CDB, 0x000500C2, 0x0000000B, 0x000053F5, + 0x0000487C, 0x00000A16, 0x000500C2, 0x0000000B, 0x00003A95, 0x000053A3, + 0x00000A10, 0x000500C7, 0x0000000B, 0x000020CA, 0x00003A95, 0x00000A13, + 0x00060041, 0x00000294, 0x000050F7, 0x0000107A, 0x00000A0B, 0x000053F5, + 0x0004003D, 0x00000017, 0x00001FCE, 0x000050F7, 0x000500AA, 0x00000009, + 0x000035C0, 0x000020CA, 0x00000A0D, 0x000500AA, 0x00000009, 0x00005376, + 0x000020CA, 0x00000A10, 0x000500A6, 0x00000009, 0x00005686, 0x000035C0, + 0x00005376, 0x000300F7, 0x00003463, 0x00000000, 0x000400FA, 0x00005686, + 0x00002957, 0x00003463, 0x000200F8, 0x00002957, 0x000500C7, 0x00000017, + 0x0000475F, 0x00001FCE, 0x000009CE, 0x000500C4, 0x00000017, 0x000024D1, + 0x0000475F, 0x0000013D, 0x000500C7, 0x00000017, 0x000050AC, 0x00001FCE, + 0x0000072E, 0x000500C2, 0x00000017, 0x0000448D, 0x000050AC, 0x0000013D, + 0x000500C5, 0x00000017, 0x00003FF8, 0x000024D1, 0x0000448D, 0x000200F9, + 0x00003463, 0x000200F8, 0x00003463, 0x000700F5, 0x00000017, 0x00005879, + 0x00001FCE, 0x00005AE2, 0x00003FF8, 0x00002957, 0x000500AA, 0x00000009, + 0x00004CB6, 0x000020CA, 0x00000A13, 0x000500A6, 0x00000009, 0x00003B23, + 0x00005376, 0x00004CB6, 0x000300F7, 0x00002DA2, 0x00000000, 0x000400FA, + 0x00003B23, 0x00002B38, 0x00002DA2, 0x000200F8, 0x00002B38, 0x000500C4, + 0x00000017, 0x00005E17, 0x00005879, 0x000002ED, 0x000500C2, 0x00000017, + 0x00003BE7, 0x00005879, 0x000002ED, 0x000500C5, 0x00000017, 0x000029E8, + 0x00005E17, 0x00003BE7, 0x000200F9, 0x00002DA2, 0x000200F8, 0x00002DA2, + 0x000700F5, 0x00000017, 0x00004DEC, 0x00005879, 0x00003463, 0x000029E8, + 0x00002B38, 0x0007004F, 0x00000011, 0x000052B5, 0x00004DEC, 0x00004DEC, + 0x00000000, 0x00000001, 0x000500C7, 0x00000011, 0x000031C2, 0x000052B5, + 0x00000BB1, 0x000500C2, 0x00000011, 0x00005473, 0x000031C2, 0x0000085F, + 0x000500C7, 0x00000011, 0x00001B2B, 0x000052B5, 0x00000474, 0x000500C4, + 0x00000011, 0x00003F88, 0x00001B2B, 0x0000085F, 0x00050084, 0x00000011, + 0x000057E4, 0x00003F88, 0x0000049E, 0x000500C5, 0x00000011, 0x00002681, + 0x00005473, 0x000057E4, 0x000500C7, 0x00000011, 0x00001CF8, 0x000052B5, + 0x00000A7A, 0x000500C7, 0x00000011, 0x00003ED8, 0x000052B5, 0x000007DE, + 0x000500C2, 0x00000011, 0x0000520A, 0x00003ED8, 0x0000085F, 0x00050051, + 0x0000000B, 0x00001CFC, 0x00001CF8, 0x00000000, 0x00050051, 0x0000000B, + 0x00005FDB, 0x00001CF8, 0x00000001, 0x00050051, 0x0000000B, 0x00001DD9, + 0x0000520A, 0x00000000, 0x00050051, 0x0000000B, 0x00001E73, 0x0000520A, + 0x00000001, 0x00070050, 0x00000017, 0x00003F21, 0x00001CFC, 0x00005FDB, + 0x00001DD9, 0x00001E73, 0x0009004F, 0x00000017, 0x00001E5E, 0x00003F21, + 0x00003F21, 0x00000000, 0x00000002, 0x00000001, 0x00000003, 0x0009004F, + 0x00000017, 0x00001ACC, 0x00002681, 0x00002681, 0x00000000, 0x00000000, + 0x00000001, 0x00000001, 0x000500C5, 0x00000017, 0x0000614D, 0x00001ACC, + 0x00001E5E, 0x0007004F, 0x00000011, 0x0000431D, 0x00004DEC, 0x00004DEC, + 0x00000002, 0x00000003, 0x000500C7, 0x00000011, 0x000018A7, 0x0000431D, + 0x00000BB1, 0x000500C2, 0x00000011, 0x00005474, 0x000018A7, 0x0000085F, + 0x000500C7, 0x00000011, 0x00001B2C, 0x0000431D, 0x00000474, 0x000500C4, + 0x00000011, 0x00003F89, 0x00001B2C, 0x0000085F, 0x00050084, 0x00000011, + 0x000057E5, 0x00003F89, 0x0000049E, 0x000500C5, 0x00000011, 0x00002682, + 0x00005474, 0x000057E5, 0x000500C7, 0x00000011, 0x00001CF9, 0x0000431D, + 0x00000A7A, 0x000500C7, 0x00000011, 0x00003ED9, 0x0000431D, 0x000007DE, + 0x000500C2, 0x00000011, 0x0000520B, 0x00003ED9, 0x0000085F, 0x00050051, + 0x0000000B, 0x00001CFD, 0x00001CF9, 0x00000000, 0x00050051, 0x0000000B, + 0x00005FDC, 0x00001CF9, 0x00000001, 0x00050051, 0x0000000B, 0x00001DDA, + 0x0000520B, 0x00000000, 0x00050051, 0x0000000B, 0x00001E74, 0x0000520B, + 0x00000001, 0x00070050, 0x00000017, 0x00003F22, 0x00001CFD, 0x00005FDC, + 0x00001DDA, 0x00001E74, 0x0009004F, 0x00000017, 0x00001E5F, 0x00003F22, + 0x00003F22, 0x00000000, 0x00000002, 0x00000001, 0x00000003, 0x0009004F, + 0x00000017, 0x000019C2, 0x00002682, 0x00002682, 0x00000000, 0x00000000, + 0x00000001, 0x00000001, 0x000500C5, 0x00000017, 0x00006098, 0x000019C2, + 0x00001E5F, 0x00060041, 0x00000294, 0x0000201B, 0x0000140E, 0x00000A0B, + 0x000054A6, 0x0003003E, 0x0000201B, 0x0000614D, 0x00050080, 0x0000000B, + 0x00002CC1, 0x000054A6, 0x00000A0D, 0x00060041, 0x00000294, 0x00005C66, + 0x0000140E, 0x00000A0B, 0x00002CC1, 0x0003003E, 0x00005C66, 0x00006098, + 0x000600A9, 0x0000000B, 0x000041BE, 0x000028E3, 0x00000A6A, 0x00000A3A, + 0x000500C2, 0x0000000B, 0x0000593C, 0x000041BE, 0x00000A16, 0x00050080, + 0x0000000B, 0x0000367B, 0x000053F5, 0x0000593C, 0x00060041, 0x00000294, + 0x0000571A, 0x0000107A, 0x00000A0B, 0x0000367B, 0x0004003D, 0x00000017, + 0x000019B2, 0x0000571A, 0x000300F7, 0x00003A1A, 0x00000000, 0x000400FA, + 0x00005686, 0x00002958, 0x00003A1A, 0x000200F8, 0x00002958, 0x000500C7, + 0x00000017, 0x00004760, 0x000019B2, 0x000009CE, 0x000500C4, 0x00000017, + 0x000024D2, 0x00004760, 0x0000013D, 0x000500C7, 0x00000017, 0x000050AD, + 0x000019B2, 0x0000072E, 0x000500C2, 0x00000017, 0x0000448E, 0x000050AD, + 0x0000013D, 0x000500C5, 0x00000017, 0x00003FF9, 0x000024D2, 0x0000448E, + 0x000200F9, 0x00003A1A, 0x000200F8, 0x00003A1A, 0x000700F5, 0x00000017, + 0x00002AAC, 0x000019B2, 0x00002DA2, 0x00003FF9, 0x00002958, 0x000300F7, + 0x00002DA3, 0x00000000, 0x000400FA, 0x00003B23, 0x00002B39, 0x00002DA3, + 0x000200F8, 0x00002B39, 0x000500C4, 0x00000017, 0x00005E18, 0x00002AAC, + 0x000002ED, 0x000500C2, 0x00000017, 0x00003BE8, 0x00002AAC, 0x000002ED, + 0x000500C5, 0x00000017, 0x000029E9, 0x00005E18, 0x00003BE8, 0x000200F9, + 0x00002DA3, 0x000200F8, 0x00002DA3, 0x000700F5, 0x00000017, 0x00004DED, + 0x00002AAC, 0x00003A1A, 0x000029E9, 0x00002B39, 0x0007004F, 0x00000011, + 0x000052B6, 0x00004DED, 0x00004DED, 0x00000000, 0x00000001, 0x000500C7, + 0x00000011, 0x000031C3, 0x000052B6, 0x00000BB1, 0x000500C2, 0x00000011, + 0x00005475, 0x000031C3, 0x0000085F, 0x000500C7, 0x00000011, 0x00001B2D, + 0x000052B6, 0x00000474, 0x000500C4, 0x00000011, 0x00003F8A, 0x00001B2D, + 0x0000085F, 0x00050084, 0x00000011, 0x000057E6, 0x00003F8A, 0x0000049E, + 0x000500C5, 0x00000011, 0x00002683, 0x00005475, 0x000057E6, 0x000500C7, + 0x00000011, 0x00001CFA, 0x000052B6, 0x00000A7A, 0x000500C7, 0x00000011, + 0x00003EDA, 0x000052B6, 0x000007DE, 0x000500C2, 0x00000011, 0x0000520C, + 0x00003EDA, 0x0000085F, 0x00050051, 0x0000000B, 0x00001CFE, 0x00001CFA, + 0x00000000, 0x00050051, 0x0000000B, 0x00005FDD, 0x00001CFA, 0x00000001, + 0x00050051, 0x0000000B, 0x00001DDB, 0x0000520C, 0x00000000, 0x00050051, + 0x0000000B, 0x00001E75, 0x0000520C, 0x00000001, 0x00070050, 0x00000017, + 0x00003F23, 0x00001CFE, 0x00005FDD, 0x00001DDB, 0x00001E75, 0x0009004F, + 0x00000017, 0x00001E60, 0x00003F23, 0x00003F23, 0x00000000, 0x00000002, + 0x00000001, 0x00000003, 0x0009004F, 0x00000017, 0x00001ACD, 0x00002683, + 0x00002683, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x000500C5, + 0x00000017, 0x0000614E, 0x00001ACD, 0x00001E60, 0x0007004F, 0x00000011, + 0x0000431E, 0x00004DED, 0x00004DED, 0x00000002, 0x00000003, 0x000500C7, + 0x00000011, 0x000018A8, 0x0000431E, 0x00000BB1, 0x000500C2, 0x00000011, + 0x00005476, 0x000018A8, 0x0000085F, 0x000500C7, 0x00000011, 0x00001B2E, + 0x0000431E, 0x00000474, 0x000500C4, 0x00000011, 0x00003F8B, 0x00001B2E, + 0x0000085F, 0x00050084, 0x00000011, 0x000057E7, 0x00003F8B, 0x0000049E, + 0x000500C5, 0x00000011, 0x00002684, 0x00005476, 0x000057E7, 0x000500C7, + 0x00000011, 0x00001CFB, 0x0000431E, 0x00000A7A, 0x000500C7, 0x00000011, + 0x00003EDB, 0x0000431E, 0x000007DE, 0x000500C2, 0x00000011, 0x0000520D, + 0x00003EDB, 0x0000085F, 0x00050051, 0x0000000B, 0x00001CFF, 0x00001CFB, + 0x00000000, 0x00050051, 0x0000000B, 0x00005FDE, 0x00001CFB, 0x00000001, + 0x00050051, 0x0000000B, 0x00001DDC, 0x0000520D, 0x00000000, 0x00050051, + 0x0000000B, 0x00001E76, 0x0000520D, 0x00000001, 0x00070050, 0x00000017, + 0x00003F24, 0x00001CFF, 0x00005FDE, 0x00001DDC, 0x00001E76, 0x0009004F, + 0x00000017, 0x00001E61, 0x00003F24, 0x00003F24, 0x00000000, 0x00000002, + 0x00000001, 0x00000003, 0x0009004F, 0x00000017, 0x00001E6F, 0x00002684, + 0x00002684, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x000500C5, + 0x00000017, 0x0000363E, 0x00001E6F, 0x00001E61, 0x00050080, 0x0000000B, + 0x0000459A, 0x000054A6, 0x00000A10, 0x00060041, 0x00000294, 0x00001929, + 0x0000140E, 0x00000A0B, 0x0000459A, 0x0003003E, 0x00001929, 0x0000614E, + 0x00050080, 0x0000000B, 0x00002CC2, 0x000054A6, 0x00000A13, 0x00060041, + 0x00000294, 0x00006256, 0x0000140E, 0x00000A0B, 0x00002CC2, 0x0003003E, + 0x00006256, 0x0000363E, 0x000200F9, 0x00004C7A, 0x000200F8, 0x00004C7A, + 0x000100FD, 0x00010038, }; diff --git a/src/xenia/gpu/shaders/bytecode/vulkan_spirv/texture_load_gbgr8_rgba8_cs.h b/src/xenia/gpu/shaders/bytecode/vulkan_spirv/texture_load_gbgr8_rgb8_cs.h similarity index 92% rename from src/xenia/gpu/shaders/bytecode/vulkan_spirv/texture_load_gbgr8_rgba8_cs.h rename to src/xenia/gpu/shaders/bytecode/vulkan_spirv/texture_load_gbgr8_rgb8_cs.h index ae9e0c34e..4be67b002 100644 --- a/src/xenia/gpu/shaders/bytecode/vulkan_spirv/texture_load_gbgr8_rgba8_cs.h +++ b/src/xenia/gpu/shaders/bytecode/vulkan_spirv/texture_load_gbgr8_rgb8_cs.h @@ -48,7 +48,7 @@ %uint_24 = OpConstant %uint 24 %uint_65280 = OpConstant %uint 65280 %uint_8 = OpConstant %uint 8 -%uint_4278190080 = OpConstant %uint 4278190080 + %uint_257 = OpConstant %uint 257 %uint_255 = OpConstant %uint 255 %uint_16711680 = OpConstant %uint 16711680 %uint_1 = OpConstant %uint 1 @@ -106,7 +106,7 @@ %2311 = OpConstantComposite %v2uint %uint_24 %uint_24 %2682 = OpConstantComposite %v2uint %uint_65280 %uint_65280 %1975 = OpConstantComposite %v2uint %uint_8 %uint_8 - %2014 = OpConstantComposite %v2uint %uint_4278190080 %uint_4278190080 + %1182 = OpConstantComposite %v2uint %uint_257 %uint_257 %1140 = OpConstantComposite %v2uint %uint_255 %uint_255 %2993 = OpConstantComposite %v2uint %uint_16711680 %uint_16711680 %5663 = OpFunction %void None %1282 @@ -316,12 +316,12 @@ %19853 = OpPhi %v4uint %22649 %13411 %10728 %11064 %22133 = OpVectorShuffle %v2uint %19853 %19853 0 1 %14639 = OpShiftRightLogical %v2uint %22133 %2311 - %7965 = OpBitwiseAnd %v2uint %22133 %2682 - %24090 = OpShiftLeftLogical %v2uint %7965 %1975 - %17486 = OpBitwiseOr %v2uint %14639 %24090 - %17643 = OpBitwiseOr %v2uint %17486 %2014 - %18482 = OpBitwiseAnd %v2uint %22133 %1140 - %22878 = OpShiftLeftLogical %v2uint %18482 %1975 + %6730 = OpBitwiseAnd %v2uint %22133 %2682 + %16264 = OpShiftLeftLogical %v2uint %6730 %1975 + %22500 = OpIMul %v2uint %16264 %1182 + %9800 = OpBitwiseOr %v2uint %14639 %22500 + %8030 = OpBitwiseAnd %v2uint %22133 %1140 + %22878 = OpShiftLeftLogical %v2uint %8030 %1975 %18448 = OpBitwiseAnd %v2uint %22133 %2993 %15354 = OpShiftRightLogical %v2uint %18448 %1975 %7420 = OpCompositeExtract %uint %22878 0 @@ -330,16 +330,16 @@ %7795 = OpCompositeExtract %uint %15354 1 %16161 = OpCompositeConstruct %v4uint %7420 %24539 %7641 %7795 %7774 = OpVectorShuffle %v4uint %16161 %16161 0 2 1 3 - %6860 = OpVectorShuffle %v4uint %17643 %17643 0 0 1 1 + %6860 = OpVectorShuffle %v4uint %9800 %9800 0 0 1 1 %24814 = OpBitwiseOr %v4uint %6860 %7774 %18141 = OpVectorShuffle %v2uint %19853 %19853 2 3 %8212 = OpShiftRightLogical %v2uint %18141 %2311 - %7966 = OpBitwiseAnd %v2uint %18141 %2682 - %24091 = OpShiftLeftLogical %v2uint %7966 %1975 - %17487 = OpBitwiseOr %v2uint %8212 %24091 - %17644 = OpBitwiseOr %v2uint %17487 %2014 - %18483 = OpBitwiseAnd %v2uint %18141 %1140 - %22879 = OpShiftLeftLogical %v2uint %18483 %1975 + %6731 = OpBitwiseAnd %v2uint %18141 %2682 + %16265 = OpShiftLeftLogical %v2uint %6731 %1975 + %22501 = OpIMul %v2uint %16265 %1182 + %9801 = OpBitwiseOr %v2uint %8212 %22501 + %8031 = OpBitwiseAnd %v2uint %18141 %1140 + %22879 = OpShiftLeftLogical %v2uint %8031 %1975 %18449 = OpBitwiseAnd %v2uint %18141 %2993 %15355 = OpShiftRightLogical %v2uint %18449 %1975 %7421 = OpCompositeExtract %uint %22879 0 @@ -348,7 +348,7 @@ %7796 = OpCompositeExtract %uint %15355 1 %16162 = OpCompositeConstruct %v4uint %7421 %24540 %7642 %7796 %7775 = OpVectorShuffle %v4uint %16162 %16162 0 2 1 3 - %6594 = OpVectorShuffle %v4uint %17644 %17644 0 0 1 1 + %6594 = OpVectorShuffle %v4uint %9801 %9801 0 0 1 1 %24728 = OpBitwiseOr %v4uint %6594 %7775 %8219 = OpAccessChain %_ptr_Uniform_v4uint %5134 %int_0 %21670 OpStore %8219 %24814 @@ -382,12 +382,12 @@ %19854 = OpPhi %v4uint %10924 %14874 %10729 %11065 %22134 = OpVectorShuffle %v2uint %19854 %19854 0 1 %14640 = OpShiftRightLogical %v2uint %22134 %2311 - %7967 = OpBitwiseAnd %v2uint %22134 %2682 - %24092 = OpShiftLeftLogical %v2uint %7967 %1975 - %17488 = OpBitwiseOr %v2uint %14640 %24092 - %17645 = OpBitwiseOr %v2uint %17488 %2014 - %18484 = OpBitwiseAnd %v2uint %22134 %1140 - %22880 = OpShiftLeftLogical %v2uint %18484 %1975 + %6732 = OpBitwiseAnd %v2uint %22134 %2682 + %16266 = OpShiftLeftLogical %v2uint %6732 %1975 + %22502 = OpIMul %v2uint %16266 %1182 + %9802 = OpBitwiseOr %v2uint %14640 %22502 + %8032 = OpBitwiseAnd %v2uint %22134 %1140 + %22880 = OpShiftLeftLogical %v2uint %8032 %1975 %18450 = OpBitwiseAnd %v2uint %22134 %2993 %15356 = OpShiftRightLogical %v2uint %18450 %1975 %7422 = OpCompositeExtract %uint %22880 0 @@ -396,16 +396,16 @@ %7797 = OpCompositeExtract %uint %15356 1 %16163 = OpCompositeConstruct %v4uint %7422 %24541 %7643 %7797 %7776 = OpVectorShuffle %v4uint %16163 %16163 0 2 1 3 - %6861 = OpVectorShuffle %v4uint %17645 %17645 0 0 1 1 + %6861 = OpVectorShuffle %v4uint %9802 %9802 0 0 1 1 %24815 = OpBitwiseOr %v4uint %6861 %7776 %18142 = OpVectorShuffle %v2uint %19854 %19854 2 3 %8213 = OpShiftRightLogical %v2uint %18142 %2311 - %7968 = OpBitwiseAnd %v2uint %18142 %2682 - %24093 = OpShiftLeftLogical %v2uint %7968 %1975 - %17489 = OpBitwiseOr %v2uint %8213 %24093 - %17646 = OpBitwiseOr %v2uint %17489 %2014 - %18485 = OpBitwiseAnd %v2uint %18142 %1140 - %22881 = OpShiftLeftLogical %v2uint %18485 %1975 + %6733 = OpBitwiseAnd %v2uint %18142 %2682 + %16267 = OpShiftLeftLogical %v2uint %6733 %1975 + %22503 = OpIMul %v2uint %16267 %1182 + %9803 = OpBitwiseOr %v2uint %8213 %22503 + %8033 = OpBitwiseAnd %v2uint %18142 %1140 + %22881 = OpShiftLeftLogical %v2uint %8033 %1975 %18451 = OpBitwiseAnd %v2uint %18142 %2993 %15357 = OpShiftRightLogical %v2uint %18451 %1975 %7423 = OpCompositeExtract %uint %22881 0 @@ -414,7 +414,7 @@ %7798 = OpCompositeExtract %uint %15357 1 %16164 = OpCompositeConstruct %v4uint %7423 %24542 %7644 %7798 %7777 = OpVectorShuffle %v4uint %16164 %16164 0 2 1 3 - %7791 = OpVectorShuffle %v4uint %17646 %17646 0 0 1 1 + %7791 = OpVectorShuffle %v4uint %9803 %9803 0 0 1 1 %13886 = OpBitwiseOr %v4uint %7791 %7777 %17818 = OpIAdd %uint %21670 %uint_2 %6441 = OpAccessChain %_ptr_Uniform_v4uint %5134 %int_0 %17818 @@ -428,7 +428,7 @@ OpFunctionEnd #endif -const uint32_t texture_load_gbgr8_rgba8_cs[] = { +const uint32_t texture_load_gbgr8_rgb8_cs[] = { 0x07230203, 0x00010000, 0x0008000A, 0x0000625B, 0x00000000, 0x00020011, 0x00000001, 0x0006000B, 0x00000001, 0x4C534C47, 0x6474732E, 0x3035342E, 0x00000000, 0x0003000E, 0x00000000, 0x00000001, 0x0006000F, 0x00000005, @@ -459,7 +459,7 @@ const uint32_t texture_load_gbgr8_rgba8_cs[] = { 0x0000000C, 0x00000003, 0x00020014, 0x00000009, 0x00040017, 0x00000014, 0x0000000B, 0x00000003, 0x0004002B, 0x0000000B, 0x00000A52, 0x00000018, 0x0004002B, 0x0000000B, 0x00000A87, 0x0000FF00, 0x0004002B, 0x0000000B, - 0x00000A22, 0x00000008, 0x0004002B, 0x0000000B, 0x00000580, 0xFF000000, + 0x00000A22, 0x00000008, 0x0004002B, 0x0000000B, 0x0000014A, 0x00000101, 0x0004002B, 0x0000000B, 0x00000144, 0x000000FF, 0x0004002B, 0x0000000B, 0x000005A9, 0x00FF0000, 0x0004002B, 0x0000000B, 0x00000A0D, 0x00000001, 0x0004002B, 0x0000000B, 0x00000A10, 0x00000002, 0x0004002B, 0x0000000B, @@ -501,8 +501,8 @@ const uint32_t texture_load_gbgr8_rgba8_cs[] = { 0x00000017, 0x000002ED, 0x00000A3A, 0x00000A3A, 0x00000A3A, 0x00000A3A, 0x0005002C, 0x00000011, 0x00000907, 0x00000A52, 0x00000A52, 0x0005002C, 0x00000011, 0x00000A7A, 0x00000A87, 0x00000A87, 0x0005002C, 0x00000011, - 0x000007B7, 0x00000A22, 0x00000A22, 0x0005002C, 0x00000011, 0x000007DE, - 0x00000580, 0x00000580, 0x0005002C, 0x00000011, 0x00000474, 0x00000144, + 0x000007B7, 0x00000A22, 0x00000A22, 0x0005002C, 0x00000011, 0x0000049E, + 0x0000014A, 0x0000014A, 0x0005002C, 0x00000011, 0x00000474, 0x00000144, 0x00000144, 0x0005002C, 0x00000011, 0x00000BB1, 0x000005A9, 0x000005A9, 0x00050036, 0x00000008, 0x0000161F, 0x00000000, 0x00000502, 0x000200F8, 0x00003B06, 0x000300F7, 0x00004C7A, 0x00000000, 0x000300FB, 0x00000A0A, @@ -661,11 +661,11 @@ const uint32_t texture_load_gbgr8_rgba8_cs[] = { 0x000700F5, 0x00000017, 0x00004D8D, 0x00005879, 0x00003463, 0x000029E8, 0x00002B38, 0x0007004F, 0x00000011, 0x00005675, 0x00004D8D, 0x00004D8D, 0x00000000, 0x00000001, 0x000500C2, 0x00000011, 0x0000392F, 0x00005675, - 0x00000907, 0x000500C7, 0x00000011, 0x00001F1D, 0x00005675, 0x00000A7A, - 0x000500C4, 0x00000011, 0x00005E1A, 0x00001F1D, 0x000007B7, 0x000500C5, - 0x00000011, 0x0000444E, 0x0000392F, 0x00005E1A, 0x000500C5, 0x00000011, - 0x000044EB, 0x0000444E, 0x000007DE, 0x000500C7, 0x00000011, 0x00004832, - 0x00005675, 0x00000474, 0x000500C4, 0x00000011, 0x0000595E, 0x00004832, + 0x00000907, 0x000500C7, 0x00000011, 0x00001A4A, 0x00005675, 0x00000A7A, + 0x000500C4, 0x00000011, 0x00003F88, 0x00001A4A, 0x000007B7, 0x00050084, + 0x00000011, 0x000057E4, 0x00003F88, 0x0000049E, 0x000500C5, 0x00000011, + 0x00002648, 0x0000392F, 0x000057E4, 0x000500C7, 0x00000011, 0x00001F5E, + 0x00005675, 0x00000474, 0x000500C4, 0x00000011, 0x0000595E, 0x00001F5E, 0x000007B7, 0x000500C7, 0x00000011, 0x00004810, 0x00005675, 0x00000BB1, 0x000500C2, 0x00000011, 0x00003BFA, 0x00004810, 0x000007B7, 0x00050051, 0x0000000B, 0x00001CFC, 0x0000595E, 0x00000000, 0x00050051, 0x0000000B, @@ -674,15 +674,15 @@ const uint32_t texture_load_gbgr8_rgba8_cs[] = { 0x00000001, 0x00070050, 0x00000017, 0x00003F21, 0x00001CFC, 0x00005FDB, 0x00001DD9, 0x00001E73, 0x0009004F, 0x00000017, 0x00001E5E, 0x00003F21, 0x00003F21, 0x00000000, 0x00000002, 0x00000001, 0x00000003, 0x0009004F, - 0x00000017, 0x00001ACC, 0x000044EB, 0x000044EB, 0x00000000, 0x00000000, + 0x00000017, 0x00001ACC, 0x00002648, 0x00002648, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x000500C5, 0x00000017, 0x000060EE, 0x00001ACC, 0x00001E5E, 0x0007004F, 0x00000011, 0x000046DD, 0x00004D8D, 0x00004D8D, 0x00000002, 0x00000003, 0x000500C2, 0x00000011, 0x00002014, 0x000046DD, - 0x00000907, 0x000500C7, 0x00000011, 0x00001F1E, 0x000046DD, 0x00000A7A, - 0x000500C4, 0x00000011, 0x00005E1B, 0x00001F1E, 0x000007B7, 0x000500C5, - 0x00000011, 0x0000444F, 0x00002014, 0x00005E1B, 0x000500C5, 0x00000011, - 0x000044EC, 0x0000444F, 0x000007DE, 0x000500C7, 0x00000011, 0x00004833, - 0x000046DD, 0x00000474, 0x000500C4, 0x00000011, 0x0000595F, 0x00004833, + 0x00000907, 0x000500C7, 0x00000011, 0x00001A4B, 0x000046DD, 0x00000A7A, + 0x000500C4, 0x00000011, 0x00003F89, 0x00001A4B, 0x000007B7, 0x00050084, + 0x00000011, 0x000057E5, 0x00003F89, 0x0000049E, 0x000500C5, 0x00000011, + 0x00002649, 0x00002014, 0x000057E5, 0x000500C7, 0x00000011, 0x00001F5F, + 0x000046DD, 0x00000474, 0x000500C4, 0x00000011, 0x0000595F, 0x00001F5F, 0x000007B7, 0x000500C7, 0x00000011, 0x00004811, 0x000046DD, 0x00000BB1, 0x000500C2, 0x00000011, 0x00003BFB, 0x00004811, 0x000007B7, 0x00050051, 0x0000000B, 0x00001CFD, 0x0000595F, 0x00000000, 0x00050051, 0x0000000B, @@ -691,7 +691,7 @@ const uint32_t texture_load_gbgr8_rgba8_cs[] = { 0x00000001, 0x00070050, 0x00000017, 0x00003F22, 0x00001CFD, 0x00005FDC, 0x00001DDA, 0x00001E74, 0x0009004F, 0x00000017, 0x00001E5F, 0x00003F22, 0x00003F22, 0x00000000, 0x00000002, 0x00000001, 0x00000003, 0x0009004F, - 0x00000017, 0x000019C2, 0x000044EC, 0x000044EC, 0x00000000, 0x00000000, + 0x00000017, 0x000019C2, 0x00002649, 0x00002649, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x000500C5, 0x00000017, 0x00006098, 0x000019C2, 0x00001E5F, 0x00060041, 0x00000294, 0x0000201B, 0x0000140E, 0x00000A0B, 0x000054A6, 0x0003003E, 0x0000201B, 0x000060EE, 0x00050080, 0x0000000B, @@ -717,11 +717,11 @@ const uint32_t texture_load_gbgr8_rgba8_cs[] = { 0x00002AAC, 0x00003A1A, 0x000029E9, 0x00002B39, 0x0007004F, 0x00000011, 0x00005676, 0x00004D8E, 0x00004D8E, 0x00000000, 0x00000001, 0x000500C2, 0x00000011, 0x00003930, 0x00005676, 0x00000907, 0x000500C7, 0x00000011, - 0x00001F1F, 0x00005676, 0x00000A7A, 0x000500C4, 0x00000011, 0x00005E1C, - 0x00001F1F, 0x000007B7, 0x000500C5, 0x00000011, 0x00004450, 0x00003930, - 0x00005E1C, 0x000500C5, 0x00000011, 0x000044ED, 0x00004450, 0x000007DE, - 0x000500C7, 0x00000011, 0x00004834, 0x00005676, 0x00000474, 0x000500C4, - 0x00000011, 0x00005960, 0x00004834, 0x000007B7, 0x000500C7, 0x00000011, + 0x00001A4C, 0x00005676, 0x00000A7A, 0x000500C4, 0x00000011, 0x00003F8A, + 0x00001A4C, 0x000007B7, 0x00050084, 0x00000011, 0x000057E6, 0x00003F8A, + 0x0000049E, 0x000500C5, 0x00000011, 0x0000264A, 0x00003930, 0x000057E6, + 0x000500C7, 0x00000011, 0x00001F60, 0x00005676, 0x00000474, 0x000500C4, + 0x00000011, 0x00005960, 0x00001F60, 0x000007B7, 0x000500C7, 0x00000011, 0x00004812, 0x00005676, 0x00000BB1, 0x000500C2, 0x00000011, 0x00003BFC, 0x00004812, 0x000007B7, 0x00050051, 0x0000000B, 0x00001CFE, 0x00005960, 0x00000000, 0x00050051, 0x0000000B, 0x00005FDD, 0x00005960, 0x00000001, @@ -729,16 +729,16 @@ const uint32_t texture_load_gbgr8_rgba8_cs[] = { 0x0000000B, 0x00001E75, 0x00003BFC, 0x00000001, 0x00070050, 0x00000017, 0x00003F23, 0x00001CFE, 0x00005FDD, 0x00001DDB, 0x00001E75, 0x0009004F, 0x00000017, 0x00001E60, 0x00003F23, 0x00003F23, 0x00000000, 0x00000002, - 0x00000001, 0x00000003, 0x0009004F, 0x00000017, 0x00001ACD, 0x000044ED, - 0x000044ED, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x000500C5, + 0x00000001, 0x00000003, 0x0009004F, 0x00000017, 0x00001ACD, 0x0000264A, + 0x0000264A, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x000500C5, 0x00000017, 0x000060EF, 0x00001ACD, 0x00001E60, 0x0007004F, 0x00000011, 0x000046DE, 0x00004D8E, 0x00004D8E, 0x00000002, 0x00000003, 0x000500C2, 0x00000011, 0x00002015, 0x000046DE, 0x00000907, 0x000500C7, 0x00000011, - 0x00001F20, 0x000046DE, 0x00000A7A, 0x000500C4, 0x00000011, 0x00005E1D, - 0x00001F20, 0x000007B7, 0x000500C5, 0x00000011, 0x00004451, 0x00002015, - 0x00005E1D, 0x000500C5, 0x00000011, 0x000044EE, 0x00004451, 0x000007DE, - 0x000500C7, 0x00000011, 0x00004835, 0x000046DE, 0x00000474, 0x000500C4, - 0x00000011, 0x00005961, 0x00004835, 0x000007B7, 0x000500C7, 0x00000011, + 0x00001A4D, 0x000046DE, 0x00000A7A, 0x000500C4, 0x00000011, 0x00003F8B, + 0x00001A4D, 0x000007B7, 0x00050084, 0x00000011, 0x000057E7, 0x00003F8B, + 0x0000049E, 0x000500C5, 0x00000011, 0x0000264B, 0x00002015, 0x000057E7, + 0x000500C7, 0x00000011, 0x00001F61, 0x000046DE, 0x00000474, 0x000500C4, + 0x00000011, 0x00005961, 0x00001F61, 0x000007B7, 0x000500C7, 0x00000011, 0x00004813, 0x000046DE, 0x00000BB1, 0x000500C2, 0x00000011, 0x00003BFD, 0x00004813, 0x000007B7, 0x00050051, 0x0000000B, 0x00001CFF, 0x00005961, 0x00000000, 0x00050051, 0x0000000B, 0x00005FDE, 0x00005961, 0x00000001, @@ -746,8 +746,8 @@ const uint32_t texture_load_gbgr8_rgba8_cs[] = { 0x0000000B, 0x00001E76, 0x00003BFD, 0x00000001, 0x00070050, 0x00000017, 0x00003F24, 0x00001CFF, 0x00005FDE, 0x00001DDC, 0x00001E76, 0x0009004F, 0x00000017, 0x00001E61, 0x00003F24, 0x00003F24, 0x00000000, 0x00000002, - 0x00000001, 0x00000003, 0x0009004F, 0x00000017, 0x00001E6F, 0x000044EE, - 0x000044EE, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x000500C5, + 0x00000001, 0x00000003, 0x0009004F, 0x00000017, 0x00001E6F, 0x0000264B, + 0x0000264B, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x000500C5, 0x00000017, 0x0000363E, 0x00001E6F, 0x00001E61, 0x00050080, 0x0000000B, 0x0000459A, 0x000054A6, 0x00000A10, 0x00060041, 0x00000294, 0x00001929, 0x0000140E, 0x00000A0B, 0x0000459A, 0x0003003E, 0x00001929, 0x000060EF, diff --git a/src/xenia/gpu/shaders/pixel_formats.xesli b/src/xenia/gpu/shaders/pixel_formats.xesli index ec69de6c8..bb4ec0fe5 100644 --- a/src/xenia/gpu/shaders/pixel_formats.xesli +++ b/src/xenia/gpu/shaders/pixel_formats.xesli @@ -417,30 +417,37 @@ xesl_uint4 XeBGRG8ToRGBG8(xesl_uint4 packed_texels) { ((packed_texels & 0x00FF0000u) >> 16u); } -xesl_uint4 XeGBGR8ToRGBA8(xesl_uint2 packed_texels) { +// On the Xenos, it appears that the last existing component of a texture is +// replicated into the missing components. Writing blue directly to the alpha +// instead of 1 also makes this conversion correct for both unsigned and signed +// data. + +xesl_uint4 XeGBGR8ToRGB8WithRGBBSwizzle(xesl_uint2 packed_texels) { xesl_uint2 rba = (packed_texels >> 24u) | - ((packed_texels & 0x0000FF00u) << 8u) | 0xFF000000u; + (((packed_texels & 0x0000FF00u) << 8u) * 0x101u); xesl_uint4 g = xesl_uint4((packed_texels & 0x000000FFu) << 8u, (packed_texels & 0x00FF0000u) >> 8u).xzyw; return rba.xxyy | g; } -void XeGBGR8ToRGBA8(xesl_uint4 packed_texels, out xesl_uint4 out_01, - out xesl_uint4 out_23) { - out_01 = XeGBGR8ToRGBA8(packed_texels.xy); - out_23 = XeGBGR8ToRGBA8(packed_texels.zw); +void XeGBGR8ToRGB8WithRGBBSwizzle(xesl_uint4 packed_texels, + out xesl_uint4 out_01, + out xesl_uint4 out_23) { + out_01 = XeGBGR8ToRGB8WithRGBBSwizzle(packed_texels.xy); + out_23 = XeGBGR8ToRGB8WithRGBBSwizzle(packed_texels.zw); } -xesl_uint4 XeBGRG8ToRGBA8(xesl_uint2 packed_texels) { +xesl_uint4 XeBGRG8ToRGB8WithRGBBSwizzle(xesl_uint2 packed_texels) { xesl_uint2 rba = ((packed_texels & 0x00FF0000u) >> 16u) | - ((packed_texels & 0x000000FFu) << 16u) | 0xFF000000u; + (((packed_texels & 0x000000FFu) << 16u) * 0x101u); xesl_uint4 g = xesl_uint4(packed_texels & 0x0000FF00u, (packed_texels & 0xFF000000u) >> 16u).xzyw; return rba.xxyy | g; } -void XeBGRG8ToRGBA8(xesl_uint4 packed_texels, out xesl_uint4 out_01, - out xesl_uint4 out_23) { - out_01 = XeBGRG8ToRGBA8(packed_texels.xy); - out_23 = XeBGRG8ToRGBA8(packed_texels.zw); +void XeBGRG8ToRGB8WithRGBBSwizzle(xesl_uint4 packed_texels, + out xesl_uint4 out_01, + out xesl_uint4 out_23) { + out_01 = XeBGRG8ToRGB8WithRGBBSwizzle(packed_texels.xy); + out_23 = XeBGRG8ToRGB8WithRGBBSwizzle(packed_texels.zw); } xesl_uint4 XeR10G11B11UNormToRGBA16(xesl_uint2 packed_texels) { diff --git a/src/xenia/gpu/shaders/texture_load_bgrg8_rgba8.cs.xesl b/src/xenia/gpu/shaders/texture_load_bgrg8_rgb8.cs.xesl similarity index 89% rename from src/xenia/gpu/shaders/texture_load_bgrg8_rgba8.cs.xesl rename to src/xenia/gpu/shaders/texture_load_bgrg8_rgb8.cs.xesl index 348144a37..eb4559008 100644 --- a/src/xenia/gpu/shaders/texture_load_bgrg8_rgba8.cs.xesl +++ b/src/xenia/gpu/shaders/texture_load_bgrg8_rgb8.cs.xesl @@ -8,5 +8,5 @@ */ #include "pixel_formats.xesli" -#define XE_TEXTURE_LOAD_32BPB_TO_64BPB XeBGRG8ToRGBA8 +#define XE_TEXTURE_LOAD_32BPB_TO_64BPB XeBGRG8ToRGB8WithRGBBSwizzle #include "texture_load_32bpb_64bpb.xesli" diff --git a/src/xenia/gpu/shaders/texture_load_gbgr8_rgba8.cs.xesl b/src/xenia/gpu/shaders/texture_load_gbgr8_rgb8.cs.xesl similarity index 89% rename from src/xenia/gpu/shaders/texture_load_gbgr8_rgba8.cs.xesl rename to src/xenia/gpu/shaders/texture_load_gbgr8_rgb8.cs.xesl index acb4cbb9e..5d86a7a87 100644 --- a/src/xenia/gpu/shaders/texture_load_gbgr8_rgba8.cs.xesl +++ b/src/xenia/gpu/shaders/texture_load_gbgr8_rgb8.cs.xesl @@ -8,5 +8,5 @@ */ #include "pixel_formats.xesli" -#define XE_TEXTURE_LOAD_32BPB_TO_64BPB XeGBGR8ToRGBA8 +#define XE_TEXTURE_LOAD_32BPB_TO_64BPB XeGBGR8ToRGB8WithRGBBSwizzle #include "texture_load_32bpb_64bpb.xesli"