Skip to content

Commit 5bc4ef7

Browse files
Merge branch 'devsh' of github.com:Devsh-Graphics-Programming/Nabla into devsh
2 parents 1136c15 + 7fb1c1a commit 5bc4ef7

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

include/nbl/asset/utils/IGLSLCompiler.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ class IGLSLCompiler final : public core::IReferenceCounted
3131
ESV_1_3 = 0x010300u,
3232
ESV_1_4 = 0x010400u,
3333
ESV_1_5 = 0x010500u,
34+
ESV_1_6 = 0x010600u,
3435
ESV_COUNT = 0x7FFFFFFFu
3536
};
3637

src/nbl/video/CVulkanPhysicalDevice.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ class CVulkanPhysicalDevice final : public IPhysicalDevice
8686
[NO NABALA SUPPORT] Vulkan 1.0 implementation must support the 1.0 version of SPIR-V and the 1.0 version of the SPIR-V Extended Instructions for GLSL. If the VK_KHR_spirv_1_4 extension is enabled, the implementation must additionally support the 1.4 version of SPIR-V.
8787
A Vulkan 1.1 implementation must support the 1.0, 1.1, 1.2, and 1.3 versions of SPIR-V and the 1.0 version of the SPIR-V Extended Instructions for GLSL.
8888
A Vulkan 1.2 implementation must support the 1.0, 1.1, 1.2, 1.3, 1.4, and 1.5 versions of SPIR-V and the 1.0 version of the SPIR-V Extended Instructions for GLSL.
89+
A Vulkan 1.3 implementation must support the 1.0, 1.1, 1.2, 1.3, 1.4, and 1.5 versions of SPIR-V and the 1.0 version of the SPIR-V Extended Instructions for GLSL.
8990
*/
9091

9192
uint32_t apiVersion = std::min(instanceApiVersion, deviceProperties.properties.apiVersion);
@@ -104,6 +105,9 @@ class CVulkanPhysicalDevice final : public IPhysicalDevice
104105
case 2:
105106
m_limits.spirvVersion = asset::IGLSLCompiler::ESV_1_5;
106107
break;
108+
case 3:
109+
m_limits.spirvVersion = asset::IGLSLCompiler::ESV_1_5; // TODO: change this to spirv 1.6
110+
break;
107111
default:
108112
_NBL_DEBUG_BREAK_IF("Invalid Vulkan minor version!");
109113
break;

0 commit comments

Comments
 (0)