Skip to content

Commit

Permalink
stash
Browse files Browse the repository at this point in the history
Signed-off-by: Sam Hellawell <[email protected]>
  • Loading branch information
cykoder committed Nov 13, 2023
1 parent df22b08 commit 7e94a9f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/bgfx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4793,13 +4793,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)
Expand Down
2 changes: 2 additions & 0 deletions tools/shaderc/shaderc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<SPIR-V version>-<Vulkan version>
Expand Down Expand Up @@ -120,6 +121,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[] =
Expand Down

0 comments on commit 7e94a9f

Please sign in to comment.