no message

.gitignore

@@ -59,7 +59,7 @@ __pycache__/
 docs/_build/
 
 # project settings
-Build/**
+Build/
 
 # Visual Studio 2015 and later
 *.VC.db

TestApp1/TestApp1.cpp

@@ -12,15 +12,37 @@ class TestApp1 : public DKApplication
 {
 	DKObject<DKWindow> window;
 	DKObject<DKThread> renderThread;
+	DKResourcePool resourcePool;
 
 	DKAtomicNumber32 runningRenderThread;
 public:
 	void RenderThread(void)
 	{
+		DKObject<DKData> vertData = resourcePool.LoadResourceData("triangle.vert.spv");
+		DKObject<DKData> fragData = resourcePool.LoadResourceData("triangle.frag.spv");
+		DKShader vertShader(vertData, DKShader::StageType::Vertex);
+		DKShader fragShader(fragData, DKShader::StageType::Fragment);
+
 		DKObject<DKGraphicsDevice> device = DKGraphicsDevice::SharedInstance();
+		DKObject<DKShaderModule> vertShaderModule = device->CreateShaderModule(&vertShader);
+		DKObject<DKShaderModule> fragShaderModule = device->CreateShaderModule(&fragShader);
+
+		DKObject<DKShaderFunction> vertShaderFunction = vertShaderModule->CreateFunction(vertShaderModule->FunctionNames().Value(0));
+		DKObject<DKShaderFunction> fragShaderFunction = fragShaderModule->CreateFunction(fragShaderModule->FunctionNames().Value(0));
+
 		DKObject<DKCommandQueue> queue = device->CreateCommandQueue();
 		DKObject<DKSwapChain> swapChain = queue->CreateSwapChain(window);
 
+
+		DKRenderPipelineDescriptor pipelineDescriptor;
+		pipelineDescriptor.vertexFunction = vertShaderFunction;
+		pipelineDescriptor.fragmentFunction = fragShaderFunction;
+		pipelineDescriptor.colorAttachments.Resize(1);
+		pipelineDescriptor.colorAttachments.Value(0).pixelFormat = swapChain->ColorPixelFormat();
+
+
+		DKObject<DKRenderPipelineState> pipelineState = device->CreateRenderPipeline(pipelineDescriptor, NULL);
+
 		DKTimer timer;
 		timer.Reset();
 
@@ -54,14 +76,16 @@ public:
 
 	void OnInitialize(void) override
 	{
-		DKLog("%s", DKGL_FUNCTION_NAME);
-		try {
-			window = DKWindow::Create("DefaultWindow");
-		}
-		catch (DKError& e)
-		{
-			DKLog("error? :%ls", (const wchar_t*)e.Description());
-		}
+		DKLogD("%s", DKGL_FUNCTION_NAME);
+
+		DKString resPath = DefaultPath(SystemPath::AppResource);
+		resPath = resPath.FilePathStringByAppendingPath("Data");
+		DKLog("resPath: %ls", (const wchar_t*)resPath);
+		resourcePool.AddLocatorForPath(resPath);
+
+		window = DKWindow::Create("DefaultWindow");
+		window->SetOrigin({ 0, 0 });
+		window->Resize({ 320, 240 });
 		window->Activate();
 
 		window->AddEventHandler(this,
@@ -76,14 +100,14 @@ public:
 	}
 	void OnTerminate(void) override
 	{
-		DKLog("%s", DKGL_FUNCTION_NAME);
+		DKLogD("%s", DKGL_FUNCTION_NAME);
 
 		runningRenderThread = 0;
 		renderThread->WaitTerminate();
 		renderThread = NULL;
 		window = NULL;
 
-		DKLog("Memory Pool Statistics");
+		DKLogI("Memory Pool Statistics");
 		size_t numBuckets = DKMemoryPoolNumberOfBuckets();
 		DKMemoryPoolBucketStatus* buckets = new DKMemoryPoolBucketStatus[numBuckets];
 		DKMemoryPoolQueryAllocationStatus(buckets, numBuckets);
@@ -92,7 +116,7 @@ public:
 		{
 			if (buckets[i].totalChunks > 0)
 			{
-				DKLog("--> %5lu:  %5lu/%5lu, usage: %.1f%%, used: %.1fKB, total: %.1fKB",
+				DKLogI("--> %5lu:  %5lu/%5lu, usage: %.1f%%, used: %.1fKB, total: %.1fKB",
 					buckets[i].chunkSize,
 					buckets[i].usedChunks, buckets[i].totalChunks,
 					double(buckets[i].usedChunks) / double(buckets[i].totalChunks) * 100.0,
@@ -102,7 +126,7 @@ public:
 				usedBytes += buckets[i].chunkSize * buckets[i].usedChunks;
 			}
 		}
-		DKLog("MemoryPool Usage: %.1fMB / %.1fMB", double(usedBytes) / (1024 * 1024), double(DKMemoryPoolSize()) / (1024 * 1024));
+		DKLogI("MemoryPool Usage: %.1fMB / %.1fMB", double(usedBytes) / (1024 * 1024), double(DKMemoryPoolSize()) / (1024 * 1024));
 		delete[] buckets;
 	}
 };

TestApp1/TestApp1.vcxproj

@@ -22,7 +22,7 @@
     <ProjectGuid>{AE0AF61D-F069-4AFA-AE24-A75C6A233B37}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>TestApp1</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -104,6 +104,11 @@
     <Manifest>
       <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
     </Manifest>
+    <PostBuildEvent>
+      <Command>echo Copying Resource Files...
+xcopy /Y /D /R /Q /E "$(SolutionDir)Data" "$(OutDir)Data\"
+</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -120,6 +125,11 @@
     <Manifest>
       <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
     </Manifest>
+    <PostBuildEvent>
+      <Command>echo Copying Resource Files...
+xcopy /Y /D /R /Q /E "$(SolutionDir)Data" "$(OutDir)Data\"
+</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -140,6 +150,11 @@
     <Manifest>
       <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
     </Manifest>
+    <PostBuildEvent>
+      <Command>echo Copying Resource Files...
+xcopy /Y /D /R /Q /E "$(SolutionDir)Data" "$(OutDir)Data\"
+</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -160,6 +175,11 @@
     <Manifest>
       <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
     </Manifest>
+    <PostBuildEvent>
+      <Command>echo Copying Resource Files...
+xcopy /Y /D /R /Q /E "$(SolutionDir)Data" "$(OutDir)Data\"
+</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="Win32\Resource.h" />

TestApp1/TestApp1.xcodeproj/project.pbxproj

@@ -9,21 +9,19 @@
 /* Begin PBXBuildFile section */
 		66DA89941DD3117F00338015 /* TestApp1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 844A9A801DD0C080007DCC89 /* TestApp1.cpp */; };
 		66DA89971DD3118000338015 /* TestApp1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 844A9A801DD0C080007DCC89 /* TestApp1.cpp */; };
-		66DA899B1DD3164E00338015 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66DA899A1DD3164E00338015 /* AppKit.framework */; };
 		840D5D3B1DDA07B2009DA369 /* DK.xcodeproj in Resources */ = {isa = PBXBuildFile; fileRef = 840D5D3A1DDA07B2009DA369 /* DK.xcodeproj */; };
 		840D5D921DDA08C2009DA369 /* libDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840D5D891DDA0890009DA369 /* libDK.a */; };
 		840D5D931DDA08CA009DA369 /* libDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 840D5D871DDA0890009DA369 /* libDK.a */; };
 		841948EB1DDCBE6000E039F0 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 841948E91DDCBE5000E039F0 /* AppDelegate.m */; };
 		841948EF1DDCBE7B00E039F0 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 841948ED1DDCBE7500E039F0 /* AppDelegate.m */; };
+		8420EE201EE5BA6500A20933 /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 8420EE1F1EE5BA6500A20933 /* Data */; };
+		8420EE211EE5BA6500A20933 /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 8420EE1F1EE5BA6500A20933 /* Data */; };
 		844A9A851DD0C080007DCC89 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 844A9A781DD0C080007DCC89 /* Assets.xcassets */; };
 		844A9A871DD0C080007DCC89 /* small.ico in Resources */ = {isa = PBXBuildFile; fileRef = 844A9A7C1DD0C080007DCC89 /* small.ico */; };
 		844A9A881DD0C080007DCC89 /* TestApp1.ico in Resources */ = {isa = PBXBuildFile; fileRef = 844A9A7E1DD0C080007DCC89 /* TestApp1.ico */; };
 		844A9A891DD0C080007DCC89 /* TestApp1.rc in Resources */ = {isa = PBXBuildFile; fileRef = 844A9A7F1DD0C080007DCC89 /* TestApp1.rc */; };
 		844A9A8B1DD0C08F007DCC89 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 844A9A741DD0C080007DCC89 /* Assets.xcassets */; };
 		844A9A8D1DD0C08F007DCC89 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 844A9A761DD0C080007DCC89 /* LaunchScreen.storyboard */; };
-		84D883561E3A6A9200478725 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84D883551E3A6A9200478725 /* OpenAL.framework */; };
-		84D883601E3A6B0000478725 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84D8835F1E3A6B0000478725 /* OpenAL.framework */; };
-		84F6F3401E142A110096F558 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84F6F33F1E142A110096F558 /* UIKit.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -72,12 +70,12 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		66DA899A1DD3164E00338015 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
 		840D5D3A1DDA07B2009DA369 /* DK.xcodeproj */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "wrapper.pb-project"; name = DK.xcodeproj; path = ../DK/DK.xcodeproj; sourceTree = "<group>"; };
 		841948E81DDCBE5000E039F0 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		841948E91DDCBE5000E039F0 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		841948EC1DDCBE7500E039F0 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		841948ED1DDCBE7500E039F0 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		8420EE1F1EE5BA6500A20933 /* Data */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Data; path = ../Data; sourceTree = "<group>"; };
 		844A9A441DD0BCFD007DCC89 /* TestApp1_macOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestApp1_macOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		844A9A5C1DD0BEDD007DCC89 /* TestApp1_iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestApp1_iOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		844A9A741DD0C080007DCC89 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -91,9 +89,6 @@
 		844A9A7E1DD0C080007DCC89 /* TestApp1.ico */ = {isa = PBXFileReference; lastKnownFileType = image.ico; path = TestApp1.ico; sourceTree = "<group>"; };
 		844A9A7F1DD0C080007DCC89 /* TestApp1.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TestApp1.rc; sourceTree = "<group>"; };
 		844A9A801DD0C080007DCC89 /* TestApp1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestApp1.cpp; sourceTree = "<group>"; };
-		84D883551E3A6A9200478725 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
-		84D8835F1E3A6B0000478725 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/OpenAL.framework; sourceTree = DEVELOPER_DIR; };
-		84F6F33F1E142A110096F558 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.2.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -101,8 +96,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				84D883561E3A6A9200478725 /* OpenAL.framework in Frameworks */,
-				66DA899B1DD3164E00338015 /* AppKit.framework in Frameworks */,
 				840D5D931DDA08CA009DA369 /* libDK.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -111,8 +104,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				84D883601E3A6B0000478725 /* OpenAL.framework in Frameworks */,
-				84F6F3401E142A110096F558 /* UIKit.framework in Frameworks */,
 				840D5D921DDA08C2009DA369 /* libDK.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -123,10 +114,6 @@
 		66DA89141DD1887A00338015 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				84D8835F1E3A6B0000478725 /* OpenAL.framework */,
-				84D883551E3A6A9200478725 /* OpenAL.framework */,
-				84F6F33F1E142A110096F558 /* UIKit.framework */,
-				66DA899A1DD3164E00338015 /* AppKit.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -164,6 +151,7 @@
 		844A9A461DD0BCFD007DCC89 /* TestApp1 */ = {
 			isa = PBXGroup;
 			children = (
+				8420EE1F1EE5BA6500A20933 /* Data */,
 				844A9A731DD0C080007DCC89 /* iOS */,
 				844A9A771DD0C080007DCC89 /* macOS */,
 				844A9A7A1DD0C080007DCC89 /* Win32 */,
@@ -329,6 +317,7 @@
 			files = (
 				844A9A891DD0C080007DCC89 /* TestApp1.rc in Resources */,
 				844A9A871DD0C080007DCC89 /* small.ico in Resources */,
+				8420EE201EE5BA6500A20933 /* Data in Resources */,
 				844A9A851DD0C080007DCC89 /* Assets.xcassets in Resources */,
 				844A9A881DD0C080007DCC89 /* TestApp1.ico in Resources */,
 				840D5D3B1DDA07B2009DA369 /* DK.xcodeproj in Resources */,
@@ -341,6 +330,7 @@
 			files = (
 				844A9A8D1DD0C08F007DCC89 /* LaunchScreen.storyboard in Resources */,
 				844A9A8B1DD0C08F007DCC89 /* Assets.xcassets in Resources */,
+				8420EE211EE5BA6500A20933 /* Data in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -512,6 +502,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.icondb.TestApp1-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -529,6 +520,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.icondb.TestApp1-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;