Skip to content

Commit 64b10e5

Browse files
committed
stash
Signed-off-by: Sam Hellawell <[email protected]>
1 parent df22b08 commit 64b10e5

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

src/bgfx.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4793,13 +4793,13 @@ namespace bgfx
47934793
result &= bx::isAlphaNum(*ptr) || '_' == *ptr;
47944794
}
47954795

4796-
BGFX_ERROR_CHECK(false
4797-
|| result
4798-
, _err
4799-
, BGFX_ERROR_IDENTIFIER_VALIDATION
4800-
, "Identifier contains invalid characters. Identifier must be the alphabet character, number, or underscore."
4801-
, ""
4802-
);
4796+
// BGFX_ERROR_CHECK(false
4797+
// || result
4798+
// , _err
4799+
// , BGFX_ERROR_IDENTIFIER_VALIDATION
4800+
// , "Identifier contains invalid characters. Identifier must be the alphabet character, number, or underscore."
4801+
// , ""
4802+
// );
48034803
}
48044804

48054805
void calcTextureSize(TextureInfo& _info, uint16_t _width, uint16_t _height, uint16_t _depth, bool _cubeMap, bool _hasMips, uint16_t _numLayers, TextureFormat::Enum _format)

tools/shaderc/shaderc.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ namespace bgfx
7676
// 4.2 420 11.0 vhdgf+c 5.0
7777
// 4.3 430 vhdgf+c
7878
// 4.4 440
79+
// 4.6 460
7980
//
8081
// SPIR-V profile naming convention:
8182
// spirv<SPIR-V version>-<Vulkan version>
@@ -120,6 +121,7 @@ namespace bgfx
120121
{ ShadingLang::GLSL, 420, "420" },
121122
{ ShadingLang::GLSL, 430, "430" },
122123
{ ShadingLang::GLSL, 440, "440" },
124+
{ ShadingLang::GLSL, 460, "460" },
123125
};
124126

125127
static const char* s_ARB_shader_texture_lod[] =

0 commit comments

Comments
 (0)