Merge branch 'master' of https://github.com/ConfettiFX/The-Forge

ConfettiFX · Nov 14, 2019 · ce71355 · ce71355
2 parents 34c0d30 + abb4d14
commit ce71355
Show file tree

Hide file tree

Showing 47 changed files with 286 additions and 294 deletions.
diff --git a/Common_3/OS/Android/AndroidBase.cpp b/Common_3/OS/Android/AndroidBase.cpp
@@ -272,30 +272,30 @@ int AndroidMain(void* param, IApp* app)
 {
 	extern bool MemAllocInit();
 	extern void MemAllocExit();
-
+
+
 	if (!MemAllocInit())
 		return EXIT_FAILURE;
 
-	if (!fsInitAPI())
-		return EXIT_FAILURE;
+	struct android_app* android_app = (struct android_app*)param;
+	android_activity = android_app->activity;
+	AndroidFS_SetNativeActivity(android_activity);
 
 	Log::Init();
-
-	struct android_app* android_app = (struct android_app*)param;
 
-	// Set the callback to process system events
-    android_app->onAppCmd = handle_cmd;
+	if (!fsInitAPI())
+		return EXIT_FAILURE;
 
+	// Set the callback to process system events
+	android_app->onAppCmd = handle_cmd;
 	pApp = app;
-	android_activity = android_app->activity;
 
 	//Used for automated testing, if enabled app will exit after 120 frames
 #ifdef AUTOMATED_TESTING
 	uint32_t       testingFrameCount = 0;
 	const uint32_t testingDesiredFrameCount = 120;
 #endif
 
-	AndroidFS_SetNativeActivity(android_activity);
 
 	IApp::Settings* pSettings = &pApp->mSettings;
 	Timer deltaTimer;

diff --git a/Common_3/OS/Android/AndroidFileSystem.cpp b/Common_3/OS/Android/AndroidFileSystem.cpp
@@ -209,7 +209,7 @@ class AndroidBundleFileSystem: public FileSystem
 
 	FileStream* OpenFile(const Path* filePath, FileMode mode) const override
 	{
-		if (mode & (FM_WRITE | FM_APPEND) != 0)
+		if ((mode & (FM_WRITE | FM_APPEND)) != 0)
 		{
 			LOGF(LogLevel::eERROR, "Cannot open %s with mode %i: the Android bundle is read-only.",
 				fsGetPathAsNativeString(filePath), mode);

diff --git a/Common_3/Renderer/ResourceLoader.cpp b/Common_3/Renderer/ResourceLoader.cpp
@@ -1349,9 +1349,11 @@ void vk_compileShader(
 	}
 	shaderc_compilation_result_t spvShader =
 		shaderc_compile_into_spv(compiler, code, codeSize, getShadercShaderType(stage), "shaderc_error", pEntryPoint ? pEntryPoint : "main", options);
-	if (shaderc_result_get_compilation_status(spvShader) != shaderc_compilation_status_success)
+	shaderc_compilation_status spvStatus = shaderc_result_get_compilation_status(spvShader);
+	if (spvStatus != shaderc_compilation_status_success)
 	{
-		LOGF(LogLevel::eERROR, "Shader compiling failed! with status");
+		const char* errorMessage = shaderc_result_get_error_message(spvShader);
+		LOGF(LogLevel::eERROR, "Shader compiling failed! with status %s", errorMessage);
 		abort();
 	}
 

diff --git a/Common_3/Tools/AssetPipeline/Win64/AssetPipeline.sln b/Common_3/Tools/AssetPipeline/Win64/AssetPipeline.sln
@@ -29,6 +29,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IrrXML", "..\..\..\ThirdPar
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssetPipelineCmd", "AssetPipelineCmd.vcxproj", "{9BB45EC2-8F3A-4D98-A235-40EBBB559F64}"
 	ProjectSection(ProjectDependencies) = postProject
+		{59586A07-8E7E-411D-BC3D-387E039AA423} = {59586A07-8E7E-411D-BC3D-387E039AA423}
 		{86CCE738-AAA1-4327-9DE0-AAB5B23B7852} = {86CCE738-AAA1-4327-9DE0-AAB5B23B7852}
 	EndProjectSection
 EndProject
@@ -252,38 +253,6 @@ Global
 		{0C80E083-8EC3-4DC4-8A93-BC30F0525A53}.ReleaseVk|x64.Build.0 = Release|x64
 		{0C80E083-8EC3-4DC4-8A93-BC30F0525A53}.ReleaseVk|x86.ActiveCfg = Release|Win32
 		{0C80E083-8EC3-4DC4-8A93-BC30F0525A53}.ReleaseVk|x86.Build.0 = Release|Win32
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.Debug|x64.ActiveCfg = Debug|x64
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.Debug|x64.Build.0 = Debug|x64
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.Debug|x86.ActiveCfg = Debug|Win32
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.Debug|x86.Build.0 = Debug|Win32
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugDx|x64.ActiveCfg = Debug|x64
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugDx|x64.Build.0 = Debug|x64
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugDx|x86.ActiveCfg = Debug|Win32
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugDx|x86.Build.0 = Debug|Win32
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugDx11|x64.ActiveCfg = Debug|x64
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugDx11|x64.Build.0 = Debug|x64
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugDx11|x86.ActiveCfg = Debug|Win32
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugDx11|x86.Build.0 = Debug|Win32
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugVk|x64.ActiveCfg = Debug|x64
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugVk|x64.Build.0 = Debug|x64
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugVk|x86.ActiveCfg = Debug|Win32
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.DebugVk|x86.Build.0 = Debug|Win32
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.Release|x64.ActiveCfg = Release|x64
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.Release|x64.Build.0 = Release|x64
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.Release|x86.ActiveCfg = Release|Win32
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.Release|x86.Build.0 = Release|Win32
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseDx|x64.ActiveCfg = Release|x64
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseDx|x64.Build.0 = Release|x64
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseDx|x86.ActiveCfg = Release|Win32
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseDx|x86.Build.0 = Release|Win32
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseDx11|x64.ActiveCfg = Release|x64
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseDx11|x64.Build.0 = Release|x64
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseDx11|x86.ActiveCfg = Release|Win32
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseDx11|x86.Build.0 = Release|Win32
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseVk|x64.ActiveCfg = Release|x64
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseVk|x64.Build.0 = Release|x64
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseVk|x86.ActiveCfg = Release|Win32
-		{D543A5A3-C52A-43C6-BE66-14B7AEE2FBBD}.ReleaseVk|x86.Build.0 = Release|Win32
 		{9BB45EC2-8F3A-4D98-A235-40EBBB559F64}.Debug|x64.ActiveCfg = DebugVk|x64
 		{9BB45EC2-8F3A-4D98-A235-40EBBB559F64}.Debug|x64.Build.0 = DebugVk|x64
 		{9BB45EC2-8F3A-4D98-A235-40EBBB559F64}.Debug|x86.ActiveCfg = DebugDx|Win32

diff --git a/Common_3/Tools/AssetPipeline/Win64/AssetPipelineCmd.vcxproj b/Common_3/Tools/AssetPipeline/Win64/AssetPipelineCmd.vcxproj
@@ -321,8 +321,8 @@
     </Link>
     <PostBuildEvent>
       <Command>mkdir "$(TargetDir)ImageConvertTools\"
-xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\"
-xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\"</Command>
+$(systemroot)\System32\xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\"
+$(systemroot)\System32\xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\"</Command>
     </PostBuildEvent>
     <PreBuildEvent>
       <Command>
@@ -352,8 +352,8 @@ xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configur
     </Link>
     <PostBuildEvent>
       <Command>mkdir "$(TargetDir)ImageConvertTools\"
-xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\"
-xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\"</Command>
+$(systemroot)\System32\xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\"
+$(systemroot)\System32\xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\"</Command>
     </PostBuildEvent>
     <PreBuildEvent>
       <Command>
@@ -383,8 +383,8 @@ xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configur
     </Link>
     <PostBuildEvent>
       <Command>mkdir "$(TargetDir)ImageConvertTools\"
-xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\"
-xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\"</Command>
+$(systemroot)\System32\xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\"
+$(systemroot)\System32\xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\"</Command>
     </PostBuildEvent>
     <PreBuildEvent>
       <Command>
@@ -481,8 +481,8 @@ xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configur
     </Link>
     <PostBuildEvent>
       <Command>mkdir "$(TargetDir)ImageConvertTools\"
-xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\"
-xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\"</Command>
+$(systemroot)\System32\xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\"
+$(systemroot)\System32\xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\"</Command>
     </PostBuildEvent>
     <PreBuildEvent>
       <Command>
@@ -516,8 +516,8 @@ xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configur
     </Link>
     <PostBuildEvent>
       <Command>mkdir "$(TargetDir)ImageConvertTools\"
-xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\"
-xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\"</Command>
+$(systemroot)\System32\xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\"
+$(systemroot)\System32\xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\"</Command>
     </PostBuildEvent>
     <PreBuildEvent>
       <Command>
@@ -551,8 +551,8 @@ xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configur
     </Link>
     <PostBuildEvent>
       <Command>mkdir "$(TargetDir)ImageConvertTools\"
-xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\"
-xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\"</Command>
+$(systemroot)\System32\xcopy /Y /S "$(ProjectDir)..\..\..\..\Tools\ImageConvertTools" "$(TargetDir)ImageConvertTools\"
+$(systemroot)\System32\xcopy /Y "$(ProjectDir)..\..\..\ThirdParty\OpenSource\basis_universal\$(Configuration)\basisu.exe" "$(TargetDir)ImageConvertTools\"</Command>
     </PostBuildEvent>
     <PreBuildEvent>
       <Command>

diff --git a/.../01_Transformations/Transformations.NativeActivity/Transformations.NativeActivity.vcxproj b/.../01_Transformations/Transformations.NativeActivity/Transformations.NativeActivity.vcxproj
@@ -162,7 +162,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <CompileAs>CompileAsCpp</CompileAs>
-      <PreprocessorDefinitions>VULKAN;ANDROID;VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON;_DEBUG</PreprocessorDefinitions>
+      <PreprocessorDefinitions>VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON;ANDROID;VULKAN;ANDROID_ARM_NEON;_DEBUG;USE_MEMORY_TRACKING;</PreprocessorDefinitions>
       <CppLanguageStandard>c++11</CppLanguageStandard>
       <EnableNeonCodegen>true</EnableNeonCodegen>
       <AdditionalOptions>-Wno-unused-variable -Wno-c++14-extensions %(AdditionalOptions)</AdditionalOptions>
@@ -177,10 +177,10 @@
       </Command>
     </PreBuildEvent>
     <PostBuildEvent>
-      <Command>$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y
-$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y
-$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y
-$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y</Command>
+      <Command>$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y 
+$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y
+$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y
+$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
@@ -189,7 +189,7 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shader
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <CompileAs>CompileAsCpp</CompileAs>
       <CppLanguageStandard>c++11</CppLanguageStandard>
-      <PreprocessorDefinitions>VULKAN;ANDROID;VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>VK_USE_PLATFORM_ANDROID_KHR;ANDROID_ARM_NEON;ANDROID;VULKAN;ANDROID_ARM_NEON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>-Wno-c++14-extensions %(AdditionalOptions)</AdditionalOptions>
       <EnableNeonCodegen>true</EnableNeonCodegen>
     </ClCompile>
@@ -204,9 +204,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shader
     </PreBuildEvent>
     <PostBuildEvent>
       <Command>$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y
-$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y
-$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y
-$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y</Command>
+$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y
+$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y
+$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -233,9 +233,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shader
     </Link>
     <PostBuildEvent>
       <Command>$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y
-$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y
-$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y
-$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y</Command>
+$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y
+$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y
+$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y</Command>
     </PostBuildEvent>
     <CustomBuildStep>
       <Command>
@@ -266,9 +266,9 @@ $(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shader
     </Link>
     <PostBuildEvent>
       <Command>$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\UnitTestResources\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\ /s /y
-$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y
-$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y
-$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\ /s /y</Command>
+$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\UI\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y
+$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\..\..\Middleware_3\Text\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y
+$(systemroot)\System32\xcopy $(ProjectDir)..\..\..\src\01_Transformations\Shaders\Vulkan\*.* $(SolutionDir)$(Platform)\$(Configuration)\$(RootNameSpace)\assets\Shaders\Vulkan\ /s /y</Command>
     </PostBuildEvent>
     <PreBuildEvent>
       <Command>

diff --git a/...Android_VisualStudio2017/01_Transformations/Transformations.Packaging/AndroidManifest.xml b/...Android_VisualStudio2017/01_Transformations/Transformations.Packaging/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.$(ApplicationName)"
+ package="com.forge.unittest.$(ApplicationName)"
  android:versionCode="1"
  android:versionName="1.0">