[HIP] Fix compiler errors

GPUOpen-Effects · Feb 9, 2024 · 09cdfdd · 09cdfdd
1 parent e987bcd
commit 09cdfdd
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/src/pbrt/cmd/imgtool.cpp b/src/pbrt/cmd/imgtool.cpp
@@ -7,7 +7,9 @@
 #include <pbrt/filters.h>
 #include <pbrt/options.h>
 #ifdef PBRT_BUILD_GPU_RENDERER
-#include <pbrt/gpu/denoiser.h>
+#ifndef __HIP_PLATFORM_AMD__
+#include <pbrt/gpu/optix/denoiser.h>
+#endif // __HIP_PLATFORM_AMD__
 #include <pbrt/gpu/util.h>
 #endif  // PBRT_BUILD_GPU_RENDERER
 #include <pbrt/util/args.h>

diff --git a/src/pbrt/gpu/optix/aggregate.h b/src/pbrt/gpu/optix/aggregate.h
@@ -8,7 +8,7 @@
 #include <pbrt/pbrt.h>
 
 #include <pbrt/gpu/memory.h>
-#include <pbrt/gpu/optix.h>
+#include <pbrt/gpu/optix/optix.h>
 #include <pbrt/scene.h>
 #include <pbrt/util/containers.h>
 #include <pbrt/util/pstd.h>

diff --git a/src/pbrt/gpu/optix/optix.cu b/src/pbrt/gpu/optix/optix.cu
@@ -4,8 +4,8 @@
 
 #include <pbrt/pbrt.h>
 
-#include <pbrt/gpu/aggregate.h>
-#include <pbrt/gpu/optix.h>
+#include <pbrt/gpu/optix/aggregate.h>
+#include <pbrt/gpu/optix/optix.h>
 #include <pbrt/interaction.h>
 #include <pbrt/materials.h>
 #include <pbrt/media.h>

diff --git a/src/pbrt/util/color.cpp b/src/pbrt/util/color.cpp
@@ -4,7 +4,7 @@
 
 #include <pbrt/util/color.h>
 
-#if defined(PBRT_BUILD_GPU_RENDERER)
+#if defined(PBRT_BUILD_GPU_RENDERER) && defined(__HIP_PLATFORM_AMD__)
 #include <hip/hip_runtime.h>
 #endif
 

diff --git a/src/pbrt/util/math.h b/src/pbrt/util/math.h
@@ -25,7 +25,7 @@
 
 namespace pbrt {
 
-#if defined(PBRT_IS_GPU_CODE) && defined(__HIP_PLATFORM_NVIDIA__)
+#if defined(PBRT_IS_GPU_CODE) && defined(__NVCC__)
 
 #define ShadowEpsilon 0.0001f
 #define Pi Float(3.14159265358979323846)

diff --git a/src/pbrt/wavefront/integrator.cpp b/src/pbrt/wavefront/integrator.cpp
@@ -9,7 +9,7 @@
 #include <pbrt/film.h>
 #include <pbrt/filters.h>
 #ifdef PBRT_BUILD_GPU_RENDERER
-#include <pbrt/gpu/aggregate.h>
+#include <pbrt/gpu/optix/aggregate.h>
 #include <pbrt/gpu/memory.h>
 #endif  // PBRT_BUILD_GPU_RENDERER
 #include <pbrt/lights.h>