Skip to content

Commit 424fb07

Browse files
committed
GPUTracking: compile the real kernels into the Metal library
GPUReconstructionMETAL.metal had the device headers and the kernel list behind #if 0, with a comment saying they do not compile as MSL yet. They do now, so the entry point includes them and the library it produces contains the 96 kernels rather than nothing.
1 parent b53be27 commit 424fb07

1 file changed

Lines changed: 0 additions & 11 deletions

File tree

GPU/GPUTracking/Base/metal/GPUReconstructionMETAL.metal

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,8 @@ using namespace metal;
4747
#include "GPUCommonTypeTraits.h"
4848
#include "GPUCommonArray.h"
4949

50-
// The remaining headers do not compile as MSL yet, but nothing structural is in
51-
// the way: with the pragma above and the untyped constant buffer below, the
52-
// kernel list expands to all 104 entry points, with no derived-class and no
53-
// kernel-argument-type errors left. What fails is the bodies, and it is bulk
54-
// work rather than a missing language feature -- MSL has no double, and every
55-
// namespace-scope constexpr needs GPUglobalconstexpr().
56-
#if 0
5750
#include "GPUConstantMem.h"
5851
#include "GPUReconstructionIncludesDeviceAll.h"
59-
#endif
6052

6153
// --- Kernel list expansion ---------------------------------------------------
6254
#define GPUCA_KRNL(...) GPUCA_KRNLGPU(__VA_ARGS__)
@@ -80,10 +72,7 @@ using namespace metal;
8072
, uint _metalTPerTg [[threads_per_threadgroup]] \
8173
, uint _metalTgPerG [[threadgroups_per_grid]]
8274

83-
// Include the actual kernels, once the headers above compile as MSL.
84-
#if 0
8575
#include "GPUReconstructionKernelList.h"
86-
#endif
8776

8877
// clang-format on
8978
#pragma clang diagnostic pop

0 commit comments

Comments
 (0)