From 34e2c28ead540d18f3c84d06d3fa1bca0b6c661c Mon Sep 17 00:00:00 2001 From: Sam Hellawell Date: Mon, 12 Jun 2023 00:34:13 +0100 Subject: [PATCH] stash Signed-off-by: Sam Hellawell --- src/bgfx.cpp | 14 +++++++------- tools/shaderc/shaderc.cpp | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/bgfx.cpp b/src/bgfx.cpp index 323b262385c..4c3c62b04da 100644 --- a/src/bgfx.cpp +++ b/src/bgfx.cpp @@ -4785,13 +4785,13 @@ namespace bgfx result &= bx::isAlphaNum(*ptr) || '_' == *ptr; } - BGFX_ERROR_CHECK(false - || result - , _err - , BGFX_ERROR_IDENTIFIER_VALIDATION - , "Identifier contains invalid characters. Identifier must be the alphabet character, number, or underscore." - , "" - ); + // BGFX_ERROR_CHECK(false + // || result + // , _err + // , BGFX_ERROR_IDENTIFIER_VALIDATION + // , "Identifier contains invalid characters. Identifier must be the alphabet character, number, or underscore." + // , "" + // ); } void calcTextureSize(TextureInfo& _info, uint16_t _width, uint16_t _height, uint16_t _depth, bool _cubeMap, bool _hasMips, uint16_t _numLayers, TextureFormat::Enum _format) diff --git a/tools/shaderc/shaderc.cpp b/tools/shaderc/shaderc.cpp index 305f89e5ec0..d5347a3b7d5 100644 --- a/tools/shaderc/shaderc.cpp +++ b/tools/shaderc/shaderc.cpp @@ -76,6 +76,7 @@ namespace bgfx // 4.2 420 11.0 vhdgf+c 5.0 // 4.3 430 vhdgf+c // 4.4 440 + // 4.6 460 // // SPIR-V profile naming convention: // spirv- @@ -121,6 +122,7 @@ namespace bgfx { ShadingLang::GLSL, 420, "420" }, { ShadingLang::GLSL, 430, "430" }, { ShadingLang::GLSL, 440, "440" }, + { ShadingLang::GLSL, 460, "460" }, }; static const char* s_ARB_shader_texture_lod[] =