diff --git a/android/deferred/AndroidManifest.xml b/android/deferred/AndroidManifest.xml
index 9869a706..d40f2a3d 100644
--- a/android/deferred/AndroidManifest.xml
+++ b/android/deferred/AndroidManifest.xml
@@ -15,6 +15,7 @@
android:label="Deferred"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:launchMode="singleTask"
+ android:screenOrientation="landscape"
android:configChanges="orientation|screenSize|keyboardHidden">
diff --git a/android/deferred/build.bat b/android/deferred/build.bat
deleted file mode 100644
index 92e0466d..00000000
--- a/android/deferred/build.bat
+++ /dev/null
@@ -1,30 +0,0 @@
-cd jni
-call ndk-build
-if %ERRORLEVEL% EQU 0 (
- echo ndk-build has failed, build cancelled
- cd..
-
- mkdir "assets\shaders\base"
- xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
-
- mkdir "assets\shaders\deferred"
- xcopy "..\..\data\shaders\deferred\*.spv" "assets\shaders\deferred" /Y
-
- mkdir "assets\models\armor"
- xcopy "..\..\data\models\armor\*.*" "assets\models\armor" /Y
-
- mkdir "assets\textures"
- xcopy "..\..\data\textures\pattern_35_bc3.ktx" "assets\textures" /Y
- xcopy "..\..\data\textures\pattern_35_normalmap_bc3.ktx" "assets\textures" /Y
-
- mkdir "assets\models"
- xcopy "..\..\data\models\plane.obj" "assets\models" /Y
-
- mkdir "res\drawable"
- xcopy "..\..\android\images\icon.png" "res\drawable" /Y
-
- call ant debug -Dout.final.file=vulkanDeferred.apk
-) ELSE (
- echo error : ndk-build failed with errors!
- cd..
-)
diff --git a/android/deferred/build.py b/android/deferred/build.py
new file mode 100644
index 00000000..2316379e
--- /dev/null
+++ b/android/deferred/build.py
@@ -0,0 +1,58 @@
+import os
+import shutil
+import subprocess
+import sys
+import glob
+
+APK_NAME = "vulkanDeferred"
+SHADER_DIR = "deferred"
+ASSETS_MODELS = ["plane.obj"]
+ASSETS_TEXTURES = ["stonefloor01_color_astc_8x8_unorm.ktx", "stonefloor01_color_bc3_unorm.ktx", "stonefloor01_normal_astc_8x8_unorm.ktx", "stonefloor01_normal_bc3_unorm.ktx"]
+
+if subprocess.call("ndk-build", shell=True) == 0:
+ print("Build successful")
+
+ # Assets
+ if not os.path.exists("./assets"):
+ os.makedirs("./assets")
+
+ # Shaders
+ # Base
+ if not os.path.exists("./assets/shaders/base"):
+ os.makedirs("./assets/shaders/base")
+ for file in glob.glob("../../data/shaders/base/*.spv"):
+ shutil.copy(file, "./assets/shaders/base")
+ # Sample
+ if not os.path.exists("./assets/shaders/%s" % SHADER_DIR):
+ os.makedirs("./assets/shaders/%s" % SHADER_DIR)
+ for file in glob.glob("../../data/shaders/%s/*.spv" %SHADER_DIR):
+ shutil.copy(file, "./assets/shaders/%s" % SHADER_DIR)
+ # Textures and model
+ if not os.path.exists("./assets/models/armor/"):
+ os.makedirs("./assets/models/armor/")
+ for file in glob.glob("../../data/models/armor/*.*"):
+ shutil.copy(file, "./assets/models/armor")
+ # Textures from base
+ if not os.path.exists("./assets/textures"):
+ os.makedirs("./assets/textures")
+ for file in ASSETS_TEXTURES:
+ shutil.copy("../../data/textures/%s" % file, "./assets/textures")
+ if not os.path.exists("./assets/models"):
+ os.makedirs("./assets/models")
+ for file in ASSETS_MODELS:
+ shutil.copy("../../data/models/%s" % file, "./assets/models")
+
+ # Icon
+ if not os.path.exists("./res/drawable"):
+ os.makedirs("./res/drawable")
+ shutil.copy("../../android/images/icon.png", "./res/drawable")
+
+ if subprocess.call("ant debug -Dout.final.file=%s.apk" % APK_NAME, shell=True) == 0:
+ if len(sys.argv) > 1:
+ if sys.argv[1] == "-deploy":
+ if subprocess.call("adb install -r %s.apk" % APK_NAME, shell=True) != 0:
+ print("Could not deploy to device!")
+ else:
+ print("Error during build process!")
+else:
+ print("Error building project!")
diff --git a/data/models/armor/color_astc_8x8_unorm.ktx b/data/models/armor/color_astc_8x8_unorm.ktx
new file mode 100644
index 00000000..fc6151ce
Binary files /dev/null and b/data/models/armor/color_astc_8x8_unorm.ktx differ
diff --git a/data/models/armor/colormap.ktx b/data/models/armor/color_bc3_unorm.ktx
similarity index 100%
rename from data/models/armor/colormap.ktx
rename to data/models/armor/color_bc3_unorm.ktx
diff --git a/data/models/armor/color_etc2_unorm.ktx b/data/models/armor/color_etc2_unorm.ktx
new file mode 100644
index 00000000..d04ae99a
Binary files /dev/null and b/data/models/armor/color_etc2_unorm.ktx differ
diff --git a/data/models/armor/normal_astc_8x8_unorm.ktx b/data/models/armor/normal_astc_8x8_unorm.ktx
new file mode 100644
index 00000000..03549b0a
Binary files /dev/null and b/data/models/armor/normal_astc_8x8_unorm.ktx differ
diff --git a/data/models/armor/normalmap.ktx b/data/models/armor/normal_bc3_unorm.ktx
similarity index 100%
rename from data/models/armor/normalmap.ktx
rename to data/models/armor/normal_bc3_unorm.ktx
diff --git a/data/models/armor/normal_etc2_unorm.ktx b/data/models/armor/normal_etc2_unorm.ktx
new file mode 100644
index 00000000..d6aad188
Binary files /dev/null and b/data/models/armor/normal_etc2_unorm.ktx differ
diff --git a/data/textures/stonefloor01_color_astc_8x8_unorm.ktx b/data/textures/stonefloor01_color_astc_8x8_unorm.ktx
new file mode 100644
index 00000000..03e2e267
Binary files /dev/null and b/data/textures/stonefloor01_color_astc_8x8_unorm.ktx differ
diff --git a/data/textures/pattern_35_bc3.ktx b/data/textures/stonefloor01_color_bc3_unorm.ktx
similarity index 100%
rename from data/textures/pattern_35_bc3.ktx
rename to data/textures/stonefloor01_color_bc3_unorm.ktx
diff --git a/data/textures/stonefloor01_normal_astc_8x8_unorm.ktx b/data/textures/stonefloor01_normal_astc_8x8_unorm.ktx
new file mode 100644
index 00000000..2abf16cb
Binary files /dev/null and b/data/textures/stonefloor01_normal_astc_8x8_unorm.ktx differ
diff --git a/data/textures/pattern_35_normalmap_bc3.ktx b/data/textures/stonefloor01_normal_bc3_unorm.ktx
similarity index 100%
rename from data/textures/pattern_35_normalmap_bc3.ktx
rename to data/textures/stonefloor01_normal_bc3_unorm.ktx
diff --git a/deferred/deferred.cpp b/deferred/deferred.cpp
index 01ab9523..3e00e2ff 100644
--- a/deferred/deferred.cpp
+++ b/deferred/deferred.cpp
@@ -484,11 +484,30 @@ public:
modelCreateInfo.center = glm::vec3(0.0f, 2.35f, 0.0f);
models.floor.loadFromFile(getAssetPath() + "models/plane.obj", vertexLayout, &modelCreateInfo, vulkanDevice, queue);
- textures.model.colorMap.loadFromFile(getAssetPath() + "models/armor/colormap.ktx", VK_FORMAT_BC3_UNORM_BLOCK, vulkanDevice, queue);
- textures.model.normalMap.loadFromFile(getAssetPath() + "models/armor/normalmap.ktx", VK_FORMAT_BC3_UNORM_BLOCK, vulkanDevice, queue);
+ // Textures
+ std::string texFormatSuffix;
+ VkFormat texFormat;
+ // Get supported compressed texture format
+ if (vulkanDevice->features.textureCompressionBC) {
+ texFormatSuffix = "_bc3_unorm";
+ texFormat = VK_FORMAT_BC3_UNORM_BLOCK;
+ }
+ else if (vulkanDevice->features.textureCompressionASTC_LDR) {
+ texFormatSuffix = "_astc_8x8_unorm";
+ texFormat = VK_FORMAT_ASTC_8x8_UNORM_BLOCK;
+ }
+ else if (vulkanDevice->features.textureCompressionETC2) {
+ texFormatSuffix = "_etc2_unorm";
+ texFormat = VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK;
+ }
+ else {
+ vks::tools::exitFatal("Device does not support any compressed texture format!", "Error");
+ }
- textures.floor.colorMap.loadFromFile(getAssetPath() + "textures/pattern_35_bc3.ktx", VK_FORMAT_BC3_UNORM_BLOCK, vulkanDevice, queue);
- textures.floor.normalMap.loadFromFile(getAssetPath() + "textures/pattern_35_normalmap_bc3.ktx", VK_FORMAT_BC3_UNORM_BLOCK, vulkanDevice, queue);
+ textures.model.colorMap.loadFromFile(getAssetPath() + "models/armor/color" + texFormatSuffix + ".ktx", texFormat, vulkanDevice, queue);
+ textures.model.normalMap.loadFromFile(getAssetPath() + "models/armor/normal" + texFormatSuffix + ".ktx", texFormat, vulkanDevice, queue);
+ textures.floor.colorMap.loadFromFile(getAssetPath() + "textures/stonefloor01_color" + texFormatSuffix + ".ktx", texFormat, vulkanDevice, queue);
+ textures.floor.normalMap.loadFromFile(getAssetPath() + "textures/stonefloor01_normal" + texFormatSuffix + ".ktx", texFormat, vulkanDevice, queue);
}
void reBuildCommandBuffers()