diff options
Diffstat (limited to 'src/VulkanTexture.hpp')
| -rw-r--r-- | src/VulkanTexture.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/VulkanTexture.hpp b/src/VulkanTexture.hpp index 6b2bef8..44eea90 100644 --- a/src/VulkanTexture.hpp +++ b/src/VulkanTexture.hpp @@ -26,14 +26,16 @@ #include <android/asset_manager.h> #endif -namespace vks +#include "VulkanBuffer.hpp" + +namespace vke { class Texture2D : public Texture { public: void loadFromFile( std::string filename, VkFormat format, - vks::VulkanDevice *_device, + vke::device_t *_device, VkQueue copyQueue, VkImageUsageFlags imageUsageFlags = VK_IMAGE_USAGE_SAMPLED_BIT, VkImageLayout imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) @@ -79,7 +81,7 @@ namespace vks public: void buildFromImages(const std::vector<std::string>& mapDic, uint32_t textureSize, VkFormat _format, - vks::VulkanDevice *_device, + vke::device_t *_device, VkQueue copyQueue, VkImageUsageFlags _imageUsageFlags = VK_IMAGE_USAGE_SAMPLED_BIT, VkImageLayout _imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL){ @@ -173,7 +175,7 @@ namespace vks void loadFromFile( std::string filename, VkFormat format, - vks::VulkanDevice *_device, + vke::device_t *_device, VkImageUsageFlags imageUsageFlags = VK_IMAGE_USAGE_SAMPLED_BIT, VkImageLayout _imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) { @@ -207,8 +209,7 @@ namespace vks imageLayout = _imageLayout; - vks::Buffer stagingBuffer; - stagingBuffer.create (device, + vke::buffer_t stagingBuffer (device, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, texCube.size(), texCube.data()); @@ -251,7 +252,6 @@ namespace vks VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); device->flushCommandBuffer(copyCmd, device->queue, true); - stagingBuffer.destroy(); createView(VK_IMAGE_VIEW_TYPE_CUBE, VK_IMAGE_ASPECT_COLOR_BIT,infos.mipLevels,6); createSampler(VK_FILTER_LINEAR,VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE,VK_SAMPLER_MIPMAP_MODE_LINEAR); |