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

39
base/vulkanTextureLoader.hpp
View file

@ -8,6 +8,9 @@
#pragma once
#include <string>
#include <iostream>
#include <vulkan/vulkan.h>
#include <gli/gli.hpp>
@ -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<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
@ -205,8 +208,8 @@ namespace vkTools
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;
@ -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<uint32_t>(texCube.dimensions().x);
texture->height = static_cast<uint32_t>(texCube.dimensions().y);
texture->width = static_cast<uint32_t>(texCube.extent().x);
texture->height = static_cast<uint32_t>(texCube.extent().y);
texture->mipLevels = static_cast<uint32_t>(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<uint32_t>(texCube[face][level].dimensions().x);
bufferCopyRegion.imageExtent.height = static_cast<uint32_t>(texCube[face][level].dimensions().y);
bufferCopyRegion.imageExtent.width = static_cast<uint32_t>(texCube[face][level].extent().x);
bufferCopyRegion.imageExtent.height = static_cast<uint32_t>(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<uint32_t>(tex2DArray.dimensions().x);
texture->height = static_cast<uint32_t>(tex2DArray.dimensions().y);
texture->width = static_cast<uint32_t>(tex2DArray.extent().x);
texture->height = static_cast<uint32_t>(tex2DArray.extent().y);
texture->layerCount = static_cast<uint32_t>(tex2DArray.layers());
texture->mipLevels = static_cast<uint32_t>(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<uint32_t>(tex2DArray[layer][level].dimensions().x);
bufferCopyRegion.imageExtent.height = static_cast<uint32_t>(tex2DArray[layer][level].dimensions().y);
bufferCopyRegion.imageExtent.width = static_cast<uint32_t>(tex2DArray[layer][level].extent().x);
bufferCopyRegion.imageExtent.height = static_cast<uint32_t>(tex2DArray[layer][level].extent().y);
bufferCopyRegion.imageExtent.depth = 1;
bufferCopyRegion.bufferOffset = offset;