Revert "Fix Cycles HIP assuming warp size 32"

This reverts commit 390b9f1305. It seems to
break things on Linux for unknown reasons, so leave it out for now. A solution
to this will be required for Vega cards though.
This commit is contained in:
Brecht Van Lommel 2022-04-20 18:07:37 +02:00
parent 3a6813ea65
commit 8d2da45f98
Notes: blender-bot 2023-09-08 04:55:43 +02:00
Referenced by issue #97315, Regression: Cycles visual glitches and hangs in alpha using HIP GPU
1 changed files with 1 additions and 1 deletions

View File

@ -62,7 +62,7 @@ typedef unsigned long long uint64_t;
#define ccl_gpu_block_idx_x (blockIdx.x)
#define ccl_gpu_grid_dim_x (gridDim.x)
#define ccl_gpu_warp_size (warpSize)
#define ccl_gpu_thread_mask(thread_warp) uint64_t(0xFFFFFFFFFFFFFFFF >> (64 - thread_warp))
#define ccl_gpu_thread_mask(thread_warp) uint(0xFFFFFFFF >> (ccl_gpu_warp_size - thread_warp))
#define ccl_gpu_global_id_x() (ccl_gpu_block_idx_x * ccl_gpu_block_dim_x + ccl_gpu_thread_idx_x)
#define ccl_gpu_global_size_x() (ccl_gpu_grid_dim_x * ccl_gpu_block_dim_x)