Merge pull request #23 from GPUOpen-LibrariesAndSDKs/bugfix/HRTSDK-0-cuda-fixes

meistdan · web-flow · commit ae2c8e7fa621 · 2023-11-01T07:28:25.000+09:00
Removing conflicting constants
diff --git a/tutorials/common/Aabb.h b/tutorials/common/Aabb.h
@@ -44,8 +44,8 @@ struct Aabb
 
 	HOST_DEVICE INLINE void reset( void )
 	{
-		m_min = make_hiprtFloat3( FltMax, FltMax, FltMax );
-		m_max = make_hiprtFloat3( -FltMax, -FltMax, -FltMax );
+		m_min = make_hiprtFloat3( hiprt::FltMax, hiprt::FltMax, hiprt::FltMax );
+		m_max = make_hiprtFloat3( -hiprt::FltMax, -hiprt::FltMax, -hiprt::FltMax );
 	}
 
 	HOST_DEVICE INLINE Aabb& grow( const hiprtFloat3& p )
diff --git a/tutorials/common/Common.h b/tutorials/common/Common.h
@@ -31,9 +31,6 @@
 #include <cmath>
 #endif
 
-constexpr float FltMin = 1.175494351e-38f;
-constexpr float FltMax = 3.402823466e+38f;
-
 #if !defined( __KERNELCC__ )
 #define HOST
 #define DEVICE

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,8 @@ struct Aabb`
`44`	`44`
`45`	`45`	`HOST_DEVICE INLINE void reset( void )`
`46`	`46`	`{`
`47`		`- m_min = make_hiprtFloat3( FltMax, FltMax, FltMax );`
`48`		`- m_max = make_hiprtFloat3( -FltMax, -FltMax, -FltMax );`
	`47`	`+ m_min = make_hiprtFloat3( hiprt::FltMax, hiprt::FltMax, hiprt::FltMax );`
	`48`	`+ m_max = make_hiprtFloat3( -hiprt::FltMax, -hiprt::FltMax, -hiprt::FltMax );`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`HOST_DEVICE INLINE Aabb& grow( const hiprtFloat3& p )`