From b852ec567d21b207ec2a1d5ee018e5fba8de2331 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sun, 17 May 2026 14:34:02 +0200 Subject: [PATCH] elimina supersampling (shaders, pipeline, console command, config) --- CMakeLists.txt | 8 - Makefile | 2 +- data/shaders/downscale.frag | 48 - data/shaders/upscale.frag | 15 - source/core/rendering/render_info.cpp | 3 +- source/core/rendering/screen.hpp | 4 - .../sdl3gpu/spv/downscale_frag_spv.h | 4254 ----------------- .../rendering/sdl3gpu/spv/upscale_frag_spv.h | 634 --- source/game/defaults.hpp | 3 - source/game/ui/console_commands.cpp | 60 - tools/shaders/compile_spirv.cmake | 6 - 11 files changed, 2 insertions(+), 5035 deletions(-) delete mode 100644 data/shaders/downscale.frag delete mode 100644 data/shaders/upscale.frag delete mode 100644 source/core/rendering/sdl3gpu/spv/downscale_frag_spv.h delete mode 100644 source/core/rendering/sdl3gpu/spv/upscale_frag_spv.h diff --git a/CMakeLists.txt b/CMakeLists.txt index a8a72cc..5723eef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -182,28 +182,20 @@ if(NOT APPLE AND NOT EMSCRIPTEN) set(SHADER_POSTFX_VERT_SRC "${SHADERS_DIR}/postfx.vert") set(SHADER_POSTFX_FRAG_SRC "${SHADERS_DIR}/postfx.frag") - set(SHADER_UPSCALE_FRAG_SRC "${SHADERS_DIR}/upscale.frag") - set(SHADER_DOWNSCALE_FRAG_SRC "${SHADERS_DIR}/downscale.frag") set(SHADER_CRTPI_FRAG_SRC "${SHADERS_DIR}/crtpi_frag.glsl") set(SHADER_POSTFX_VERT_H "${HEADERS_DIR}/postfx_vert_spv.h") set(SHADER_POSTFX_FRAG_H "${HEADERS_DIR}/postfx_frag_spv.h") - set(SHADER_UPSCALE_FRAG_H "${HEADERS_DIR}/upscale_frag_spv.h") - set(SHADER_DOWNSCALE_FRAG_H "${HEADERS_DIR}/downscale_frag_spv.h") set(SHADER_CRTPI_FRAG_H "${HEADERS_DIR}/crtpi_frag_spv.h") set(ALL_SHADER_HEADERS "${SHADER_POSTFX_VERT_H}" "${SHADER_POSTFX_FRAG_H}" - "${SHADER_UPSCALE_FRAG_H}" - "${SHADER_DOWNSCALE_FRAG_H}" "${SHADER_CRTPI_FRAG_H}" ) set(ALL_SHADER_SOURCES "${SHADER_POSTFX_VERT_SRC}" "${SHADER_POSTFX_FRAG_SRC}" - "${SHADER_UPSCALE_FRAG_SRC}" - "${SHADER_DOWNSCALE_FRAG_SRC}" "${SHADER_CRTPI_FRAG_SRC}" ) diff --git a/Makefile b/Makefile index 30ee726..356a85c 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ RESOURCE_FILE := release/windows/jdd.res # ============================================================================== SHADER_CMAKE := $(DIR_ROOT)tools/shaders/compile_spirv.cmake SHADERS_DIR := $(DIR_ROOT)data/shaders -HEADERS_DIR := $(DIR_ROOT)source/core/rendering/sdl3gpu +HEADERS_DIR := $(DIR_ROOT)source/core/rendering/sdl3gpu/spv ifeq ($(OS),Windows_NT) GLSLC := $(shell where glslc 2>NUL) else diff --git a/data/shaders/downscale.frag b/data/shaders/downscale.frag deleted file mode 100644 index fe5b9b5..0000000 --- a/data/shaders/downscale.frag +++ /dev/null @@ -1,48 +0,0 @@ -#version 450 -layout(location = 0) in vec2 v_uv; -layout(location = 0) out vec4 out_color; - -layout(set = 2, binding = 0) uniform sampler2D source; - -layout(set = 3, binding = 0) uniform DownscaleUniforms { - int algorithm; // 0 = Lanczos2 (ventana 2, ±2 taps), 1 = Lanczos3 (ventana 3, ±3 taps) - float pad0; - float pad1; - float pad2; -} u; - -// Kernel Lanczos normalizado: sinc(t) * sinc(t/a) para |t| < a, 0 fuera. -float lanczos(float t, float a) { - t = abs(t); - if (t < 0.0001) { return 1.0; } - if (t >= a) { return 0.0; } - const float PI = 3.14159265358979; - float pt = PI * t; - return (a * sin(pt) * sin(pt / a)) / (pt * pt); -} - -void main() { - vec2 src_size = vec2(textureSize(source, 0)); - // Posición en coordenadas de texel (centros de texel en N+0.5) - vec2 p = v_uv * src_size; - vec2 p_floor = floor(p); - - float a = (u.algorithm == 0) ? 2.0 : 3.0; - int win = int(a); - - vec4 color = vec4(0.0); - float weight_sum = 0.0; - - for (int j = -win; j <= win; j++) { - for (int i = -win; i <= win; i++) { - // Centro del texel (i,j) relativo a p_floor - vec2 tap_center = p_floor + vec2(float(i), float(j)) + 0.5; - vec2 offset = tap_center - p; - float w = lanczos(offset.x, a) * lanczos(offset.y, a); - color += texture(source, tap_center / src_size) * w; - weight_sum += w; - } - } - - out_color = (weight_sum > 0.0) ? (color / weight_sum) : vec4(0.0, 0.0, 0.0, 1.0); -} diff --git a/data/shaders/upscale.frag b/data/shaders/upscale.frag deleted file mode 100644 index fb9200d..0000000 --- a/data/shaders/upscale.frag +++ /dev/null @@ -1,15 +0,0 @@ -#version 450 - -// Vulkan GLSL fragment shader — Nearest-neighbour upscale pass -// Used as the first render pass when supersampling is active. -// Compile: glslc upscale.frag -o upscale.frag.spv -// xxd -i upscale.frag.spv > ../../source/core/rendering/sdl3gpu/upscale_frag_spv.h - -layout(location = 0) in vec2 v_uv; -layout(location = 0) out vec4 out_color; - -layout(set = 2, binding = 0) uniform sampler2D scene; - -void main() { - out_color = texture(scene, v_uv); -} diff --git a/source/core/rendering/render_info.cpp b/source/core/rendering/render_info.cpp index ec7247b..556a876 100644 --- a/source/core/rendering/render_info.cpp +++ b/source/core/rendering/render_info.cpp @@ -99,8 +99,7 @@ void RenderInfo::render() const { preset_name = prettyName(Options::postfx_presets[static_cast(Options::video.shader.current_postfx_preset)].name); } } - const bool SHOW_SS = Options::video.supersampling.enabled && !IS_CRTPI; - line += " | " + SHADER_NAME + " " + preset_name + (SHOW_SS ? " (ss)" : ""); + line += " | " + SHADER_NAME + " " + preset_name; } // Todo en lowercase diff --git a/source/core/rendering/screen.hpp b/source/core/rendering/screen.hpp index 551ed89..be8ee24 100644 --- a/source/core/rendering/screen.hpp +++ b/source/core/rendering/screen.hpp @@ -65,11 +65,8 @@ class Screen { void setPaletteSortMode(PaletteSortMode mode); // Establece modo de ordenación concreto [[nodiscard]] auto getPaletteSortModeName() const -> std::string; // Nombre del modo de ordenación actual void toggleShaders(); // Activa/desactiva todos los shaders respetando current_shader - void toggleSupersampling(); // Activa/desactiva el supersampling global void reloadPostFX(); // Recarga el shader del preset actual sin toggle void reloadCrtPi(); // Recarga el shader CrtPi del preset actual sin toggle - void setLinearUpscale(bool linear); // Upscale NEAREST (false) o LINEAR (true) en el paso SS - void setDownscaleAlgo(int algo); // 0=bilinear legacy, 1=Lanczos2, 2=Lanczos3 void setActiveShader(Rendering::ShaderType type); // Cambia el shader de post-procesado activo void nextShader(); // Cicla al siguiente shader disponible (para futura UI) @@ -98,7 +95,6 @@ class Screen { [[nodiscard]] auto getLastFPS() const -> int { return fps_.last_value; } [[nodiscard]] auto getZoomFactor() const -> float { return zoom_factor_; } [[nodiscard]] static auto getMaxZoom() -> int; - [[nodiscard]] auto getSsTextureSize() const -> std::pair; private: // Estructuras diff --git a/source/core/rendering/sdl3gpu/spv/downscale_frag_spv.h b/source/core/rendering/sdl3gpu/spv/downscale_frag_spv.h deleted file mode 100644 index cf0f341..0000000 --- a/source/core/rendering/sdl3gpu/spv/downscale_frag_spv.h +++ /dev/null @@ -1,4254 +0,0 @@ -#pragma once -#include -#include -static const uint8_t kdownscale_frag_spv[] = { - 0x03, - 0x02, - 0x23, - 0x07, - 0x00, - 0x00, - 0x01, - 0x00, - 0x0b, - 0x00, - 0x0d, - 0x00, - 0xb1, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x11, - 0x00, - 0x02, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x11, - 0x00, - 0x02, - 0x00, - 0x32, - 0x00, - 0x00, - 0x00, - 0x0b, - 0x00, - 0x06, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x47, - 0x4c, - 0x53, - 0x4c, - 0x2e, - 0x73, - 0x74, - 0x64, - 0x2e, - 0x34, - 0x35, - 0x30, - 0x00, - 0x00, - 0x00, - 0x00, - 0x0e, - 0x00, - 0x03, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x0f, - 0x00, - 0x07, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x6d, - 0x61, - 0x69, - 0x6e, - 0x00, - 0x00, - 0x00, - 0x00, - 0x41, - 0x00, - 0x00, - 0x00, - 0xa4, - 0x00, - 0x00, - 0x00, - 0x10, - 0x00, - 0x03, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x03, - 0x00, - 0x03, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0xc2, - 0x01, - 0x00, - 0x00, - 0x04, - 0x00, - 0x0a, - 0x00, - 0x47, - 0x4c, - 0x5f, - 0x47, - 0x4f, - 0x4f, - 0x47, - 0x4c, - 0x45, - 0x5f, - 0x63, - 0x70, - 0x70, - 0x5f, - 0x73, - 0x74, - 0x79, - 0x6c, - 0x65, - 0x5f, - 0x6c, - 0x69, - 0x6e, - 0x65, - 0x5f, - 0x64, - 0x69, - 0x72, - 0x65, - 0x63, - 0x74, - 0x69, - 0x76, - 0x65, - 0x00, - 0x00, - 0x04, - 0x00, - 0x08, - 0x00, - 0x47, - 0x4c, - 0x5f, - 0x47, - 0x4f, - 0x4f, - 0x47, - 0x4c, - 0x45, - 0x5f, - 0x69, - 0x6e, - 0x63, - 0x6c, - 0x75, - 0x64, - 0x65, - 0x5f, - 0x64, - 0x69, - 0x72, - 0x65, - 0x63, - 0x74, - 0x69, - 0x76, - 0x65, - 0x00, - 0x05, - 0x00, - 0x04, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x6d, - 0x61, - 0x69, - 0x6e, - 0x00, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x06, - 0x00, - 0x0b, - 0x00, - 0x00, - 0x00, - 0x6c, - 0x61, - 0x6e, - 0x63, - 0x7a, - 0x6f, - 0x73, - 0x28, - 0x66, - 0x31, - 0x3b, - 0x66, - 0x31, - 0x3b, - 0x00, - 0x00, - 0x05, - 0x00, - 0x03, - 0x00, - 0x09, - 0x00, - 0x00, - 0x00, - 0x74, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x03, - 0x00, - 0x0a, - 0x00, - 0x00, - 0x00, - 0x61, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x03, - 0x00, - 0x1e, - 0x00, - 0x00, - 0x00, - 0x70, - 0x74, - 0x00, - 0x00, - 0x05, - 0x00, - 0x05, - 0x00, - 0x33, - 0x00, - 0x00, - 0x00, - 0x73, - 0x72, - 0x63, - 0x5f, - 0x73, - 0x69, - 0x7a, - 0x65, - 0x00, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x04, - 0x00, - 0x37, - 0x00, - 0x00, - 0x00, - 0x73, - 0x6f, - 0x75, - 0x72, - 0x63, - 0x65, - 0x00, - 0x00, - 0x05, - 0x00, - 0x03, - 0x00, - 0x3f, - 0x00, - 0x00, - 0x00, - 0x70, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x04, - 0x00, - 0x41, - 0x00, - 0x00, - 0x00, - 0x76, - 0x5f, - 0x75, - 0x76, - 0x00, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x04, - 0x00, - 0x45, - 0x00, - 0x00, - 0x00, - 0x70, - 0x5f, - 0x66, - 0x6c, - 0x6f, - 0x6f, - 0x72, - 0x00, - 0x05, - 0x00, - 0x03, - 0x00, - 0x48, - 0x00, - 0x00, - 0x00, - 0x61, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x07, - 0x00, - 0x49, - 0x00, - 0x00, - 0x00, - 0x44, - 0x6f, - 0x77, - 0x6e, - 0x73, - 0x63, - 0x61, - 0x6c, - 0x65, - 0x55, - 0x6e, - 0x69, - 0x66, - 0x6f, - 0x72, - 0x6d, - 0x73, - 0x00, - 0x00, - 0x00, - 0x06, - 0x00, - 0x06, - 0x00, - 0x49, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x61, - 0x6c, - 0x67, - 0x6f, - 0x72, - 0x69, - 0x74, - 0x68, - 0x6d, - 0x00, - 0x00, - 0x00, - 0x06, - 0x00, - 0x05, - 0x00, - 0x49, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x70, - 0x61, - 0x64, - 0x30, - 0x00, - 0x00, - 0x00, - 0x00, - 0x06, - 0x00, - 0x05, - 0x00, - 0x49, - 0x00, - 0x00, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0x70, - 0x61, - 0x64, - 0x31, - 0x00, - 0x00, - 0x00, - 0x00, - 0x06, - 0x00, - 0x05, - 0x00, - 0x49, - 0x00, - 0x00, - 0x00, - 0x03, - 0x00, - 0x00, - 0x00, - 0x70, - 0x61, - 0x64, - 0x32, - 0x00, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x03, - 0x00, - 0x4b, - 0x00, - 0x00, - 0x00, - 0x75, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x03, - 0x00, - 0x54, - 0x00, - 0x00, - 0x00, - 0x77, - 0x69, - 0x6e, - 0x00, - 0x05, - 0x00, - 0x04, - 0x00, - 0x59, - 0x00, - 0x00, - 0x00, - 0x63, - 0x6f, - 0x6c, - 0x6f, - 0x72, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x05, - 0x00, - 0x5b, - 0x00, - 0x00, - 0x00, - 0x77, - 0x65, - 0x69, - 0x67, - 0x68, - 0x74, - 0x5f, - 0x73, - 0x75, - 0x6d, - 0x00, - 0x00, - 0x05, - 0x00, - 0x03, - 0x00, - 0x5c, - 0x00, - 0x00, - 0x00, - 0x6a, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x03, - 0x00, - 0x67, - 0x00, - 0x00, - 0x00, - 0x69, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x05, - 0x00, - 0x72, - 0x00, - 0x00, - 0x00, - 0x74, - 0x61, - 0x70, - 0x5f, - 0x63, - 0x65, - 0x6e, - 0x74, - 0x65, - 0x72, - 0x00, - 0x00, - 0x05, - 0x00, - 0x04, - 0x00, - 0x7d, - 0x00, - 0x00, - 0x00, - 0x6f, - 0x66, - 0x66, - 0x73, - 0x65, - 0x74, - 0x00, - 0x00, - 0x05, - 0x00, - 0x03, - 0x00, - 0x81, - 0x00, - 0x00, - 0x00, - 0x77, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x04, - 0x00, - 0x82, - 0x00, - 0x00, - 0x00, - 0x70, - 0x61, - 0x72, - 0x61, - 0x6d, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x04, - 0x00, - 0x87, - 0x00, - 0x00, - 0x00, - 0x70, - 0x61, - 0x72, - 0x61, - 0x6d, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x04, - 0x00, - 0x8a, - 0x00, - 0x00, - 0x00, - 0x70, - 0x61, - 0x72, - 0x61, - 0x6d, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x04, - 0x00, - 0x8e, - 0x00, - 0x00, - 0x00, - 0x70, - 0x61, - 0x72, - 0x61, - 0x6d, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x05, - 0x00, - 0xa4, - 0x00, - 0x00, - 0x00, - 0x6f, - 0x75, - 0x74, - 0x5f, - 0x63, - 0x6f, - 0x6c, - 0x6f, - 0x72, - 0x00, - 0x00, - 0x00, - 0x47, - 0x00, - 0x04, - 0x00, - 0x37, - 0x00, - 0x00, - 0x00, - 0x21, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x47, - 0x00, - 0x04, - 0x00, - 0x37, - 0x00, - 0x00, - 0x00, - 0x22, - 0x00, - 0x00, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0x47, - 0x00, - 0x04, - 0x00, - 0x41, - 0x00, - 0x00, - 0x00, - 0x1e, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x47, - 0x00, - 0x03, - 0x00, - 0x49, - 0x00, - 0x00, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0x48, - 0x00, - 0x05, - 0x00, - 0x49, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x23, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x48, - 0x00, - 0x05, - 0x00, - 0x49, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x23, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x48, - 0x00, - 0x05, - 0x00, - 0x49, - 0x00, - 0x00, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0x23, - 0x00, - 0x00, - 0x00, - 0x08, - 0x00, - 0x00, - 0x00, - 0x48, - 0x00, - 0x05, - 0x00, - 0x49, - 0x00, - 0x00, - 0x00, - 0x03, - 0x00, - 0x00, - 0x00, - 0x23, - 0x00, - 0x00, - 0x00, - 0x0c, - 0x00, - 0x00, - 0x00, - 0x47, - 0x00, - 0x04, - 0x00, - 0x4b, - 0x00, - 0x00, - 0x00, - 0x21, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x47, - 0x00, - 0x04, - 0x00, - 0x4b, - 0x00, - 0x00, - 0x00, - 0x22, - 0x00, - 0x00, - 0x00, - 0x03, - 0x00, - 0x00, - 0x00, - 0x47, - 0x00, - 0x04, - 0x00, - 0xa4, - 0x00, - 0x00, - 0x00, - 0x1e, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x13, - 0x00, - 0x02, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0x21, - 0x00, - 0x03, - 0x00, - 0x03, - 0x00, - 0x00, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0x16, - 0x00, - 0x03, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x04, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x21, - 0x00, - 0x05, - 0x00, - 0x08, - 0x00, - 0x00, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x2b, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x10, - 0x00, - 0x00, - 0x00, - 0x17, - 0xb7, - 0xd1, - 0x38, - 0x14, - 0x00, - 0x02, - 0x00, - 0x11, - 0x00, - 0x00, - 0x00, - 0x2b, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x15, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x80, - 0x3f, - 0x2b, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x1c, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x2b, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x1f, - 0x00, - 0x00, - 0x00, - 0xdb, - 0x0f, - 0x49, - 0x40, - 0x17, - 0x00, - 0x04, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x04, - 0x00, - 0x32, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x19, - 0x00, - 0x09, - 0x00, - 0x34, - 0x00, - 0x00, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x1b, - 0x00, - 0x03, - 0x00, - 0x35, - 0x00, - 0x00, - 0x00, - 0x34, - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x04, - 0x00, - 0x36, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x35, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x36, - 0x00, - 0x00, - 0x00, - 0x37, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x15, - 0x00, - 0x04, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x2b, - 0x00, - 0x04, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x3a, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x17, - 0x00, - 0x04, - 0x00, - 0x3c, - 0x00, - 0x00, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x04, - 0x00, - 0x40, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x40, - 0x00, - 0x00, - 0x00, - 0x41, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x1e, - 0x00, - 0x06, - 0x00, - 0x49, - 0x00, - 0x00, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x04, - 0x00, - 0x4a, - 0x00, - 0x00, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0x49, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x4a, - 0x00, - 0x00, - 0x00, - 0x4b, - 0x00, - 0x00, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x04, - 0x00, - 0x4c, - 0x00, - 0x00, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x2b, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x50, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x40, - 0x2b, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x51, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x40, - 0x40, - 0x20, - 0x00, - 0x04, - 0x00, - 0x53, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x17, - 0x00, - 0x04, - 0x00, - 0x57, - 0x00, - 0x00, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x04, - 0x00, - 0x58, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x57, - 0x00, - 0x00, - 0x00, - 0x2c, - 0x00, - 0x07, - 0x00, - 0x57, - 0x00, - 0x00, - 0x00, - 0x5a, - 0x00, - 0x00, - 0x00, - 0x1c, - 0x00, - 0x00, - 0x00, - 0x1c, - 0x00, - 0x00, - 0x00, - 0x1c, - 0x00, - 0x00, - 0x00, - 0x1c, - 0x00, - 0x00, - 0x00, - 0x2b, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x7a, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x3f, - 0x15, - 0x00, - 0x04, - 0x00, - 0x83, - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x2b, - 0x00, - 0x04, - 0x00, - 0x83, - 0x00, - 0x00, - 0x00, - 0x84, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x2b, - 0x00, - 0x04, - 0x00, - 0x83, - 0x00, - 0x00, - 0x00, - 0x8b, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x2b, - 0x00, - 0x04, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x9f, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x04, - 0x00, - 0xa3, - 0x00, - 0x00, - 0x00, - 0x03, - 0x00, - 0x00, - 0x00, - 0x57, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0xa3, - 0x00, - 0x00, - 0x00, - 0xa4, - 0x00, - 0x00, - 0x00, - 0x03, - 0x00, - 0x00, - 0x00, - 0x2c, - 0x00, - 0x07, - 0x00, - 0x57, - 0x00, - 0x00, - 0x00, - 0xaf, - 0x00, - 0x00, - 0x00, - 0x1c, - 0x00, - 0x00, - 0x00, - 0x1c, - 0x00, - 0x00, - 0x00, - 0x1c, - 0x00, - 0x00, - 0x00, - 0x15, - 0x00, - 0x00, - 0x00, - 0x36, - 0x00, - 0x05, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x03, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0x05, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x32, - 0x00, - 0x00, - 0x00, - 0x33, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x32, - 0x00, - 0x00, - 0x00, - 0x3f, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x32, - 0x00, - 0x00, - 0x00, - 0x45, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x48, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x53, - 0x00, - 0x00, - 0x00, - 0x54, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x58, - 0x00, - 0x00, - 0x00, - 0x59, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x5b, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x53, - 0x00, - 0x00, - 0x00, - 0x5c, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x53, - 0x00, - 0x00, - 0x00, - 0x67, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x32, - 0x00, - 0x00, - 0x00, - 0x72, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x32, - 0x00, - 0x00, - 0x00, - 0x7d, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x81, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x82, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x87, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x8a, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x8e, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x58, - 0x00, - 0x00, - 0x00, - 0xa7, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x35, - 0x00, - 0x00, - 0x00, - 0x38, - 0x00, - 0x00, - 0x00, - 0x37, - 0x00, - 0x00, - 0x00, - 0x64, - 0x00, - 0x04, - 0x00, - 0x34, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x00, - 0x00, - 0x38, - 0x00, - 0x00, - 0x00, - 0x67, - 0x00, - 0x05, - 0x00, - 0x3c, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x00, - 0x00, - 0x3a, - 0x00, - 0x00, - 0x00, - 0x6f, - 0x00, - 0x04, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x33, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x42, - 0x00, - 0x00, - 0x00, - 0x41, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x43, - 0x00, - 0x00, - 0x00, - 0x33, - 0x00, - 0x00, - 0x00, - 0x85, - 0x00, - 0x05, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x44, - 0x00, - 0x00, - 0x00, - 0x42, - 0x00, - 0x00, - 0x00, - 0x43, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x3f, - 0x00, - 0x00, - 0x00, - 0x44, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x46, - 0x00, - 0x00, - 0x00, - 0x3f, - 0x00, - 0x00, - 0x00, - 0x0c, - 0x00, - 0x06, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x47, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x08, - 0x00, - 0x00, - 0x00, - 0x46, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x45, - 0x00, - 0x00, - 0x00, - 0x47, - 0x00, - 0x00, - 0x00, - 0x41, - 0x00, - 0x05, - 0x00, - 0x4c, - 0x00, - 0x00, - 0x00, - 0x4d, - 0x00, - 0x00, - 0x00, - 0x4b, - 0x00, - 0x00, - 0x00, - 0x3a, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x4e, - 0x00, - 0x00, - 0x00, - 0x4d, - 0x00, - 0x00, - 0x00, - 0xaa, - 0x00, - 0x05, - 0x00, - 0x11, - 0x00, - 0x00, - 0x00, - 0x4f, - 0x00, - 0x00, - 0x00, - 0x4e, - 0x00, - 0x00, - 0x00, - 0x3a, - 0x00, - 0x00, - 0x00, - 0xa9, - 0x00, - 0x06, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x52, - 0x00, - 0x00, - 0x00, - 0x4f, - 0x00, - 0x00, - 0x00, - 0x50, - 0x00, - 0x00, - 0x00, - 0x51, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x48, - 0x00, - 0x00, - 0x00, - 0x52, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x55, - 0x00, - 0x00, - 0x00, - 0x48, - 0x00, - 0x00, - 0x00, - 0x6e, - 0x00, - 0x04, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x56, - 0x00, - 0x00, - 0x00, - 0x55, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x54, - 0x00, - 0x00, - 0x00, - 0x56, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x59, - 0x00, - 0x00, - 0x00, - 0x5a, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x5b, - 0x00, - 0x00, - 0x00, - 0x1c, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x5d, - 0x00, - 0x00, - 0x00, - 0x54, - 0x00, - 0x00, - 0x00, - 0x7e, - 0x00, - 0x04, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x5e, - 0x00, - 0x00, - 0x00, - 0x5d, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x5c, - 0x00, - 0x00, - 0x00, - 0x5e, - 0x00, - 0x00, - 0x00, - 0xf9, - 0x00, - 0x02, - 0x00, - 0x5f, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0x5f, - 0x00, - 0x00, - 0x00, - 0xf6, - 0x00, - 0x04, - 0x00, - 0x61, - 0x00, - 0x00, - 0x00, - 0x62, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0xf9, - 0x00, - 0x02, - 0x00, - 0x63, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0x63, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x64, - 0x00, - 0x00, - 0x00, - 0x5c, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x65, - 0x00, - 0x00, - 0x00, - 0x54, - 0x00, - 0x00, - 0x00, - 0xb3, - 0x00, - 0x05, - 0x00, - 0x11, - 0x00, - 0x00, - 0x00, - 0x66, - 0x00, - 0x00, - 0x00, - 0x64, - 0x00, - 0x00, - 0x00, - 0x65, - 0x00, - 0x00, - 0x00, - 0xfa, - 0x00, - 0x04, - 0x00, - 0x66, - 0x00, - 0x00, - 0x00, - 0x60, - 0x00, - 0x00, - 0x00, - 0x61, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0x60, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x68, - 0x00, - 0x00, - 0x00, - 0x54, - 0x00, - 0x00, - 0x00, - 0x7e, - 0x00, - 0x04, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x69, - 0x00, - 0x00, - 0x00, - 0x68, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x67, - 0x00, - 0x00, - 0x00, - 0x69, - 0x00, - 0x00, - 0x00, - 0xf9, - 0x00, - 0x02, - 0x00, - 0x6a, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0x6a, - 0x00, - 0x00, - 0x00, - 0xf6, - 0x00, - 0x04, - 0x00, - 0x6c, - 0x00, - 0x00, - 0x00, - 0x6d, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0xf9, - 0x00, - 0x02, - 0x00, - 0x6e, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0x6e, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x6f, - 0x00, - 0x00, - 0x00, - 0x67, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x70, - 0x00, - 0x00, - 0x00, - 0x54, - 0x00, - 0x00, - 0x00, - 0xb3, - 0x00, - 0x05, - 0x00, - 0x11, - 0x00, - 0x00, - 0x00, - 0x71, - 0x00, - 0x00, - 0x00, - 0x6f, - 0x00, - 0x00, - 0x00, - 0x70, - 0x00, - 0x00, - 0x00, - 0xfa, - 0x00, - 0x04, - 0x00, - 0x71, - 0x00, - 0x00, - 0x00, - 0x6b, - 0x00, - 0x00, - 0x00, - 0x6c, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0x6b, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x73, - 0x00, - 0x00, - 0x00, - 0x45, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x74, - 0x00, - 0x00, - 0x00, - 0x67, - 0x00, - 0x00, - 0x00, - 0x6f, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x75, - 0x00, - 0x00, - 0x00, - 0x74, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x76, - 0x00, - 0x00, - 0x00, - 0x5c, - 0x00, - 0x00, - 0x00, - 0x6f, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x77, - 0x00, - 0x00, - 0x00, - 0x76, - 0x00, - 0x00, - 0x00, - 0x50, - 0x00, - 0x05, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x78, - 0x00, - 0x00, - 0x00, - 0x75, - 0x00, - 0x00, - 0x00, - 0x77, - 0x00, - 0x00, - 0x00, - 0x81, - 0x00, - 0x05, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x79, - 0x00, - 0x00, - 0x00, - 0x73, - 0x00, - 0x00, - 0x00, - 0x78, - 0x00, - 0x00, - 0x00, - 0x50, - 0x00, - 0x05, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x7b, - 0x00, - 0x00, - 0x00, - 0x7a, - 0x00, - 0x00, - 0x00, - 0x7a, - 0x00, - 0x00, - 0x00, - 0x81, - 0x00, - 0x05, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x7c, - 0x00, - 0x00, - 0x00, - 0x79, - 0x00, - 0x00, - 0x00, - 0x7b, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x72, - 0x00, - 0x00, - 0x00, - 0x7c, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x7e, - 0x00, - 0x00, - 0x00, - 0x72, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x7f, - 0x00, - 0x00, - 0x00, - 0x3f, - 0x00, - 0x00, - 0x00, - 0x83, - 0x00, - 0x05, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x80, - 0x00, - 0x00, - 0x00, - 0x7e, - 0x00, - 0x00, - 0x00, - 0x7f, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x7d, - 0x00, - 0x00, - 0x00, - 0x80, - 0x00, - 0x00, - 0x00, - 0x41, - 0x00, - 0x05, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x85, - 0x00, - 0x00, - 0x00, - 0x7d, - 0x00, - 0x00, - 0x00, - 0x84, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x86, - 0x00, - 0x00, - 0x00, - 0x85, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x82, - 0x00, - 0x00, - 0x00, - 0x86, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x88, - 0x00, - 0x00, - 0x00, - 0x48, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x87, - 0x00, - 0x00, - 0x00, - 0x88, - 0x00, - 0x00, - 0x00, - 0x39, - 0x00, - 0x06, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x89, - 0x00, - 0x00, - 0x00, - 0x0b, - 0x00, - 0x00, - 0x00, - 0x82, - 0x00, - 0x00, - 0x00, - 0x87, - 0x00, - 0x00, - 0x00, - 0x41, - 0x00, - 0x05, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x8c, - 0x00, - 0x00, - 0x00, - 0x7d, - 0x00, - 0x00, - 0x00, - 0x8b, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x8d, - 0x00, - 0x00, - 0x00, - 0x8c, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x8a, - 0x00, - 0x00, - 0x00, - 0x8d, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x8f, - 0x00, - 0x00, - 0x00, - 0x48, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x8e, - 0x00, - 0x00, - 0x00, - 0x8f, - 0x00, - 0x00, - 0x00, - 0x39, - 0x00, - 0x06, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x90, - 0x00, - 0x00, - 0x00, - 0x0b, - 0x00, - 0x00, - 0x00, - 0x8a, - 0x00, - 0x00, - 0x00, - 0x8e, - 0x00, - 0x00, - 0x00, - 0x85, - 0x00, - 0x05, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x91, - 0x00, - 0x00, - 0x00, - 0x89, - 0x00, - 0x00, - 0x00, - 0x90, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x81, - 0x00, - 0x00, - 0x00, - 0x91, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x35, - 0x00, - 0x00, - 0x00, - 0x92, - 0x00, - 0x00, - 0x00, - 0x37, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x93, - 0x00, - 0x00, - 0x00, - 0x72, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x94, - 0x00, - 0x00, - 0x00, - 0x33, - 0x00, - 0x00, - 0x00, - 0x88, - 0x00, - 0x05, - 0x00, - 0x31, - 0x00, - 0x00, - 0x00, - 0x95, - 0x00, - 0x00, - 0x00, - 0x93, - 0x00, - 0x00, - 0x00, - 0x94, - 0x00, - 0x00, - 0x00, - 0x57, - 0x00, - 0x05, - 0x00, - 0x57, - 0x00, - 0x00, - 0x00, - 0x96, - 0x00, - 0x00, - 0x00, - 0x92, - 0x00, - 0x00, - 0x00, - 0x95, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x97, - 0x00, - 0x00, - 0x00, - 0x81, - 0x00, - 0x00, - 0x00, - 0x8e, - 0x00, - 0x05, - 0x00, - 0x57, - 0x00, - 0x00, - 0x00, - 0x98, - 0x00, - 0x00, - 0x00, - 0x96, - 0x00, - 0x00, - 0x00, - 0x97, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x57, - 0x00, - 0x00, - 0x00, - 0x99, - 0x00, - 0x00, - 0x00, - 0x59, - 0x00, - 0x00, - 0x00, - 0x81, - 0x00, - 0x05, - 0x00, - 0x57, - 0x00, - 0x00, - 0x00, - 0x9a, - 0x00, - 0x00, - 0x00, - 0x99, - 0x00, - 0x00, - 0x00, - 0x98, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x59, - 0x00, - 0x00, - 0x00, - 0x9a, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x9b, - 0x00, - 0x00, - 0x00, - 0x81, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x9c, - 0x00, - 0x00, - 0x00, - 0x5b, - 0x00, - 0x00, - 0x00, - 0x81, - 0x00, - 0x05, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x9d, - 0x00, - 0x00, - 0x00, - 0x9c, - 0x00, - 0x00, - 0x00, - 0x9b, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x5b, - 0x00, - 0x00, - 0x00, - 0x9d, - 0x00, - 0x00, - 0x00, - 0xf9, - 0x00, - 0x02, - 0x00, - 0x6d, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0x6d, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0x9e, - 0x00, - 0x00, - 0x00, - 0x67, - 0x00, - 0x00, - 0x00, - 0x80, - 0x00, - 0x05, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0xa0, - 0x00, - 0x00, - 0x00, - 0x9e, - 0x00, - 0x00, - 0x00, - 0x9f, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x67, - 0x00, - 0x00, - 0x00, - 0xa0, - 0x00, - 0x00, - 0x00, - 0xf9, - 0x00, - 0x02, - 0x00, - 0x6a, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0x6c, - 0x00, - 0x00, - 0x00, - 0xf9, - 0x00, - 0x02, - 0x00, - 0x62, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0x62, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0xa1, - 0x00, - 0x00, - 0x00, - 0x5c, - 0x00, - 0x00, - 0x00, - 0x80, - 0x00, - 0x05, - 0x00, - 0x39, - 0x00, - 0x00, - 0x00, - 0xa2, - 0x00, - 0x00, - 0x00, - 0xa1, - 0x00, - 0x00, - 0x00, - 0x9f, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x5c, - 0x00, - 0x00, - 0x00, - 0xa2, - 0x00, - 0x00, - 0x00, - 0xf9, - 0x00, - 0x02, - 0x00, - 0x5f, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0x61, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0xa5, - 0x00, - 0x00, - 0x00, - 0x5b, - 0x00, - 0x00, - 0x00, - 0xba, - 0x00, - 0x05, - 0x00, - 0x11, - 0x00, - 0x00, - 0x00, - 0xa6, - 0x00, - 0x00, - 0x00, - 0xa5, - 0x00, - 0x00, - 0x00, - 0x1c, - 0x00, - 0x00, - 0x00, - 0xf7, - 0x00, - 0x03, - 0x00, - 0xa9, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0xfa, - 0x00, - 0x04, - 0x00, - 0xa6, - 0x00, - 0x00, - 0x00, - 0xa8, - 0x00, - 0x00, - 0x00, - 0xae, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0xa8, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x57, - 0x00, - 0x00, - 0x00, - 0xaa, - 0x00, - 0x00, - 0x00, - 0x59, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0xab, - 0x00, - 0x00, - 0x00, - 0x5b, - 0x00, - 0x00, - 0x00, - 0x50, - 0x00, - 0x07, - 0x00, - 0x57, - 0x00, - 0x00, - 0x00, - 0xac, - 0x00, - 0x00, - 0x00, - 0xab, - 0x00, - 0x00, - 0x00, - 0xab, - 0x00, - 0x00, - 0x00, - 0xab, - 0x00, - 0x00, - 0x00, - 0xab, - 0x00, - 0x00, - 0x00, - 0x88, - 0x00, - 0x05, - 0x00, - 0x57, - 0x00, - 0x00, - 0x00, - 0xad, - 0x00, - 0x00, - 0x00, - 0xaa, - 0x00, - 0x00, - 0x00, - 0xac, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0xa7, - 0x00, - 0x00, - 0x00, - 0xad, - 0x00, - 0x00, - 0x00, - 0xf9, - 0x00, - 0x02, - 0x00, - 0xa9, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0xae, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0xa7, - 0x00, - 0x00, - 0x00, - 0xaf, - 0x00, - 0x00, - 0x00, - 0xf9, - 0x00, - 0x02, - 0x00, - 0xa9, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0xa9, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x57, - 0x00, - 0x00, - 0x00, - 0xb0, - 0x00, - 0x00, - 0x00, - 0xa7, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0xa4, - 0x00, - 0x00, - 0x00, - 0xb0, - 0x00, - 0x00, - 0x00, - 0xfd, - 0x00, - 0x01, - 0x00, - 0x38, - 0x00, - 0x01, - 0x00, - 0x36, - 0x00, - 0x05, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x0b, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x08, - 0x00, - 0x00, - 0x00, - 0x37, - 0x00, - 0x03, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x09, - 0x00, - 0x00, - 0x00, - 0x37, - 0x00, - 0x03, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x0a, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0x0c, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x1e, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x0d, - 0x00, - 0x00, - 0x00, - 0x09, - 0x00, - 0x00, - 0x00, - 0x0c, - 0x00, - 0x06, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x0e, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x0d, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x09, - 0x00, - 0x00, - 0x00, - 0x0e, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x0f, - 0x00, - 0x00, - 0x00, - 0x09, - 0x00, - 0x00, - 0x00, - 0xb8, - 0x00, - 0x05, - 0x00, - 0x11, - 0x00, - 0x00, - 0x00, - 0x12, - 0x00, - 0x00, - 0x00, - 0x0f, - 0x00, - 0x00, - 0x00, - 0x10, - 0x00, - 0x00, - 0x00, - 0xf7, - 0x00, - 0x03, - 0x00, - 0x14, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0xfa, - 0x00, - 0x04, - 0x00, - 0x12, - 0x00, - 0x00, - 0x00, - 0x13, - 0x00, - 0x00, - 0x00, - 0x14, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0x13, - 0x00, - 0x00, - 0x00, - 0xfe, - 0x00, - 0x02, - 0x00, - 0x15, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0x14, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x17, - 0x00, - 0x00, - 0x00, - 0x09, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x18, - 0x00, - 0x00, - 0x00, - 0x0a, - 0x00, - 0x00, - 0x00, - 0xbe, - 0x00, - 0x05, - 0x00, - 0x11, - 0x00, - 0x00, - 0x00, - 0x19, - 0x00, - 0x00, - 0x00, - 0x17, - 0x00, - 0x00, - 0x00, - 0x18, - 0x00, - 0x00, - 0x00, - 0xf7, - 0x00, - 0x03, - 0x00, - 0x1b, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0xfa, - 0x00, - 0x04, - 0x00, - 0x19, - 0x00, - 0x00, - 0x00, - 0x1a, - 0x00, - 0x00, - 0x00, - 0x1b, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0x1a, - 0x00, - 0x00, - 0x00, - 0xfe, - 0x00, - 0x02, - 0x00, - 0x1c, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0x1b, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x00, - 0x00, - 0x09, - 0x00, - 0x00, - 0x00, - 0x85, - 0x00, - 0x05, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x21, - 0x00, - 0x00, - 0x00, - 0x1f, - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x1e, - 0x00, - 0x00, - 0x00, - 0x21, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x22, - 0x00, - 0x00, - 0x00, - 0x0a, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x23, - 0x00, - 0x00, - 0x00, - 0x1e, - 0x00, - 0x00, - 0x00, - 0x0c, - 0x00, - 0x06, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x24, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x0d, - 0x00, - 0x00, - 0x00, - 0x23, - 0x00, - 0x00, - 0x00, - 0x85, - 0x00, - 0x05, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x25, - 0x00, - 0x00, - 0x00, - 0x22, - 0x00, - 0x00, - 0x00, - 0x24, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x26, - 0x00, - 0x00, - 0x00, - 0x1e, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x27, - 0x00, - 0x00, - 0x00, - 0x0a, - 0x00, - 0x00, - 0x00, - 0x88, - 0x00, - 0x05, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x28, - 0x00, - 0x00, - 0x00, - 0x26, - 0x00, - 0x00, - 0x00, - 0x27, - 0x00, - 0x00, - 0x00, - 0x0c, - 0x00, - 0x06, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x29, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x0d, - 0x00, - 0x00, - 0x00, - 0x28, - 0x00, - 0x00, - 0x00, - 0x85, - 0x00, - 0x05, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x2a, - 0x00, - 0x00, - 0x00, - 0x25, - 0x00, - 0x00, - 0x00, - 0x29, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x2b, - 0x00, - 0x00, - 0x00, - 0x1e, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x2c, - 0x00, - 0x00, - 0x00, - 0x1e, - 0x00, - 0x00, - 0x00, - 0x85, - 0x00, - 0x05, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x2d, - 0x00, - 0x00, - 0x00, - 0x2b, - 0x00, - 0x00, - 0x00, - 0x2c, - 0x00, - 0x00, - 0x00, - 0x88, - 0x00, - 0x05, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x2e, - 0x00, - 0x00, - 0x00, - 0x2a, - 0x00, - 0x00, - 0x00, - 0x2d, - 0x00, - 0x00, - 0x00, - 0xfe, - 0x00, - 0x02, - 0x00, - 0x2e, - 0x00, - 0x00, - 0x00, - 0x38, - 0x00, - 0x01, - 0x00, -}; -static const size_t kdownscale_frag_spv_size = 4248; diff --git a/source/core/rendering/sdl3gpu/spv/upscale_frag_spv.h b/source/core/rendering/sdl3gpu/spv/upscale_frag_spv.h deleted file mode 100644 index 46e7c30..0000000 --- a/source/core/rendering/sdl3gpu/spv/upscale_frag_spv.h +++ /dev/null @@ -1,634 +0,0 @@ -#pragma once -#include -#include -static const uint8_t kupscale_frag_spv[] = { - 0x03, - 0x02, - 0x23, - 0x07, - 0x00, - 0x00, - 0x01, - 0x00, - 0x0b, - 0x00, - 0x0d, - 0x00, - 0x14, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x11, - 0x00, - 0x02, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x0b, - 0x00, - 0x06, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x47, - 0x4c, - 0x53, - 0x4c, - 0x2e, - 0x73, - 0x74, - 0x64, - 0x2e, - 0x34, - 0x35, - 0x30, - 0x00, - 0x00, - 0x00, - 0x00, - 0x0e, - 0x00, - 0x03, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x0f, - 0x00, - 0x07, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x6d, - 0x61, - 0x69, - 0x6e, - 0x00, - 0x00, - 0x00, - 0x00, - 0x09, - 0x00, - 0x00, - 0x00, - 0x11, - 0x00, - 0x00, - 0x00, - 0x10, - 0x00, - 0x03, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x03, - 0x00, - 0x03, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0xc2, - 0x01, - 0x00, - 0x00, - 0x04, - 0x00, - 0x0a, - 0x00, - 0x47, - 0x4c, - 0x5f, - 0x47, - 0x4f, - 0x4f, - 0x47, - 0x4c, - 0x45, - 0x5f, - 0x63, - 0x70, - 0x70, - 0x5f, - 0x73, - 0x74, - 0x79, - 0x6c, - 0x65, - 0x5f, - 0x6c, - 0x69, - 0x6e, - 0x65, - 0x5f, - 0x64, - 0x69, - 0x72, - 0x65, - 0x63, - 0x74, - 0x69, - 0x76, - 0x65, - 0x00, - 0x00, - 0x04, - 0x00, - 0x08, - 0x00, - 0x47, - 0x4c, - 0x5f, - 0x47, - 0x4f, - 0x4f, - 0x47, - 0x4c, - 0x45, - 0x5f, - 0x69, - 0x6e, - 0x63, - 0x6c, - 0x75, - 0x64, - 0x65, - 0x5f, - 0x64, - 0x69, - 0x72, - 0x65, - 0x63, - 0x74, - 0x69, - 0x76, - 0x65, - 0x00, - 0x05, - 0x00, - 0x04, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x6d, - 0x61, - 0x69, - 0x6e, - 0x00, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x05, - 0x00, - 0x09, - 0x00, - 0x00, - 0x00, - 0x6f, - 0x75, - 0x74, - 0x5f, - 0x63, - 0x6f, - 0x6c, - 0x6f, - 0x72, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x04, - 0x00, - 0x0d, - 0x00, - 0x00, - 0x00, - 0x73, - 0x63, - 0x65, - 0x6e, - 0x65, - 0x00, - 0x00, - 0x00, - 0x05, - 0x00, - 0x04, - 0x00, - 0x11, - 0x00, - 0x00, - 0x00, - 0x76, - 0x5f, - 0x75, - 0x76, - 0x00, - 0x00, - 0x00, - 0x00, - 0x47, - 0x00, - 0x04, - 0x00, - 0x09, - 0x00, - 0x00, - 0x00, - 0x1e, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x47, - 0x00, - 0x04, - 0x00, - 0x0d, - 0x00, - 0x00, - 0x00, - 0x21, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x47, - 0x00, - 0x04, - 0x00, - 0x0d, - 0x00, - 0x00, - 0x00, - 0x22, - 0x00, - 0x00, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0x47, - 0x00, - 0x04, - 0x00, - 0x11, - 0x00, - 0x00, - 0x00, - 0x1e, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x13, - 0x00, - 0x02, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0x21, - 0x00, - 0x03, - 0x00, - 0x03, - 0x00, - 0x00, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0x16, - 0x00, - 0x03, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x00, - 0x00, - 0x17, - 0x00, - 0x04, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x04, - 0x00, - 0x08, - 0x00, - 0x00, - 0x00, - 0x03, - 0x00, - 0x00, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x08, - 0x00, - 0x00, - 0x00, - 0x09, - 0x00, - 0x00, - 0x00, - 0x03, - 0x00, - 0x00, - 0x00, - 0x19, - 0x00, - 0x09, - 0x00, - 0x0a, - 0x00, - 0x00, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x1b, - 0x00, - 0x03, - 0x00, - 0x0b, - 0x00, - 0x00, - 0x00, - 0x0a, - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x04, - 0x00, - 0x0c, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x0b, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x0c, - 0x00, - 0x00, - 0x00, - 0x0d, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x17, - 0x00, - 0x04, - 0x00, - 0x0f, - 0x00, - 0x00, - 0x00, - 0x06, - 0x00, - 0x00, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0x20, - 0x00, - 0x04, - 0x00, - 0x10, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x0f, - 0x00, - 0x00, - 0x00, - 0x3b, - 0x00, - 0x04, - 0x00, - 0x10, - 0x00, - 0x00, - 0x00, - 0x11, - 0x00, - 0x00, - 0x00, - 0x01, - 0x00, - 0x00, - 0x00, - 0x36, - 0x00, - 0x05, - 0x00, - 0x02, - 0x00, - 0x00, - 0x00, - 0x04, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x03, - 0x00, - 0x00, - 0x00, - 0xf8, - 0x00, - 0x02, - 0x00, - 0x05, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x0b, - 0x00, - 0x00, - 0x00, - 0x0e, - 0x00, - 0x00, - 0x00, - 0x0d, - 0x00, - 0x00, - 0x00, - 0x3d, - 0x00, - 0x04, - 0x00, - 0x0f, - 0x00, - 0x00, - 0x00, - 0x12, - 0x00, - 0x00, - 0x00, - 0x11, - 0x00, - 0x00, - 0x00, - 0x57, - 0x00, - 0x05, - 0x00, - 0x07, - 0x00, - 0x00, - 0x00, - 0x13, - 0x00, - 0x00, - 0x00, - 0x0e, - 0x00, - 0x00, - 0x00, - 0x12, - 0x00, - 0x00, - 0x00, - 0x3e, - 0x00, - 0x03, - 0x00, - 0x09, - 0x00, - 0x00, - 0x00, - 0x13, - 0x00, - 0x00, - 0x00, - 0xfd, - 0x00, - 0x01, - 0x00, - 0x38, - 0x00, - 0x01, - 0x00, -}; -static const size_t kupscale_frag_spv_size = 628; diff --git a/source/game/defaults.hpp b/source/game/defaults.hpp index 99a9b46..cac176a 100644 --- a/source/game/defaults.hpp +++ b/source/game/defaults.hpp @@ -26,13 +26,10 @@ namespace Defaults::Video { constexpr Screen::Filter FILTER = Screen::Filter::NEAREST; // Filtro por defecto constexpr bool VERTICAL_SYNC = true; // Vsync activado por defecto constexpr bool SHADER_ENABLED = false; // Shaders de post-procesado desactivados por defecto - constexpr bool SUPERSAMPLING = false; // Supersampling desactivado por defecto constexpr bool INTEGER_SCALE = true; // Escalado entero activado por defecto constexpr bool KEEP_ASPECT = true; // Mantener aspecto activado por defecto constexpr const char* PALETTE_NAME = "resurrect-64"; // Paleta por defecto constexpr const char* PALETTE_SORT = "original"; // Modo de ordenación de paleta por defecto - constexpr bool LINEAR_UPSCALE = false; // Upscale NEAREST por defecto - constexpr int DOWNSCALE_ALGO = 1; // Downscale por defecto (0=Bilinear, 1=Lanczos2, 2=Lanczos3) constexpr bool GPU_ACCELERATION = true; // Aceleración GPU activada por defecto } // namespace Defaults::Video diff --git a/source/game/ui/console_commands.cpp b/source/game/ui/console_commands.cpp index a5c550f..788bce0 100644 --- a/source/game/ui/console_commands.cpp +++ b/source/game/ui/console_commands.cpp @@ -55,65 +55,6 @@ static auto boolToggle( // ── Command handlers ───────────────────────────────────────────────────────── -// SS [ON|OFF|SIZE|UPSCALE [NEAREST|LINEAR]|DOWNSCALE [BILINEAR|LANCZOS2|LANCZOS3]] -static auto cmdSs(const std::vector& args) -> std::string { // NOLINT(readability-function-cognitive-complexity) - if (!Screen::get()->isHardwareAccelerated()) { return "No GPU acceleration"; } - static const std::array DOWNSCALE_NAMES = {"Bilinear", "Lanczos2", "Lanczos3"}; - if (!args.empty() && args[0] == "SIZE") { - if (!Options::video.supersampling.enabled) { return "Supersampling is OFF: no texture"; } - const auto [w, h] = Screen::get()->getSsTextureSize(); - if (w == 0) { return "SS texture: not active"; } - return "SS texture: " + std::to_string(w) + "x" + std::to_string(h); - } - if (!args.empty() && args[0] == "UPSCALE") { - if (args.size() == 1) { - Screen::get()->setLinearUpscale(!Options::video.supersampling.linear_upscale); - return std::string("Upscale: ") + (Options::video.supersampling.linear_upscale ? "Linear" : "Nearest"); - } - if (args[1] == "NEAREST") { - if (!Options::video.supersampling.linear_upscale) { return "Upscale already Nearest"; } - Screen::get()->setLinearUpscale(false); - return "Upscale: Nearest"; - } - if (args[1] == "LINEAR") { - if (Options::video.supersampling.linear_upscale) { return "Upscale already Linear"; } - Screen::get()->setLinearUpscale(true); - return "Upscale: Linear"; - } - return "usage: ss upscale [nearest|linear]"; - } - if (!args.empty() && args[0] == "DOWNSCALE") { - if (args.size() == 1) { - return std::string("Downscale: ") + std::string(DOWNSCALE_NAMES[static_cast(Options::video.supersampling.downscale_algo)]); - } - int algo = -1; - if (args[1] == "BILINEAR") { algo = 0; } - if (args[1] == "LANCZOS2") { algo = 1; } - if (args[1] == "LANCZOS3") { algo = 2; } - if (algo == -1) { return "usage: ss downscale [bilinear|lanczos2|lanczos3]"; } - if (Options::video.supersampling.downscale_algo == algo) { - return std::string("Downscale already ") + std::string(DOWNSCALE_NAMES[static_cast(algo)]); - } - Screen::get()->setDownscaleAlgo(algo); - return std::string("Downscale: ") + std::string(DOWNSCALE_NAMES[static_cast(algo)]); - } - if (args.empty()) { - Screen::get()->toggleSupersampling(); - return std::string("PostFX Supersampling ") + (Options::video.supersampling.enabled ? "ON" : "OFF"); - } - if (args[0] == "ON") { - if (Options::video.supersampling.enabled) { return "Supersampling already ON"; } - Screen::get()->toggleSupersampling(); - return "PostFX Supersampling ON"; - } - if (args[0] == "OFF") { - if (!Options::video.supersampling.enabled) { return "Supersampling already OFF"; } - Screen::get()->toggleSupersampling(); - return "PostFX Supersampling OFF"; - } - return "usage: ss [on|off|size|upscale [nearest|linear]|downscale [bilinear|lanczos2|lanczos3]]"; -} - // Helper: aplica un preset por dirección (NEXT/PREV) o nombre; devuelve mensaje static auto applyPreset(const std::vector& args) -> std::string { const bool IS_CRTPI = Options::video.shader.current_shader == Rendering::ShaderType::CRTPI; @@ -1013,7 +954,6 @@ static auto cmdConsole(const std::vector& args) -> std::string { / // ── CommandRegistry ────────────────────────────────────────────────────────── void CommandRegistry::registerHandlers() { // NOLINT(readability-function-cognitive-complexity) - handlers_["cmd_ss"] = cmdSs; handlers_["cmd_shader"] = cmdShader; handlers_["cmd_border"] = cmdBorder; handlers_["cmd_fullscreen"] = cmdFullscreen; diff --git a/tools/shaders/compile_spirv.cmake b/tools/shaders/compile_spirv.cmake index e41ad2f..07a8e17 100644 --- a/tools/shaders/compile_spirv.cmake +++ b/tools/shaders/compile_spirv.cmake @@ -15,8 +15,6 @@ cmake_policy(SET CMP0007 NEW) set(SHADER_SOURCES "postfx.vert" "postfx.frag" - "upscale.frag" - "downscale.frag" "crtpi_frag.glsl" ) @@ -24,15 +22,11 @@ set(SHADER_SOURCES set(SHADER_VARS "kpostfx_vert_spv" "kpostfx_frag_spv" - "kupscale_frag_spv" - "kdownscale_frag_spv" "kcrtpi_frag_spv" ) # Flags extra de glslc para cada shader (vacío si no hay) set(SHADER_FLAGS - "" - "" "" "" "-fshader-stage=frag"