diff --git a/base/vulkanTextureLoader.hpp b/base/vulkanTextureLoader.hpp index 2f05ebe4..545cca6c 100644 --- a/base/vulkanTextureLoader.hpp +++ b/base/vulkanTextureLoader.hpp @@ -8,6 +8,9 @@ #pragma once +#include +#include + #include #include @@ -133,17 +136,17 @@ namespace vkTools AAsset_read(asset, textureData, size); AAsset_close(asset); - gli::texture2D tex2D(gli::load((const char*)textureData, size)); + gli::texture2d tex2D(gli::load((const char*)textureData, size)); free(textureData); #else - gli::texture2D tex2D(gli::load(filename.c_str())); + gli::texture2d tex2D(gli::load(filename.c_str())); #endif assert(!tex2D.empty()); texture->device = vulkanDevice->logicalDevice; - texture->width = static_cast(tex2D[0].dimensions().x); - texture->height = static_cast(tex2D[0].dimensions().y); + texture->width = static_cast(tex2D[0].extent().x); + texture->height = static_cast(tex2D[0].extent().y); texture->mipLevels = static_cast(tex2D.levels()); // Get device properites for the requested texture format @@ -205,8 +208,8 @@ namespace vkTools bufferCopyRegion.imageSubresource.mipLevel = i; bufferCopyRegion.imageSubresource.baseArrayLayer = 0; bufferCopyRegion.imageSubresource.layerCount = 1; - bufferCopyRegion.imageExtent.width = static_cast(tex2D[i].dimensions().x); - bufferCopyRegion.imageExtent.height = static_cast(tex2D[i].dimensions().y); + bufferCopyRegion.imageExtent.width = static_cast(tex2D[i].extent().x); + bufferCopyRegion.imageExtent.height = static_cast(tex2D[i].extent().y); bufferCopyRegion.imageExtent.depth = 1; bufferCopyRegion.bufferOffset = offset; @@ -462,17 +465,17 @@ namespace vkTools AAsset_read(asset, textureData, size); AAsset_close(asset); - gli::textureCube texCube(gli::load((const char*)textureData, size)); + gli::texture_cube texCube(gli::load((const char*)textureData, size)); free(textureData); #else - gli::textureCube texCube(gli::load(filename)); + gli::texture_cube texCube(gli::load(filename)); #endif assert(!texCube.empty()); texture->device = vulkanDevice->logicalDevice; - texture->width = static_cast(texCube.dimensions().x); - texture->height = static_cast(texCube.dimensions().y); + texture->width = static_cast(texCube.extent().x); + texture->height = static_cast(texCube.extent().y); texture->mipLevels = static_cast(texCube.levels()); VkMemoryAllocateInfo memAllocInfo = vkTools::initializers::memoryAllocateInfo(); @@ -519,8 +522,8 @@ namespace vkTools bufferCopyRegion.imageSubresource.mipLevel = level; bufferCopyRegion.imageSubresource.baseArrayLayer = face; bufferCopyRegion.imageSubresource.layerCount = 1; - bufferCopyRegion.imageExtent.width = static_cast(texCube[face][level].dimensions().x); - bufferCopyRegion.imageExtent.height = static_cast(texCube[face][level].dimensions().y); + bufferCopyRegion.imageExtent.width = static_cast(texCube[face][level].extent().x); + bufferCopyRegion.imageExtent.height = static_cast(texCube[face][level].extent().y); bufferCopyRegion.imageExtent.depth = 1; bufferCopyRegion.bufferOffset = offset; @@ -683,18 +686,18 @@ namespace vkTools AAsset_read(asset, textureData, size); AAsset_close(asset); - gli::texture2DArray tex2DArray(gli::load((const char*)textureData, size)); + gli::texture2d_array tex2DArray(gli::load((const char*)textureData, size)); free(textureData); #else - gli::texture2DArray tex2DArray(gli::load(filename)); + gli::texture2d_array tex2DArray(gli::load(filename)); #endif assert(!tex2DArray.empty()); texture->device = vulkanDevice->logicalDevice; - texture->width = static_cast(tex2DArray.dimensions().x); - texture->height = static_cast(tex2DArray.dimensions().y); + texture->width = static_cast(tex2DArray.extent().x); + texture->height = static_cast(tex2DArray.extent().y); texture->layerCount = static_cast(tex2DArray.layers()); texture->mipLevels = static_cast(tex2DArray.levels()); @@ -742,8 +745,8 @@ namespace vkTools bufferCopyRegion.imageSubresource.mipLevel = level; bufferCopyRegion.imageSubresource.baseArrayLayer = layer; bufferCopyRegion.imageSubresource.layerCount = 1; - bufferCopyRegion.imageExtent.width = static_cast(tex2DArray[layer][level].dimensions().x); - bufferCopyRegion.imageExtent.height = static_cast(tex2DArray[layer][level].dimensions().y); + bufferCopyRegion.imageExtent.width = static_cast(tex2DArray[layer][level].extent().x); + bufferCopyRegion.imageExtent.height = static_cast(tex2DArray[layer][level].extent().y); bufferCopyRegion.imageExtent.depth = 1; bufferCopyRegion.bufferOffset = offset; diff --git a/base/vulkanheightmap.hpp b/base/vulkanheightmap.hpp index 50b31e25..19a6fb46 100644 --- a/base/vulkanheightmap.hpp +++ b/base/vulkanheightmap.hpp @@ -83,12 +83,12 @@ namespace vkTools void *textureData = malloc(size); AAsset_read(asset, textureData, size); AAsset_close(asset); - gli::texture2D heightTex(gli::load((const char*)textureData, size)); + gli::texture2d heightTex(gli::load((const char*)textureData, size)); free(textureData); #else - gli::texture2D heightTex(gli::load(filename)); + gli::texture2d heightTex(gli::load(filename)); #endif - dim = static_cast(heightTex.dimensions().x); + dim = static_cast(heightTex.extent().x); heightdata = new uint16_t[dim * dim]; memcpy(heightdata, heightTex.data(), heightTex.size()); this->scale = dim / patchsize; diff --git a/deferredshadows/deferredshadows.cpp b/deferredshadows/deferredshadows.cpp index a0805620..1ba93f07 100644 --- a/deferredshadows/deferredshadows.cpp +++ b/deferredshadows/deferredshadows.cpp @@ -17,7 +17,6 @@ #define GLM_FORCE_DEPTH_ZERO_TO_ONE #include #include -#include #include #include "vulkanexamplebase.h" diff --git a/terraintessellation/terraintessellation.cpp b/terraintessellation/terraintessellation.cpp index 79e8ad8a..6500eadd 100644 --- a/terraintessellation/terraintessellation.cpp +++ b/terraintessellation/terraintessellation.cpp @@ -355,12 +355,12 @@ public: void *textureData = malloc(size); AAsset_read(asset, textureData, size); AAsset_close(asset); - gli::texture2D heightTex(gli::load((const char*)textureData, size)); + gli::texture2d heightTex(gli::load((const char*)textureData, size)); free(textureData); #else - gli::texture2D heightTex(gli::load(filename)); + gli::texture2d heightTex(gli::load(filename)); #endif - dim = static_cast(heightTex.dimensions().x); + dim = static_cast(heightTex.extent().x); heightdata = new uint16_t[dim * dim]; memcpy(heightdata, heightTex.data(), heightTex.size()); this->scale = dim / patchsize; diff --git a/texture/texture.cpp b/texture/texture.cpp index acd6b7fd..45d2c444 100644 --- a/texture/texture.cpp +++ b/texture/texture.cpp @@ -183,17 +183,17 @@ public: AAsset_read(asset, textureData, size); AAsset_close(asset); - gli::texture2D tex2D(gli::load((const char*)textureData, size)); + gli::texture2d tex2D(gli::load((const char*)textureData, size)); #else - gli::texture2D tex2D(gli::load(fileName)); + gli::texture2d tex2D(gli::load(fileName)); #endif assert(!tex2D.empty()); VkFormatProperties formatProperties; - texture.width = static_cast(tex2D[0].dimensions().x); - texture.height = static_cast(tex2D[0].dimensions().y); + texture.width = static_cast(tex2D[0].extent().x); + texture.height = static_cast(tex2D[0].extent().y); texture.mipLevels = static_cast(tex2D.levels()); // Get device properites for the requested texture format @@ -257,8 +257,8 @@ public: bufferCopyRegion.imageSubresource.mipLevel = i; bufferCopyRegion.imageSubresource.baseArrayLayer = 0; bufferCopyRegion.imageSubresource.layerCount = 1; - bufferCopyRegion.imageExtent.width = static_cast(tex2D[i].dimensions().x); - bufferCopyRegion.imageExtent.height = static_cast(tex2D[i].dimensions().y); + bufferCopyRegion.imageExtent.width = static_cast(tex2D[i].extent().x); + bufferCopyRegion.imageExtent.height = static_cast(tex2D[i].extent().y); bufferCopyRegion.imageExtent.depth = 1; bufferCopyRegion.bufferOffset = offset; diff --git a/texturearray/texturearray.cpp b/texturearray/texturearray.cpp index 823f6d7a..a9e13f05 100644 --- a/texturearray/texturearray.cpp +++ b/texturearray/texturearray.cpp @@ -122,15 +122,15 @@ public: AAsset_read(asset, textureData, size); AAsset_close(asset); - gli::texture2DArray tex2DArray(gli::load((const char*)textureData, size)); + gli::texture2d_array tex2DArray(gli::load((const char*)textureData, size)); #else - gli::texture2DArray tex2DArray(gli::load(filename)); + gli::texture2d_array tex2DArray(gli::load(filename)); #endif assert(!tex2DArray.empty()); - textureArray.width = tex2DArray.dimensions().x; - textureArray.height = tex2DArray.dimensions().y; + textureArray.width = tex2DArray.extent().x; + textureArray.height = tex2DArray.extent().y; layerCount = tex2DArray.layers(); VkMemoryAllocateInfo memAllocInfo = vkTools::initializers::memoryAllocateInfo(); @@ -168,11 +168,11 @@ public: std::vector bufferCopyRegions; uint32_t offset = 0; - // Check if all array layers have the same dimesions + // Check if all array layers have the same dimensions bool sameDims = true; for (uint32_t layer = 0; layer < layerCount; layer++) { - if (tex2DArray[layer].dimensions().x != textureArray.width || tex2DArray[layer].dimensions().y != textureArray.height) + if (tex2DArray[layer].extent().x != textureArray.width || tex2DArray[layer].extent().y != textureArray.height) { sameDims = false; break; @@ -187,8 +187,8 @@ public: bufferCopyRegion.imageSubresource.mipLevel = 0; bufferCopyRegion.imageSubresource.baseArrayLayer = 0; bufferCopyRegion.imageSubresource.layerCount = layerCount; - bufferCopyRegion.imageExtent.width = tex2DArray[0].dimensions().x; - bufferCopyRegion.imageExtent.height = tex2DArray[0].dimensions().y; + bufferCopyRegion.imageExtent.width = tex2DArray[0].extent().x; + bufferCopyRegion.imageExtent.height = tex2DArray[0].extent().y; bufferCopyRegion.imageExtent.depth = 1; bufferCopyRegion.bufferOffset = offset; @@ -204,8 +204,8 @@ public: bufferCopyRegion.imageSubresource.mipLevel = 0; bufferCopyRegion.imageSubresource.baseArrayLayer = layer; bufferCopyRegion.imageSubresource.layerCount = 1; - bufferCopyRegion.imageExtent.width = tex2DArray[layer].dimensions().x; - bufferCopyRegion.imageExtent.height = tex2DArray[layer].dimensions().y; + bufferCopyRegion.imageExtent.width = tex2DArray[layer].extent().x; + bufferCopyRegion.imageExtent.height = tex2DArray[layer].extent().y; bufferCopyRegion.imageExtent.depth = 1; bufferCopyRegion.bufferOffset = offset; diff --git a/texturecubemap/texturecubemap.cpp b/texturecubemap/texturecubemap.cpp index 264df3d9..4388b403 100644 --- a/texturecubemap/texturecubemap.cpp +++ b/texturecubemap/texturecubemap.cpp @@ -127,15 +127,15 @@ public: AAsset_read(asset, textureData, size); AAsset_close(asset); - gli::textureCube texCube(gli::load((const char*)textureData, size)); + gli::texture_cube texCube(gli::load((const char*)textureData, size)); #else - gli::textureCube texCube(gli::load(filename)); + gli::texture_cube texCube(gli::load(filename)); #endif assert(!texCube.empty()); - cubeMap.width = texCube.dimensions().x; - cubeMap.height = texCube.dimensions().y; + cubeMap.width = texCube.extent().x; + cubeMap.height = texCube.extent().y; cubeMap.mipLevels = texCube.levels(); VkMemoryAllocateInfo memAllocInfo = vkTools::initializers::memoryAllocateInfo(); @@ -209,8 +209,8 @@ public: bufferCopyRegion.imageSubresource.mipLevel = level; bufferCopyRegion.imageSubresource.baseArrayLayer = face; bufferCopyRegion.imageSubresource.layerCount = 1; - bufferCopyRegion.imageExtent.width = texCube[face][level].dimensions().x; - bufferCopyRegion.imageExtent.height = texCube[face][level].dimensions().y; + bufferCopyRegion.imageExtent.width = texCube[face][level].extent().x; + bufferCopyRegion.imageExtent.height = texCube[face][level].extent().y; bufferCopyRegion.imageExtent.depth = 1; bufferCopyRegion.bufferOffset = offset; diff --git a/texturemipmapgen/texturemipmapgen.cpp b/texturemipmapgen/texturemipmapgen.cpp index ab4e0088..10330d8a 100644 --- a/texturemipmapgen/texturemipmapgen.cpp +++ b/texturemipmapgen/texturemipmapgen.cpp @@ -121,17 +121,17 @@ public: AAsset_read(asset, textureData, size); AAsset_close(asset); - gli::texture2D tex2D(gli::load((const char*)textureData, size)); + gli::texture2d tex2D(gli::load((const char*)textureData, size)); #else - gli::texture2D tex2D(gli::load(fileName)); + gli::texture2d tex2D(gli::load(fileName)); #endif assert(!tex2D.empty()); VkFormatProperties formatProperties; - texture.width = static_cast(tex2D[0].dimensions().x); - texture.height = static_cast(tex2D[0].dimensions().y); + texture.width = static_cast(tex2D[0].extent().x); + texture.height = static_cast(tex2D[0].extent().y); // calculate num of mip maps // numLevels = 1 + floor(log2(max(w, h, d)))