Renamed Vulkan namespace as vk.
This commit is contained in:
@@ -30,10 +30,10 @@ function(add_shaders TARGET)
|
|||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
add_executable(vk_expe
|
add_executable(vk_expe
|
||||||
src/Vulkan/Context.cpp
|
src/vk/Context.cpp
|
||||||
src/Vulkan/Swapchain.cpp
|
src/vk/Swapchain.cpp
|
||||||
src/Vulkan/Memory.cpp
|
src/vk/Memory.cpp
|
||||||
src/Vulkan/Buffer.cpp
|
src/vk/Buffer.cpp
|
||||||
src/main.cpp
|
src/main.cpp
|
||||||
src/utils.cpp
|
src/utils.cpp
|
||||||
src/Simplex.cpp
|
src/Simplex.cpp
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ VulkanTutorial::~VulkanTutorial() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void VulkanTutorial::initialize(SDL_Window* window) {
|
void VulkanTutorial::initialize(SDL_Window* window) {
|
||||||
auto const context_settings = Vulkan::ContextSettings()
|
auto const context_settings = vk::ContextSettings()
|
||||||
#if defined(VKEXPE_ENABLE_VALIDATION) || !defined(NDEBUG)
|
#if defined(VKEXPE_ENABLE_VALIDATION) || !defined(NDEBUG)
|
||||||
.with_debug(true)
|
.with_debug(true)
|
||||||
#endif
|
#endif
|
||||||
@@ -167,7 +167,7 @@ void VulkanTutorial::initialize(SDL_Window* window) {
|
|||||||
create_vertex_buffer();
|
create_vertex_buffer();
|
||||||
create_index_buffer();
|
create_index_buffer();
|
||||||
|
|
||||||
auto const swapchain_settings = Vulkan::SwapchainSettings(&m_context)
|
auto const swapchain_settings = vk::SwapchainSettings(&m_context)
|
||||||
.with_queue(m_context.queue_family(GRAPHIC_QUEUE));
|
.with_queue(m_context.queue_family(GRAPHIC_QUEUE));
|
||||||
m_swapchain.initialize(swapchain_settings);
|
m_swapchain.initialize(swapchain_settings);
|
||||||
}
|
}
|
||||||
@@ -632,7 +632,7 @@ void VulkanTutorial::create_vertex_buffer() {
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
VkDeviceSize size = sizeof(vertices[0]) * vertices.size();
|
VkDeviceSize size = sizeof(vertices[0]) * vertices.size();
|
||||||
m_vertex_buffer = Vulkan::Buffer(
|
m_vertex_buffer = vk::Buffer(
|
||||||
m_context,
|
m_context,
|
||||||
size,
|
size,
|
||||||
VK_BUFFER_USAGE_VERTEX_BUFFER_BIT
|
VK_BUFFER_USAGE_VERTEX_BUFFER_BIT
|
||||||
@@ -647,7 +647,7 @@ void VulkanTutorial::create_index_buffer() {
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
VkDeviceSize size = sizeof(indices[0]) * indices.size();
|
VkDeviceSize size = sizeof(indices[0]) * indices.size();
|
||||||
m_index_buffer = Vulkan::Buffer(
|
m_index_buffer = vk::Buffer(
|
||||||
m_context,
|
m_context,
|
||||||
size,
|
size,
|
||||||
VK_BUFFER_USAGE_INDEX_BUFFER_BIT
|
VK_BUFFER_USAGE_INDEX_BUFFER_BIT
|
||||||
@@ -660,7 +660,7 @@ void VulkanTutorial::create_index_buffer() {
|
|||||||
void VulkanTutorial::create_uniform_buffer() {
|
void VulkanTutorial::create_uniform_buffer() {
|
||||||
m_uniform_buffers.resize(m_swapchain.image_count());
|
m_uniform_buffers.resize(m_swapchain.image_count());
|
||||||
for(size_t index = 0; index < m_uniform_buffers.size(); index += 1) {
|
for(size_t index = 0; index < m_uniform_buffers.size(); index += 1) {
|
||||||
m_uniform_buffers[index] = Vulkan::Buffer(
|
m_uniform_buffers[index] = vk::Buffer(
|
||||||
m_context,
|
m_context,
|
||||||
sizeof(Uniforms),
|
sizeof(Uniforms),
|
||||||
VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT
|
VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT
|
||||||
|
|||||||
@@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
#include <core.h>
|
#include <core.h>
|
||||||
|
|
||||||
#include <Vulkan/Context.h>
|
#include <vk/Context.h>
|
||||||
#include <Vulkan/Swapchain.h>
|
#include <vk/Swapchain.h>
|
||||||
#include <Vulkan/Buffer.h>
|
#include <vk/Buffer.h>
|
||||||
|
|
||||||
#include <SDL2/SDL.h>
|
#include <SDL2/SDL.h>
|
||||||
#include <vulkan/vulkan.h>
|
#include <vulkan/vulkan.h>
|
||||||
@@ -60,8 +60,8 @@ private:
|
|||||||
void create_command_buffers();
|
void create_command_buffers();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Vulkan::Context m_context;
|
vk::Context m_context;
|
||||||
Vulkan::Swapchain m_swapchain;
|
vk::Swapchain m_swapchain;
|
||||||
VkQueue m_graphic_queue = nullptr;
|
VkQueue m_graphic_queue = nullptr;
|
||||||
VkQueue m_presentation_queue = nullptr;
|
VkQueue m_presentation_queue = nullptr;
|
||||||
|
|
||||||
@@ -71,11 +71,11 @@ private:
|
|||||||
VkPipeline m_pipeline = VK_NULL_HANDLE;
|
VkPipeline m_pipeline = VK_NULL_HANDLE;
|
||||||
std::vector<VkFramebuffer> m_framebuffers;
|
std::vector<VkFramebuffer> m_framebuffers;
|
||||||
VkCommandPool m_command_pool = VK_NULL_HANDLE;
|
VkCommandPool m_command_pool = VK_NULL_HANDLE;
|
||||||
Vulkan::Buffer m_vertex_buffer;
|
vk::Buffer m_vertex_buffer;
|
||||||
Vulkan::Buffer m_index_buffer;
|
vk::Buffer m_index_buffer;
|
||||||
std::vector<Vulkan::Buffer> m_uniform_buffers;
|
std::vector<vk::Buffer> m_uniform_buffers;
|
||||||
std::vector<VkDeviceSize> m_uniform_buffer_offsets;
|
std::vector<VkDeviceSize> m_uniform_buffer_offsets;
|
||||||
Vulkan::MemoryBlock m_uniform_buffer_memory;
|
vk::MemoryBlock m_uniform_buffer_memory;
|
||||||
VkDescriptorPool m_descriptor_pool = VK_NULL_HANDLE;
|
VkDescriptorPool m_descriptor_pool = VK_NULL_HANDLE;
|
||||||
std::vector<VkDescriptorSet> m_descriptor_sets;
|
std::vector<VkDescriptorSet> m_descriptor_sets;
|
||||||
std::vector<VkCommandBuffer> m_command_buffers;
|
std::vector<VkCommandBuffer> m_command_buffers;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
#include <Vulkan/Buffer.h>
|
#include <vk/Buffer.h>
|
||||||
#include <Vulkan/Context.h>
|
#include <vk/Context.h>
|
||||||
#include <Logger.h>
|
#include <Logger.h>
|
||||||
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
||||||
|
|
||||||
namespace Vulkan {
|
namespace vk {
|
||||||
|
|
||||||
|
|
||||||
Buffer::Buffer() noexcept {
|
Buffer::Buffer() noexcept {
|
||||||
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
#include <utils.h>
|
#include <utils.h>
|
||||||
|
|
||||||
#include <Vulkan/forward.h>
|
#include <vk/forward.h>
|
||||||
#include <Vulkan/Memory.h>
|
#include <vk/Memory.h>
|
||||||
|
|
||||||
#include <vulkan/vulkan.h>
|
#include <vulkan/vulkan.h>
|
||||||
|
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
|
||||||
namespace Vulkan {
|
namespace vk {
|
||||||
|
|
||||||
|
|
||||||
class Buffer {
|
class Buffer {
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
#include <Vulkan/Context.h>
|
#include <vk/Context.h>
|
||||||
#include <Vulkan/Memory.h>
|
#include <vk/Memory.h>
|
||||||
|
|
||||||
#include <utils.h>
|
#include <utils.h>
|
||||||
#include <Logger.h>
|
#include <Logger.h>
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
#include <tuple>
|
#include <tuple>
|
||||||
|
|
||||||
|
|
||||||
namespace Vulkan {
|
namespace vk {
|
||||||
|
|
||||||
|
|
||||||
ContextSettings::ContextSettings() {
|
ContextSettings::ContextSettings() {
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#include <utils.h>
|
#include <utils.h>
|
||||||
#include <Logger.h>
|
#include <Logger.h>
|
||||||
#include <Vulkan/forward.h>
|
#include <vk/forward.h>
|
||||||
|
|
||||||
#include <SDL2/SDL.h>
|
#include <SDL2/SDL.h>
|
||||||
#include <vulkan/vulkan.h>
|
#include <vulkan/vulkan.h>
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
#include <functional>
|
#include <functional>
|
||||||
|
|
||||||
|
|
||||||
namespace Vulkan {
|
namespace vk {
|
||||||
|
|
||||||
|
|
||||||
class Context;
|
class Context;
|
||||||
@@ -1,12 +1,12 @@
|
|||||||
#include <Vulkan/Memory.h>
|
#include <vk/Memory.h>
|
||||||
#include <Vulkan/Context.h>
|
#include <vk/Context.h>
|
||||||
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
||||||
|
|
||||||
namespace Vulkan {
|
namespace vk {
|
||||||
|
|
||||||
|
|
||||||
MemoryBlock::MemoryBlock() noexcept {
|
MemoryBlock::MemoryBlock() noexcept {
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <Vulkan/forward.h>
|
#include <vk/forward.h>
|
||||||
|
|
||||||
#include <vulkan/vulkan.h>
|
#include <vulkan/vulkan.h>
|
||||||
|
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
|
||||||
namespace Vulkan {
|
namespace vk {
|
||||||
|
|
||||||
|
|
||||||
class MemoryBlock {
|
class MemoryBlock {
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
#include <Vulkan/Swapchain.h>
|
#include <vk/Swapchain.h>
|
||||||
|
|
||||||
#include <Logger.h>
|
#include <Logger.h>
|
||||||
|
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
#include <tuple>
|
#include <tuple>
|
||||||
|
|
||||||
|
|
||||||
namespace Vulkan {
|
namespace vk {
|
||||||
|
|
||||||
|
|
||||||
SwapchainSettings::SwapchainSettings(Context* context)
|
SwapchainSettings::SwapchainSettings(Context* context)
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <Vulkan/Context.h>
|
#include <vk/Context.h>
|
||||||
#include <utils.h>
|
#include <utils.h>
|
||||||
|
|
||||||
#include <SDL2/SDL.h>
|
#include <SDL2/SDL.h>
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
#include <functional>
|
#include <functional>
|
||||||
|
|
||||||
|
|
||||||
namespace Vulkan {
|
namespace vk {
|
||||||
|
|
||||||
|
|
||||||
class Swapchain;
|
class Swapchain;
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
|
|
||||||
namespace Vulkan {
|
namespace vk {
|
||||||
|
|
||||||
|
|
||||||
class MemoryPage;
|
class MemoryPage;
|
||||||
Reference in New Issue
Block a user