diff options
| author | Sayak Biswas <sayakAMD> | 2021-10-21 21:57:17 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-10-22 13:15:29 +0300 |
| commit | d092933abbadb3a6d5ab53a0b2b3b865cd5c9079 (patch) | |
| tree | 9d44286512efc1db894257fa9ed786a5049bb41b /intern/cycles/kernel/device/hip | |
| parent | d1fcf93f039b0546dfd01c33daf50bd135e34344 (diff) | |
Cycles: various fixes for HIP and compilation of HIP binaries
* Additional structs added to the hipew loader for device props
* Adds hipRTC functions to the loader for future usage
* Enables CPU+GPU usage for HIP
* Cleanup to the adaptive kernel compilation process
* Fix for kernel compilation failures with HIP with latest master
Ref T92393, D12958
Diffstat (limited to 'intern/cycles/kernel/device/hip')
| -rw-r--r-- | intern/cycles/kernel/device/hip/globals.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/device/hip/globals.h b/intern/cycles/kernel/device/hip/globals.h index 39978ae7899..28e1cc4282f 100644 --- a/intern/cycles/kernel/device/hip/globals.h +++ b/intern/cycles/kernel/device/hip/globals.h @@ -27,10 +27,10 @@ CCL_NAMESPACE_BEGIN /* Not actually used, just a NULL pointer that gets passed everywhere, which we * hope gets optimized out by the compiler. */ -struct KernelGlobals { - /* NOTE: Keep the size in sync with SHADOW_STACK_MAX_HITS. */ +struct KernelGlobalsGPU { int unused[1]; }; +typedef ccl_global const KernelGlobalsGPU *ccl_restrict KernelGlobals; /* Global scene data and textures */ __constant__ KernelData __data; |