Permalink
Browse files

ios: cleanup Xcode project structure a bit

  • Loading branch information...
aras-p committed May 30, 2018
1 parent 67844bc commit b9547848b5fdf84623c127c7a0365253d52197fa
View
@@ -253,6 +253,7 @@ - (void)drawInMTKView:(nonnull MTKView *)view
__block dispatch_semaphore_t block_sema = _inFlightSemaphore;
#if DO_COMPUTE_GPU
int counterIndex = (_uniformBufferIndex+1)%kMaxBuffersInFlight;
id <MTLBuffer> counterBuffer = _computeCounter;
#endif
[cmd addCompletedHandler:^(id<MTLCommandBuffer> buffer)
{
@@ -263,7 +264,7 @@ - (void)drawInMTKView:(nonnull MTKView *)view
// what Xcode reports for the GPU duration.
uint64_t time2 = mach_absolute_time();
_computeDur = (time2 - _computeStartTime);
int rayCount = *(const int*)(((const uint8_t*)[_computeCounter contents]) + counterIndex*AlignedSize(4));
int rayCount = *(const int*)(((const uint8_t*)[counterBuffer contents]) + counterIndex*AlignedSize(4));
rayCounter += rayCount;
#endif
@@ -33,18 +33,18 @@
2B2D97C220519C7100520EC1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2B2D97C320519C7100520EC1 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
2B2D97C520519C7100520EC1 /* Test.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Test.entitlements; sourceTree = "<group>"; };
2B6AD0DB20736FF70025F674 /* Config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Config.h; path = ../Source/Config.h; sourceTree = "<group>"; };
2B6AD0DB20736FF70025F674 /* Config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config.h; sourceTree = "<group>"; };
2B8065FE207CDB540043116F /* MathSimd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MathSimd.h; path = ../Source/MathSimd.h; sourceTree = "<group>"; };
2BB9041D2064EB6D00C0A0EA /* MetalKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalKit.framework; path = System/Library/Frameworks/MetalKit.framework; sourceTree = SDKROOT; };
2BE32DC7205BEDA6003C05B4 /* Test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Test.cpp; path = ../Source/Test.cpp; sourceTree = "<group>"; };
2BE32DC8205BEDA6003C05B4 /* Test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Test.h; path = ../Source/Test.h; sourceTree = "<group>"; };
2BE32DCB205BFC31003C05B4 /* TaskScheduler_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TaskScheduler_c.h; path = ../Source/enkiTS/TaskScheduler_c.h; sourceTree = "<group>"; };
2BE32DCC205BFC31003C05B4 /* LockLessMultiReadPipe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LockLessMultiReadPipe.h; path = ../Source/enkiTS/LockLessMultiReadPipe.h; sourceTree = "<group>"; };
2BE32DCD205BFC31003C05B4 /* Threads.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Threads.h; path = ../Source/enkiTS/Threads.h; sourceTree = "<group>"; };
2BE32DCE205BFC31003C05B4 /* TaskScheduler_c.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TaskScheduler_c.cpp; path = ../Source/enkiTS/TaskScheduler_c.cpp; sourceTree = "<group>"; };
2BE32DCF205BFC31003C05B4 /* Atomics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Atomics.h; path = ../Source/enkiTS/Atomics.h; sourceTree = "<group>"; };
2BE32DD0205BFC31003C05B4 /* TaskScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TaskScheduler.cpp; path = ../Source/enkiTS/TaskScheduler.cpp; sourceTree = "<group>"; };
2BE32DD1205BFC31003C05B4 /* TaskScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TaskScheduler.h; path = ../Source/enkiTS/TaskScheduler.h; sourceTree = "<group>"; };
2BE32DCB205BFC31003C05B4 /* TaskScheduler_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TaskScheduler_c.h; sourceTree = "<group>"; };
2BE32DCC205BFC31003C05B4 /* LockLessMultiReadPipe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LockLessMultiReadPipe.h; sourceTree = "<group>"; };
2BE32DCD205BFC31003C05B4 /* Threads.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Threads.h; sourceTree = "<group>"; };
2BE32DCE205BFC31003C05B4 /* TaskScheduler_c.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TaskScheduler_c.cpp; sourceTree = "<group>"; };
2BE32DCF205BFC31003C05B4 /* Atomics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Atomics.h; sourceTree = "<group>"; };
2BE32DD0205BFC31003C05B4 /* TaskScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TaskScheduler.cpp; sourceTree = "<group>"; };
2BE32DD1205BFC31003C05B4 /* TaskScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TaskScheduler.h; sourceTree = "<group>"; };
2BFC4E1420614A7B0007766C /* Maths.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Maths.cpp; path = ../Source/Maths.cpp; sourceTree = "<group>"; };
2BFC4E1520614A7B0007766C /* Maths.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Maths.h; path = ../Source/Maths.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -61,23 +61,54 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
2B2D97A520519C7100520EC1 = {
2B2B5A9420BE6EFA00040BFE /* Source */ = {
isa = PBXGroup;
children = (
2B2B5A9720BE6F8E00040BFE /* enkiTS */,
2B6AD0DB20736FF70025F674 /* Config.h */,
2BFC4E1420614A7B0007766C /* Maths.cpp */,
2BFC4E1520614A7B0007766C /* Maths.h */,
2B8065FE207CDB540043116F /* MathSimd.h */,
2BE32DC7205BEDA6003C05B4 /* Test.cpp */,
2BE32DC8205BEDA6003C05B4 /* Test.h */,
);
name = Source;
path = ../Source;
sourceTree = "<group>";
};
2B2B5A9720BE6F8E00040BFE /* enkiTS */ = {
isa = PBXGroup;
children = (
2BE32DCF205BFC31003C05B4 /* Atomics.h */,
2BE32DCC205BFC31003C05B4 /* LockLessMultiReadPipe.h */,
2BE32DCE205BFC31003C05B4 /* TaskScheduler_c.cpp */,
2BE32DCB205BFC31003C05B4 /* TaskScheduler_c.h */,
2BE32DD0205BFC31003C05B4 /* TaskScheduler.cpp */,
2BE32DD1205BFC31003C05B4 /* TaskScheduler.h */,
2BE32DCD205BFC31003C05B4 /* Threads.h */,
2B6AD0DB20736FF70025F674 /* Config.h */,
2BE32DC7205BEDA6003C05B4 /* Test.cpp */,
2BE32DC8205BEDA6003C05B4 /* Test.h */,
2B2D97B020519C7100520EC1 /* Mac */,
);
path = enkiTS;
sourceTree = "<group>";
};
2B2B5A9920BE710E00040BFE /* macOS */ = {
isa = PBXGroup;
children = (
2B2D97B120519C7100520EC1 /* AppDelegate.h */,
2B2D97B220519C7100520EC1 /* AppDelegate.m */,
2B2D97B720519C7100520EC1 /* GameViewController.h */,
2B2D97B820519C7100520EC1 /* GameViewController.m */,
2B2D97C320519C7100520EC1 /* main.m */,
2B2D97C220519C7100520EC1 /* Info.plist */,
2B2D97BF20519C7100520EC1 /* Main.storyboard */,
);
path = macOS;
sourceTree = "<group>";
};
2B2D97A520519C7100520EC1 = {
isa = PBXGroup;
children = (
2B2B5A9420BE6EFA00040BFE /* Source */,
2B2D97B020519C7100520EC1 /* Apple */,
2B2D97AF20519C7100520EC1 /* Products */,
2BB9041C2064EB6D00C0A0EA /* Frameworks */,
);
@@ -91,22 +122,16 @@
name = Products;
sourceTree = "<group>";
};
2B2D97B020519C7100520EC1 /* Mac */ = {
2B2D97B020519C7100520EC1 /* Apple */ = {
isa = PBXGroup;
children = (
2B2D97B120519C7100520EC1 /* AppDelegate.h */,
2B2D97B220519C7100520EC1 /* AppDelegate.m */,
2B2B5A9920BE710E00040BFE /* macOS */,
2B2D97B420519C7100520EC1 /* Renderer.h */,
2B2D97B520519C7100520EC1 /* Renderer.mm */,
2B2D97B720519C7100520EC1 /* GameViewController.h */,
2B2D97B820519C7100520EC1 /* GameViewController.m */,
2B2D97BA20519C7100520EC1 /* Shaders.metal */,
2B2D97BF20519C7100520EC1 /* Main.storyboard */,
2B2D97C220519C7100520EC1 /* Info.plist */,
2B2D97C320519C7100520EC1 /* main.m */,
2B2D97C520519C7100520EC1 /* Test.entitlements */,
);
name = Mac;
name = Apple;
sourceTree = "<group>";
};
2BB9041C2064EB6D00C0A0EA /* Frameworks */ = {
@@ -143,7 +168,7 @@
2B2D97A620519C7100520EC1 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0920;
LastUpgradeCheck = 0930;
ORGANIZATIONNAME = "Aras Pranckevicius";
TargetAttributes = {
2B2D97AD20519C7100520EC1 = {
@@ -231,13 +256,15 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -286,13 +313,15 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -328,7 +357,7 @@
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
GCC_FAST_MATH = YES;
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
INFOPLIST_FILE = "$(SRCROOT)/macOS/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.aras.Test;
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -342,7 +371,7 @@
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
GCC_FAST_MATH = YES;
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
INFOPLIST_FILE = "$(SRCROOT)/macOS/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.aras.Test;
PRODUCT_NAME = "$(TARGET_NAME)";
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit b954784

Please sign in to comment.