From e4f9d852c5890457c62e4bb2dfe378c33de9607f Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Mon, 4 May 2026 13:56:31 +0200 Subject: [PATCH] Puja a C++20, restaura std::ranges::fill i elimina FRAGMENT_ENTRY no usat a macOS --- CMakeLists.txt | 2 +- source/audio/jail_audio.cpp | 2 +- source/rendering/sdl3gpu/sdl3gpu_shader_backend.cpp | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 09a3929..a63a6f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.10) project(shadertoy VERSION 1.00) # Estàndard de C++ -set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED True) # Política CMP0072: usar GLVND (libOpenGL/libGLX) en lloc de la libGL clàssica. diff --git a/source/audio/jail_audio.cpp b/source/audio/jail_audio.cpp index c70a98e..addbaf6 100644 --- a/source/audio/jail_audio.cpp +++ b/source/audio/jail_audio.cpp @@ -418,7 +418,7 @@ namespace Ja { const float V = SDL_clamp(volume, 0.0F, 1.0F); if (group == -1) { - std::fill(std::begin(sound_volume_), std::end(sound_volume_), V); + std::ranges::fill(sound_volume_, V); } else if (group >= 0 && group < MAX_GROUPS) { sound_volume_[group] = V; } else { diff --git a/source/rendering/sdl3gpu/sdl3gpu_shader_backend.cpp b/source/rendering/sdl3gpu/sdl3gpu_shader_backend.cpp index 415d21a..c9ca436 100644 --- a/source/rendering/sdl3gpu/sdl3gpu_shader_backend.cpp +++ b/source/rendering/sdl3gpu/sdl3gpu_shader_backend.cpp @@ -14,7 +14,6 @@ namespace Rendering { #ifdef __APPLE__ constexpr SDL_GPUShaderFormat SHADER_FORMAT = SDL_GPU_SHADERFORMAT_MSL; constexpr const char* VERTEX_ENTRY = "passthrough_vs"; - constexpr const char* FRAGMENT_ENTRY = "test_fs"; // overridden per-shader (see loadShader) constexpr const char* VERTEX_SUFFIX = ".vert.msl"; constexpr const char* FRAGMENT_SUFFIX = ".frag.msl"; #else