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

Moved VulkanDevice to vks namespce (Refs #260)

Browse source
This commit is contained in:
saschawillems 2017-02-12 10:16:07 +01:00
parent 27e8c258dc
commit 70f4daff5d
18 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

12
base/VulkanTexture.hpp
View file

@ -18,7 +18,7 @@
#include <gli/gli.hpp>
#include "vulkantools.h"
#include "vulkandevice.hpp"
#include "VulkanDevice.hpp"
#include "vulkanbuffer.hpp"
#if defined(__ANDROID__)
@ -30,7 +30,7 @@ namespace vks
/** @brief Vulkan texture base class */
class Texture {
public:
vk::VulkanDevice *device;
vks::VulkanDevice *device;
VkImage image;
VkImageLayout imageLayout;
VkDeviceMemory deviceMemory;
@ -82,7 +82,7 @@ namespace vks
void loadFromFile(
std::string filename,
VkFormat format,
vk::VulkanDevice *device,
vks::VulkanDevice *device,
VkQueue copyQueue,
VkImageUsageFlags imageUsageFlags = VK_IMAGE_USAGE_SAMPLED_BIT,
VkImageLayout imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
@ -385,7 +385,7 @@ namespace vks
VkFormat format,
uint32_t width,
uint32_t height,
vk::VulkanDevice *device,
vks::VulkanDevice *device,
VkQueue copyQueue,
VkFilter filter = VK_FILTER_LINEAR,
VkImageUsageFlags imageUsageFlags = VK_IMAGE_USAGE_SAMPLED_BIT,
@ -561,7 +561,7 @@ namespace vks
void loadFromFile(
std::string filename,
VkFormat format,
vk::VulkanDevice *device,
vks::VulkanDevice *device,
VkQueue copyQueue,
VkImageUsageFlags imageUsageFlags = VK_IMAGE_USAGE_SAMPLED_BIT,
VkImageLayout imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL)
@ -770,7 +770,7 @@ namespace vks
void loadFromFile(
std::string filename,
VkFormat format,
vk::VulkanDevice *device,
vks::VulkanDevice *device,
VkQueue copyQueue,
VkImageUsageFlags imageUsageFlags = VK_IMAGE_USAGE_SAMPLED_BIT,
VkImageLayout imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL)