Browse Source

no message

Hongtae Kim 6 years ago
parent
commit
93f3877ea0

+ 8
- 0
DKGL2_Test.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist View File

1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3
+<plist version="1.0">
4
+<dict>
5
+	<key>IDEDidComputeMac32BitWarning</key>
6
+	<true/>
7
+</dict>
8
+</plist>

+ 3
- 6
TestApp1/TestApp1.cpp View File

62
 		pipelineDescriptor.colorAttachments.Value(0).pixelFormat = swapChain->ColorPixelFormat();
62
 		pipelineDescriptor.colorAttachments.Value(0).pixelFormat = swapChain->ColorPixelFormat();
63
 		pipelineDescriptor.rasterizationEnabled = true;
63
 		pipelineDescriptor.rasterizationEnabled = true;
64
 		pipelineDescriptor.vertexDescriptor.attributes = {
64
 		pipelineDescriptor.vertexDescriptor.attributes = {
65
-			{ DKVertexFormat::Float4, 0, 0, 0 },
66
-			{ DKVertexFormat::Float4, sizeof(DKVector3), 0, 1 },
65
+			{ DKVertexFormat::Float3, 0, 0, 0 },
66
+			{ DKVertexFormat::Float3, sizeof(DKVector3), 0, 1 },
67
 		};
67
 		};
68
 		pipelineDescriptor.vertexDescriptor.layouts = {
68
 		pipelineDescriptor.vertexDescriptor.layouts = {
69
-			{ DKVertexStepRate::Vertex, 0, 0 },
69
+			{ DKVertexStepRate::Vertex, sizeof(Vertex), 0 },
70
 		};
70
 		};
71
 
71
 
72
 		DKObject<DKRenderPipelineState> pipelineState = device->CreateRenderPipeline(pipelineDescriptor, NULL);
72
 		DKObject<DKRenderPipelineState> pipelineState = device->CreateRenderPipeline(pipelineDescriptor, NULL);
87
 			if (encoder)
87
 			if (encoder)
88
 			{
88
 			{
89
 				// draw scene!
89
 				// draw scene!
90
-
91
 				encoder->EndEncoding();
90
 				encoder->EndEncoding();
92
 				buffer->Commit();
91
 				buffer->Commit();
93
-				//buffer->WaitUntilCompleted();
94
 				swapChain->Present();
92
 				swapChain->Present();
95
 			}
93
 			}
96
 			else
94
 			else
97
 			{
95
 			{
98
 			}
96
 			}
99
-
100
 			DKThread::Sleep(0.01);
97
 			DKThread::Sleep(0.01);
101
 		}
98
 		}
102
 		DKLog("RenderThread terminating...");
99
 		DKLog("RenderThread terminating...");

+ 2
- 2
TestApp1/TestApp1.xcodeproj/project.pbxproj View File

382
 			buildSettings = {
382
 			buildSettings = {
383
 				ALWAYS_SEARCH_USER_PATHS = NO;
383
 				ALWAYS_SEARCH_USER_PATHS = NO;
384
 				CLANG_ANALYZER_NONNULL = YES;
384
 				CLANG_ANALYZER_NONNULL = YES;
385
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
385
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
386
 				CLANG_CXX_LIBRARY = "libc++";
386
 				CLANG_CXX_LIBRARY = "libc++";
387
 				CLANG_ENABLE_MODULES = YES;
387
 				CLANG_ENABLE_MODULES = YES;
388
 				CLANG_ENABLE_OBJC_ARC = YES;
388
 				CLANG_ENABLE_OBJC_ARC = YES;
431
 			buildSettings = {
431
 			buildSettings = {
432
 				ALWAYS_SEARCH_USER_PATHS = NO;
432
 				ALWAYS_SEARCH_USER_PATHS = NO;
433
 				CLANG_ANALYZER_NONNULL = YES;
433
 				CLANG_ANALYZER_NONNULL = YES;
434
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
434
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
435
 				CLANG_CXX_LIBRARY = "libc++";
435
 				CLANG_CXX_LIBRARY = "libc++";
436
 				CLANG_ENABLE_MODULES = YES;
436
 				CLANG_ENABLE_MODULES = YES;
437
 				CLANG_ENABLE_OBJC_ARC = YES;
437
 				CLANG_ENABLE_OBJC_ARC = YES;