fix compilation errors

Author: atkurtul

include/nbl/builtin/hlsl/member_test_macros.hlsl

@@ -7,17 +7,6 @@
 #include <nbl/builtin/hlsl/type_traits.hlsl>
 
 #ifdef __HLSL_VERSION
-#define NBL_GENERATE_MEMBER_TESTER(mem) \
-namespace nbl\
-{\
-namespace hlsl\
-{\
-    template<class T, class=bool_constant<true> > \
-    struct has_member_##mem : false_type {}; \
-    template<class T> \
-    struct has_member_##mem<T,bool_constant<impl::valid_expression<decltype(impl::declval<T>().mem)>::value> > : true_type {}; \
-}\
-}
 
 namespace nbl
 {
@@ -41,6 +30,20 @@ T declval(){}
 
 }
 
+
+#define NBL_GENERATE_MEMBER_TESTER(mem) \
+namespace nbl \
+{ \
+namespace hlsl \
+{ \
+    template<class T, class=bool_constant<true> > \
+    struct has_member_##mem : false_type {}; \
+    template<class T> \
+    struct has_member_##mem<T,bool_constant<impl::valid_expression<__decltype(impl::declval<T>().mem)>::value> > : true_type {}; \
+} \
+}
+
+
 NBL_GENERATE_MEMBER_TESTER(x)
 NBL_GENERATE_MEMBER_TESTER(y)
 NBL_GENERATE_MEMBER_TESTER(z)

include/nbl/builtin/hlsl/spirv_intrinsics/core.hlsl

@@ -110,10 +110,6 @@ void memoryBarrier(uint32_t memoryScope, uint32_t memorySemantics);
 #pragma region CONVERSION
 
 template<class T, class U>
-// [[vk::ext_extension("SPV_KHR_physical_storage_buffer")]]
-// [[vk::ext_capability(spv::CapabilityPhysicalStorageBufferAddresses)]]
-// [[vk::ext_capability(spv::CapabilityAddresses)]]
-// [[vk::ext_capability(spv::CapabilityFloat64)]]
 [[vk::ext_instruction(spv::OpBitcast)]]
 T bitcast(U);
 

include/nbl/builtin/hlsl/type_traits.hlsl

@@ -487,8 +487,8 @@ using integral_constant = std::integral_constant<T, val>;
 template<bool val>
 using bool_constant = std::bool_constant<val>;
 
-using bool_constant = std::true_type;
-using false_type    = std::false_type;
+using true_type   = std::true_type;
+using false_type  = std::false_type;
 
 template <bool C, class T, class F>
 using conditional  = std::conditional<C, T, F>;