From 65dbdc6aa7a8a65dac1e2dbff8d141e6c84973bb Mon Sep 17 00:00:00 2001 From: Bruno Date: Sat, 3 Feb 2024 12:23:37 +0100 Subject: [PATCH] preparing for geogram 1.8.9-rc, deactivated shader dump for emscripten --- CMakeLists.txt | 4 ++-- src/lib/geogram_gfx/basic/GLSL.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4dd28552ee3a..e6f2566fbd91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,10 +6,10 @@ cmake_minimum_required(VERSION 3.0) cmake_policy(SET CMP0048 NEW) ############################################################################## -set(VORPALINE_VERSION_RC FALSE) +set(VORPALINE_VERSION_RC TRUE) set(VORPALINE_VERSION_MAJOR 1) set(VORPALINE_VERSION_MINOR 8) -set(VORPALINE_VERSION_PATCH 8) +set(VORPALINE_VERSION_PATCH 9) set(VORPALINE_VERSION_PLAIN ${VORPALINE_VERSION_MAJOR}.${VORPALINE_VERSION_MINOR}.${VORPALINE_VERSION_PATCH}) if(VORPALINE_VERSION_RC) diff --git a/src/lib/geogram_gfx/basic/GLSL.cpp b/src/lib/geogram_gfx/basic/GLSL.cpp index aedaac32113d..483aadb6029b 100644 --- a/src/lib/geogram_gfx/basic/GLSL.cpp +++ b/src/lib/geogram_gfx/basic/GLSL.cpp @@ -1075,6 +1075,7 @@ namespace GEO { sources_texts[i] = sources[i].text(); } +#ifndef GEO_OS_EMSCRIPTEN // If GL_debug is set, save shaders to file // It makes it easier testing and debugging // them with glslangValidator @@ -1112,6 +1113,7 @@ namespace GEO { out << sources_texts[i]; } } +#endif return compile_shader( target, &sources_texts[0], index_t(sources_texts.size())