Skip to content

Commit 03d3e50

Browse files
authored
GPUTracking: declare the resolve kernel's shared memory as shared (#15860)
The definitions in GPUTPCGMMergerGPU.cxx qualify smem with GPUsharedref(), and so does every other declaration in the header; this one did not. It makes no difference where GPUsharedref() is empty, but on Metal the declaration then takes a generic reference and the definition a threadgroup one, which are different types.
1 parent 9bb5583 commit 03d3e50

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

‎GPU/GPUTracking/Merger/GPUTPCGMMergerGPU.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class GPUTPCGMMergerResolve : public GPUTPCGMMergerGeneral
8181
};
8282

8383
template <int32_t iKernel = defaultKernel, typename... Args>
84-
GPUd() static void Thread(int32_t nBlocks, int32_t nThreads, int32_t iBlock, int32_t iThread, GPUSharedMemory& smem, processorType& clusterer, Args... args);
84+
GPUd() static void Thread(int32_t nBlocks, int32_t nThreads, int32_t iBlock, int32_t iThread, GPUsharedref() GPUSharedMemory& smem, processorType& clusterer, Args... args);
8585
};
8686

8787
class GPUTPCGMMergerClearLinks : public GPUTPCGMMergerGeneral

0 commit comments

Comments
 (0)