From 9084d284070f638c106d544bc5a143b44076b745 Mon Sep 17 00:00:00 2001 From: saschawillems Date: Fri, 17 Mar 2017 18:49:29 +0100 Subject: [PATCH] Added ETC2 and ASTC texture variants (Refs #174) --- parallaxmapping/parallaxmapping.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/parallaxmapping/parallaxmapping.cpp b/parallaxmapping/parallaxmapping.cpp index 1ab89852..4fbc22c2 100644 --- a/parallaxmapping/parallaxmapping.cpp +++ b/parallaxmapping/parallaxmapping.cpp @@ -127,8 +127,21 @@ public: void loadAssets() { models.quad.loadFromFile(getAssetPath() + "models/plane_z.obj", vertexLayout, 0.1f, vulkanDevice, queue); - textures.colorMap.loadFromFile(getAssetPath() + "textures/rocks_color_bc3.dds", VK_FORMAT_BC3_UNORM_BLOCK, vulkanDevice, queue); + // Textures textures.normalHeightMap.loadFromFile(getAssetPath() + "textures/rocks_normal_height_rgba.dds", VK_FORMAT_R8G8B8A8_UNORM, vulkanDevice, queue); + if (vulkanDevice->features.textureCompressionBC) { + textures.colorMap.loadFromFile(getAssetPath() + "textures/rocks_color_bc3_unorm.dds", VK_FORMAT_BC3_UNORM_BLOCK, vulkanDevice, queue); + } + else if (vulkanDevice->features.textureCompressionASTC_LDR) { + textures.colorMap.loadFromFile(getAssetPath() + "textures/rocks_color_astc_8x8_unorm.ktx", VK_FORMAT_ASTC_8x8_UNORM_BLOCK, vulkanDevice, queue); + } + else if (vulkanDevice->features.textureCompressionETC2) { + textures.colorMap.loadFromFile(getAssetPath() + "textures/rocks_color_etc2_unorm.ktx", VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK, vulkanDevice, queue); + } + else { + vks::tools::exitFatal("Device does not support any compressed texture format!", "Error"); + } + } void reBuildCommandBuffers()