claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated to api changes for recent gli and glm versions

Browse source
This commit is contained in:
saschawillems 2017-01-21 21:31:26 +01:00
parent ed8e8410b3
commit 90b8c82f75
8 changed files with 53 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

12
texture/texture.cpp
View file

@ -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<uint32_t>(tex2D[0].dimensions().x);
texture.height = static_cast<uint32_t>(tex2D[0].dimensions().y);
texture.width = static_cast<uint32_t>(tex2D[0].extent().x);
texture.height = static_cast<uint32_t>(tex2D[0].extent().y);
texture.mipLevels = static_cast<uint32_t>(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<uint32_t>(tex2D[i].dimensions().x);
bufferCopyRegion.imageExtent.height = static_cast<uint32_t>(tex2D[i].dimensions().y);
bufferCopyRegion.imageExtent.width = static_cast<uint32_t>(tex2D[i].extent().x);
bufferCopyRegion.imageExtent.height = static_cast<uint32_t>(tex2D[i].extent().y);
bufferCopyRegion.imageExtent.depth = 1;
bufferCopyRegion.bufferOffset = offset;