@@ -75,7 +75,7 @@ struct device_capabilities0
7575{
7676 NBL_CONSTEXPR_STATIC_INLINE bool shaderFloat64 = true ;
7777 NBL_CONSTEXPR_STATIC_INLINE bool shaderDrawParameters = true ;
78- NBL_CONSTEXPR_STATIC_INLINE bool subgroupArithmetic = true ;
78+ NBL_CONSTEXPR_STATIC_INLINE bool shaderSubgroupArithmetic = true ;
7979 NBL_CONSTEXPR_STATIC_INLINE bool fragmentShaderPixelInterlock = true ;
8080 NBL_CONSTEXPR_STATIC_INLINE uint16_t maxOptimallyResidentWorkgroupInvocations = 16 ;
8181};
@@ -89,7 +89,7 @@ struct device_capabilities1
8989
9090struct device_capabilities2
9191{
92- NBL_CONSTEXPR_STATIC_INLINE bool subgroupArithmetic = true ;
92+ NBL_CONSTEXPR_STATIC_INLINE bool shaderSubgroupArithmetic = true ;
9393 NBL_CONSTEXPR_STATIC_INLINE bool fragmentShaderPixelInterlock = true ;
9494 NBL_CONSTEXPR_STATIC_INLINE uint16_t maxOptimallyResidentWorkgroupInvocations = 16 ;
9595 NBL_CONSTEXPR_STATIC_INLINE uint32_t extraRandomField = 42 ;
@@ -278,15 +278,15 @@ void main(uint3 invocationID : SV_DispatchThreadID)
278278
279279 {
280280 STATIC_ASSERT (nbl::hlsl::device_capabilities_traits<device_capabilities0>::shaderFloat64 == device_capabilities0::shaderFloat64);
281- STATIC_ASSERT (nbl::hlsl::device_capabilities_traits<device_capabilities0>::subgroupArithmetic == device_capabilities0::subgroupArithmetic );
281+ STATIC_ASSERT (nbl::hlsl::device_capabilities_traits<device_capabilities0>::shaderSubgroupArithmetic == device_capabilities0::shaderSubgroupArithmetic );
282282 STATIC_ASSERT (nbl::hlsl::device_capabilities_traits<device_capabilities0>::fragmentShaderPixelInterlock == device_capabilities0::fragmentShaderPixelInterlock);
283283 STATIC_ASSERT (nbl::hlsl::device_capabilities_traits<device_capabilities0>::maxOptimallyResidentWorkgroupInvocations == device_capabilities0::maxOptimallyResidentWorkgroupInvocations);
284284 STATIC_ASSERT (nbl::hlsl::device_capabilities_traits<device_capabilities1>::shaderFloat64 == device_capabilities1::shaderFloat64);
285- STATIC_ASSERT (nbl::hlsl::device_capabilities_traits<device_capabilities1>::subgroupArithmetic == false );
285+ STATIC_ASSERT (nbl::hlsl::device_capabilities_traits<device_capabilities1>::shaderSubgroupArithmetic == false );
286286 STATIC_ASSERT (nbl::hlsl::device_capabilities_traits<device_capabilities1>::fragmentShaderPixelInterlock == device_capabilities1::fragmentShaderPixelInterlock);
287287 STATIC_ASSERT (nbl::hlsl::device_capabilities_traits<device_capabilities1>::maxOptimallyResidentWorkgroupInvocations == device_capabilities1::maxOptimallyResidentWorkgroupInvocations);
288288 STATIC_ASSERT (nbl::hlsl::device_capabilities_traits<device_capabilities2>::shaderFloat64 == false );
289- STATIC_ASSERT (nbl::hlsl::device_capabilities_traits<device_capabilities2>::subgroupArithmetic == device_capabilities2::subgroupArithmetic );
289+ STATIC_ASSERT (nbl::hlsl::device_capabilities_traits<device_capabilities2>::shaderSubgroupArithmetic == device_capabilities2::shaderSubgroupArithmetic );
290290 STATIC_ASSERT (nbl::hlsl::device_capabilities_traits<device_capabilities2>::fragmentShaderPixelInterlock == device_capabilities2::fragmentShaderPixelInterlock);
291291 STATIC_ASSERT (nbl::hlsl::device_capabilities_traits<device_capabilities2>::maxOptimallyResidentWorkgroupInvocations == device_capabilities2::maxOptimallyResidentWorkgroupInvocations);
292292
0 commit comments