Skip to content

Commit

Permalink
shaderc updates (#3018)
Browse files Browse the repository at this point in the history
- add support for Vulkan 1.3 using SPIR-V 1.6 as a profile target
- move ordering of help information of SPIR-V block
- update SPIR-V to Vulkan mapping documentation
  • Loading branch information
phniix authored Jan 7, 2023
1 parent 5f435ea commit e33efb8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
6 changes: 4 additions & 2 deletions tools/shaderc/shaderc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ namespace bgfx
// 1.3 | 1.1 | 1311
// 1.4 | 1.1 | 1411
// 1.5 | 1.2 | 1512
// 1.6 | 1.3 | 1613

struct Profile
{
Expand All @@ -104,11 +105,12 @@ namespace bgfx
{ ShadingLang::HLSL, 500, "s_5_0" },
{ ShadingLang::Metal, 1000, "metal" },
{ ShadingLang::PSSL, 1000, "pssl" },
{ ShadingLang::SpirV, 1010, "spirv" },
{ ShadingLang::SpirV, 1010, "spirv10-10" },
{ ShadingLang::SpirV, 1311, "spirv13-11" },
{ ShadingLang::SpirV, 1411, "spirv14-11" },
{ ShadingLang::SpirV, 1512, "spirv15-12" },
{ ShadingLang::SpirV, 1010, "spirv10-10" },
{ ShadingLang::SpirV, 1010, "spirv" },
{ ShadingLang::SpirV, 1613, "spirv16-13" },
{ ShadingLang::GLSL, 120, "120" },
{ ShadingLang::GLSL, 130, "130" },
{ ShadingLang::GLSL, 140, "140" },
Expand Down
6 changes: 6 additions & 0 deletions tools/shaderc/shaderc_spirv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,8 @@ namespace bgfx { namespace spirv
return SPV_ENV_VULKAN_1_1_SPIRV_1_4;
case 1512:
return SPV_ENV_VULKAN_1_2;
case 1613:
return SPV_ENV_VULKAN_1_3;
default:
BX_ASSERT(0, "Unknown SPIR-V version requested. Returning SPV_ENV_VULKAN_1_0 as default.");
return SPV_ENV_VULKAN_1_0;
Expand All @@ -402,6 +404,8 @@ namespace bgfx { namespace spirv
return glslang::EShTargetVulkan_1_1;
case 1512:
return glslang::EShTargetVulkan_1_2;
case 1613:
return glslang::EShTargetVulkan_1_3;
default:
BX_ASSERT(0, "Unknown SPIR-V version requested. Returning EShTargetVulkan_1_0 as default.");
return glslang::EShTargetVulkan_1_0;
Expand All @@ -420,6 +424,8 @@ namespace bgfx { namespace spirv
return glslang::EShTargetSpv_1_4;
case 1512:
return glslang::EShTargetSpv_1_5;
case 1613:
return glslang::EShTargetSpv_1_6;
default:
BX_ASSERT(0, "Unknown SPIR-V version requested. Returning EShTargetSpv_1_0 as default.");
return glslang::EShTargetSpv_1_0;
Expand Down

0 comments on commit e33efb8

Please sign in to comment.