stash

Signed-off-by: Sam Hellawell <[email protected]>
bkaradzic · Jun 11, 2023 · 9982b4b · 9982b4b
1 parent 9fa80a8
commit 9982b4b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git 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
@@ -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>
@@ -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[] =