From d9c49c5c4269b7ed3fb05534e02f27c6501bbb86 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Thu, 14 May 2026 17:40:08 +0200 Subject: [PATCH] elimina compile_spirv.sh obsolet i regenera spv headers --- CMakeLists.txt | 3 +- .../sdl3gpu/spv/downscale_frag_spv.h | 3 +- .../rendering/sdl3gpu/spv/postfx_frag_spv.h | 3 +- .../rendering/sdl3gpu/spv/postfx_vert_spv.h | 3 +- .../rendering/sdl3gpu/spv/upscale_frag_spv.h | 3 +- tools/shaders/compile_spirv.sh | 58 ------------------- 6 files changed, 9 insertions(+), 64 deletions(-) delete mode 100755 tools/shaders/compile_spirv.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index e7ac3af..a45b9c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,8 +214,7 @@ if(NOT APPLE AND NOT EMSCRIPTEN) message(FATAL_ERROR "glslc no encontrado y header SPIR-V no existe: ${HDR}\n" " Instala glslc: sudo apt install glslang-tools (Linux)\n" - " choco install vulkan-sdk (Windows)\n" - " O genera los headers manualmente: tools/shaders/compile_spirv.sh" + " choco install vulkan-sdk (Windows)" ) endif() endforeach() diff --git a/source/core/rendering/sdl3gpu/spv/downscale_frag_spv.h b/source/core/rendering/sdl3gpu/spv/downscale_frag_spv.h index 6d96082..cf0f341 100644 --- a/source/core/rendering/sdl3gpu/spv/downscale_frag_spv.h +++ b/source/core/rendering/sdl3gpu/spv/downscale_frag_spv.h @@ -4249,5 +4249,6 @@ static const uint8_t kdownscale_frag_spv[] = { 0x38, 0x00, 0x01, - 0x00}; + 0x00, +}; static const size_t kdownscale_frag_spv_size = 4248; diff --git a/source/core/rendering/sdl3gpu/spv/postfx_frag_spv.h b/source/core/rendering/sdl3gpu/spv/postfx_frag_spv.h index 8811d52..a60ea13 100644 --- a/source/core/rendering/sdl3gpu/spv/postfx_frag_spv.h +++ b/source/core/rendering/sdl3gpu/spv/postfx_frag_spv.h @@ -11713,5 +11713,6 @@ static const uint8_t kpostfx_frag_spv[] = { 0x38, 0x00, 0x01, - 0x00}; + 0x00, +}; static const size_t kpostfx_frag_spv_size = 11712; diff --git a/source/core/rendering/sdl3gpu/spv/postfx_vert_spv.h b/source/core/rendering/sdl3gpu/spv/postfx_vert_spv.h index 1be581e..b5c80f9 100644 --- a/source/core/rendering/sdl3gpu/spv/postfx_vert_spv.h +++ b/source/core/rendering/sdl3gpu/spv/postfx_vert_spv.h @@ -1445,5 +1445,6 @@ static const uint8_t kpostfx_vert_spv[] = { 0x38, 0x00, 0x01, - 0x00}; + 0x00, +}; static const size_t kpostfx_vert_spv_size = 1444; diff --git a/source/core/rendering/sdl3gpu/spv/upscale_frag_spv.h b/source/core/rendering/sdl3gpu/spv/upscale_frag_spv.h index af2b2da..46e7c30 100644 --- a/source/core/rendering/sdl3gpu/spv/upscale_frag_spv.h +++ b/source/core/rendering/sdl3gpu/spv/upscale_frag_spv.h @@ -629,5 +629,6 @@ static const uint8_t kupscale_frag_spv[] = { 0x38, 0x00, 0x01, - 0x00}; + 0x00, +}; static const size_t kupscale_frag_spv_size = 628; diff --git a/tools/shaders/compile_spirv.sh b/tools/shaders/compile_spirv.sh deleted file mode 100755 index 7278ceb..0000000 --- a/tools/shaders/compile_spirv.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env bash -# Compile Vulkan GLSL shaders to SPIR-V and update the C++ headers used by SDL3GPUShader. -# Required: glslc (from Vulkan SDK or: brew install glslang / apt install glslang-tools) -# -# Run from the project root: tools/shaders/compile_spirv.sh - -set -e - -SHADERS_DIR="data/shaders" -HEADERS_DIR="source/core/rendering/sdl3gpu" - -if ! command -v glslc &> /dev/null; then - echo "ERROR: glslc not found. Install Vulkan SDK or run:" - echo " macOS: brew install glslang" - echo " Linux: sudo apt install glslang-tools" - exit 1 -fi - -echo "Compiling SPIR-V shaders..." - -glslc "${SHADERS_DIR}/postfx.vert" -o /tmp/postfx.vert.spv -glslc "${SHADERS_DIR}/postfx.frag" -o /tmp/postfx.frag.spv -glslc "${SHADERS_DIR}/upscale.frag" -o /tmp/upscale.frag.spv -glslc "${SHADERS_DIR}/downscale.frag" -o /tmp/downscale.frag.spv - -echo "Generating C++ headers..." - -xxd -i /tmp/postfx.vert.spv | \ - sed 's/unsigned char .*postfx_vert_spv\[\]/static const uint8_t kpostfx_vert_spv[]/' | \ - sed 's/unsigned int .*postfx_vert_spv_len/static const size_t kpostfx_vert_spv_size/' \ - > "${HEADERS_DIR}/postfx_vert_spv.h" - -xxd -i /tmp/postfx.frag.spv | \ - sed 's/unsigned char .*postfx_frag_spv\[\]/static const uint8_t kpostfx_frag_spv[]/' | \ - sed 's/unsigned int .*postfx_frag_spv_len/static const size_t kpostfx_frag_spv_size/' \ - > "${HEADERS_DIR}/postfx_frag_spv.h" - -xxd -i /tmp/upscale.frag.spv | \ - sed 's/unsigned char .*upscale_frag_spv\[\]/static const uint8_t kupscale_frag_spv[]/' | \ - sed 's/unsigned int .*upscale_frag_spv_len/static const size_t kupscale_frag_spv_size/' \ - > "${HEADERS_DIR}/upscale_frag_spv.h" - -xxd -i /tmp/downscale.frag.spv | \ - sed 's/unsigned char .*downscale_frag_spv\[\]/static const uint8_t kdownscale_frag_spv[]/' | \ - sed 's/unsigned int .*downscale_frag_spv_len/static const size_t kdownscale_frag_spv_size/' \ - > "${HEADERS_DIR}/downscale_frag_spv.h" - -# Prepend required includes to the headers -for f in "${HEADERS_DIR}/postfx_vert_spv.h" "${HEADERS_DIR}/postfx_frag_spv.h" "${HEADERS_DIR}/upscale_frag_spv.h" "${HEADERS_DIR}/downscale_frag_spv.h"; do - echo -e "#pragma once\n#include \n#include \n$(cat "$f")" > "$f" -done - -echo "Done. Headers updated in ${HEADERS_DIR}/" -echo " postfx_vert_spv.h" -echo " postfx_frag_spv.h" -echo " upscale_frag_spv.h" -echo " downscale_frag_spv.h" -echo "Rebuild the project to use the new shaders."