Skip to content

Commit 08a53e7

Browse files
authored
Merge pull request #23 from aras-p/update-enkits
Update enkiTS to latest (ba51283, 2025-01-27)
2 parents ccabb60 + ae63680 commit 08a53e7

File tree

11 files changed

+3349
-1383
lines changed

11 files changed

+3349
-1383
lines changed

Cpp/Apple/ToyPathTracer.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@
6060
2BE32DC8205BEDA6003C05B4 /* Test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Test.h; path = ../Source/Test.h; sourceTree = "<group>"; };
6161
2BE32DCB205BFC31003C05B4 /* TaskScheduler_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TaskScheduler_c.h; sourceTree = "<group>"; };
6262
2BE32DCC205BFC31003C05B4 /* LockLessMultiReadPipe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LockLessMultiReadPipe.h; sourceTree = "<group>"; };
63-
2BE32DCD205BFC31003C05B4 /* Threads.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Threads.h; sourceTree = "<group>"; };
6463
2BE32DCE205BFC31003C05B4 /* TaskScheduler_c.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TaskScheduler_c.cpp; sourceTree = "<group>"; };
65-
2BE32DCF205BFC31003C05B4 /* Atomics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Atomics.h; sourceTree = "<group>"; };
6664
2BE32DD0205BFC31003C05B4 /* TaskScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TaskScheduler.cpp; sourceTree = "<group>"; };
6765
2BE32DD1205BFC31003C05B4 /* TaskScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TaskScheduler.h; sourceTree = "<group>"; };
6866
2BFC4E1420614A7B0007766C /* Maths.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Maths.cpp; path = ../Source/Maths.cpp; sourceTree = "<group>"; };
@@ -106,13 +104,11 @@
106104
2B2B5A9720BE6F8E00040BFE /* enkiTS */ = {
107105
isa = PBXGroup;
108106
children = (
109-
2BE32DCF205BFC31003C05B4 /* Atomics.h */,
110107
2BE32DCC205BFC31003C05B4 /* LockLessMultiReadPipe.h */,
111108
2BE32DCE205BFC31003C05B4 /* TaskScheduler_c.cpp */,
112109
2BE32DCB205BFC31003C05B4 /* TaskScheduler_c.h */,
113110
2BE32DD0205BFC31003C05B4 /* TaskScheduler.cpp */,
114111
2BE32DD1205BFC31003C05B4 /* TaskScheduler.h */,
115-
2BE32DCD205BFC31003C05B4 /* Threads.h */,
116112
);
117113
path = enkiTS;
118114
sourceTree = "<group>";

Cpp/Source/Test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,9 +356,9 @@ void DrawTest(float time, int frameCount, int screenWidth, int screenHeight, flo
356356
#if CPU_CAN_DO_THREADS
357357
enkiTaskSet* task = enkiCreateTaskSet(g_TS, TraceRowJob);
358358
bool threaded = true;
359-
enkiAddTaskSetToPipeMinRange(g_TS, task, &args, screenHeight, threaded ? 4 : screenHeight);
359+
enkiAddTaskSetMinRange(g_TS, task, &args, screenHeight, threaded ? 4 : screenHeight);
360360
enkiWaitForTaskSet(g_TS, task);
361-
enkiDeleteTaskSet(task);
361+
enkiDeleteTaskSet(g_TS, task);
362362
#else
363363
TraceRowJob(0, screenHeight, 0, &args);
364364
#endif

Cpp/Source/enkiTS/Atomics.h

Lines changed: 0 additions & 79 deletions
This file was deleted.

0 commit comments

Comments
 (0)