add simple render system
This commit is contained in:
parent
1f3b73f5ce
commit
b9c5ec712d
BIN
VulkanTest
BIN
VulkanTest
Binary file not shown.
|
@ -1,4 +1,5 @@
|
||||||
#include "first_app.hpp"
|
#include "first_app.hpp"
|
||||||
|
#include "simple_render_system.hpp"
|
||||||
|
|
||||||
// libs
|
// libs
|
||||||
#define GLM_FORCE_RADIANS
|
#define GLM_FORCE_RADIANS
|
||||||
|
@ -12,27 +13,18 @@
|
||||||
|
|
||||||
namespace hk
|
namespace hk
|
||||||
{
|
{
|
||||||
struct SimplePushConstantData
|
|
||||||
{
|
|
||||||
glm::mat2 transform{1.0f};
|
|
||||||
glm::vec2 offset;
|
|
||||||
alignas(16) glm::vec3 color;
|
|
||||||
};
|
|
||||||
|
|
||||||
FirstApp::FirstApp()
|
FirstApp::FirstApp()
|
||||||
{
|
{
|
||||||
loadGameObjects();
|
loadGameObjects();
|
||||||
createPipelineLayout();
|
|
||||||
createPipeline();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
FirstApp::~FirstApp()
|
FirstApp::~FirstApp()
|
||||||
{
|
{
|
||||||
vkDestroyPipelineLayout(m_device.device(), m_pipelineLayout, nullptr);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void FirstApp::run()
|
void FirstApp::run()
|
||||||
{
|
{
|
||||||
|
SimpleRenderSystem simpleRenderSystem{m_device, m_renderer.getSwapChainRenderPass()};
|
||||||
while (!m_window.shouldClose())
|
while (!m_window.shouldClose())
|
||||||
{
|
{
|
||||||
glfwPollEvents();
|
glfwPollEvents();
|
||||||
|
@ -40,7 +32,7 @@ namespace hk
|
||||||
if (auto commandBuffer = m_renderer.beginFrame())
|
if (auto commandBuffer = m_renderer.beginFrame())
|
||||||
{
|
{
|
||||||
m_renderer.beginSwapChainRenderPass(commandBuffer);
|
m_renderer.beginSwapChainRenderPass(commandBuffer);
|
||||||
renderGameObjects(commandBuffer);
|
simpleRenderSystem.renderGameObjects(commandBuffer, m_gameObjects);
|
||||||
m_renderer.endSwapChainRenderPass(commandBuffer);
|
m_renderer.endSwapChainRenderPass(commandBuffer);
|
||||||
m_renderer.endFrame();
|
m_renderer.endFrame();
|
||||||
}
|
}
|
||||||
|
@ -67,65 +59,4 @@ namespace hk
|
||||||
|
|
||||||
m_gameObjects.push_back(std::move(triangle));
|
m_gameObjects.push_back(std::move(triangle));
|
||||||
}
|
}
|
||||||
|
} // namespace hk
|
||||||
void FirstApp::createPipelineLayout()
|
|
||||||
{
|
|
||||||
VkPushConstantRange pushConstantRange{};
|
|
||||||
pushConstantRange.stageFlags = VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT;
|
|
||||||
pushConstantRange.offset = 0;
|
|
||||||
pushConstantRange.size = sizeof(SimplePushConstantData);
|
|
||||||
|
|
||||||
VkPipelineLayoutCreateInfo pipelineLayoutInfo{};
|
|
||||||
pipelineLayoutInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
|
|
||||||
pipelineLayoutInfo.setLayoutCount = 0;
|
|
||||||
pipelineLayoutInfo.pSetLayouts = nullptr;
|
|
||||||
pipelineLayoutInfo.pushConstantRangeCount = 1;
|
|
||||||
pipelineLayoutInfo.pPushConstantRanges = &pushConstantRange;
|
|
||||||
|
|
||||||
if (vkCreatePipelineLayout(m_device.device(), &pipelineLayoutInfo, nullptr, &m_pipelineLayout) !=
|
|
||||||
VK_SUCCESS)
|
|
||||||
{
|
|
||||||
throw std::runtime_error("failed to create pipeline layout!");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void FirstApp::createPipeline()
|
|
||||||
{
|
|
||||||
assert(m_pipelineLayout != nullptr && "Cannot create pipeline before pipeline layout");
|
|
||||||
|
|
||||||
PipelineConfigInfo pipelineConfig{};
|
|
||||||
Pipeline::defaultPipelineConfigInfo(pipelineConfig);
|
|
||||||
|
|
||||||
pipelineConfig.renderPass = m_renderer.getSwapChainRenderPass();
|
|
||||||
pipelineConfig.pipelineLayout = m_pipelineLayout;
|
|
||||||
m_pipeline = std::make_unique<Pipeline>(
|
|
||||||
m_device,
|
|
||||||
"shaders/simple_shader.vert.spv",
|
|
||||||
"shaders/simple_shader.frag.spv",
|
|
||||||
pipelineConfig);
|
|
||||||
}
|
|
||||||
|
|
||||||
void FirstApp::renderGameObjects(VkCommandBuffer commandBuffer)
|
|
||||||
{
|
|
||||||
m_pipeline->bind(commandBuffer);
|
|
||||||
for (auto &obj : m_gameObjects)
|
|
||||||
{
|
|
||||||
obj.m_transform2d.rotation = glm::mod(obj.m_transform2d.rotation + 0.01f, glm::two_pi<float>());
|
|
||||||
|
|
||||||
SimplePushConstantData push{};
|
|
||||||
push.offset = obj.m_transform2d.translation;
|
|
||||||
push.color = obj.m_color;
|
|
||||||
push.transform = obj.m_transform2d.mat2();
|
|
||||||
|
|
||||||
vkCmdPushConstants(
|
|
||||||
commandBuffer,
|
|
||||||
m_pipelineLayout,
|
|
||||||
VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT,
|
|
||||||
0,
|
|
||||||
sizeof(SimplePushConstantData),
|
|
||||||
&push);
|
|
||||||
obj.m_model->bind(commandBuffer);
|
|
||||||
obj.m_model->draw(commandBuffer);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
#include "hk_device.hpp"
|
#include "hk_device.hpp"
|
||||||
#include "hk_game_object.hpp"
|
#include "hk_game_object.hpp"
|
||||||
#include "hk_pipeline.hpp"
|
|
||||||
#include "hk_window.hpp"
|
#include "hk_window.hpp"
|
||||||
#include "hk_renderer.hpp"
|
#include "hk_renderer.hpp"
|
||||||
|
|
||||||
|
@ -28,15 +27,10 @@ namespace hk
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void loadGameObjects();
|
void loadGameObjects();
|
||||||
void createPipelineLayout();
|
|
||||||
void createPipeline();
|
|
||||||
void renderGameObjects(VkCommandBuffer commandBuffer);
|
|
||||||
|
|
||||||
Window m_window{WIDTH, HEIGHT, "Hello Vulkan!"};
|
Window m_window{WIDTH, HEIGHT, "Hello Vulkan!"};
|
||||||
Device m_device{m_window};
|
Device m_device{m_window};
|
||||||
Renderer m_renderer{m_window, m_device};
|
Renderer m_renderer{m_window, m_device};
|
||||||
std::unique_ptr<Pipeline> m_pipeline;
|
|
||||||
VkPipelineLayout m_pipelineLayout;
|
|
||||||
std::vector<GameObject> m_gameObjects;
|
std::vector<GameObject> m_gameObjects;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -37,11 +37,12 @@ namespace hk
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_swapChain = std::make_unique<SwapChain>(m_device, extent, std::move(m_swapChain));
|
std::shared_ptr<SwapChain> oldSwapChain = std::move(m_swapChain);
|
||||||
if (m_swapChain->imageCount() != m_commandBuffers.size())
|
m_swapChain = std::make_unique<SwapChain>(m_device, extent, oldSwapChain);
|
||||||
|
|
||||||
|
if (!oldSwapChain->compareSwapFormats(*m_swapChain.get()))
|
||||||
{
|
{
|
||||||
freeCommandBuffers();
|
throw std::runtime_error("Swap chain image(or depth) format has changed!");
|
||||||
createCommandBuffers();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,7 +52,7 @@ namespace hk
|
||||||
|
|
||||||
void Renderer::createCommandBuffers()
|
void Renderer::createCommandBuffers()
|
||||||
{
|
{
|
||||||
m_commandBuffers.resize(m_swapChain->imageCount());
|
m_commandBuffers.resize(SwapChain::MAX_FRAMES_IN_FLIGHT);
|
||||||
|
|
||||||
VkCommandBufferAllocateInfo allocInfo{};
|
VkCommandBufferAllocateInfo allocInfo{};
|
||||||
allocInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
|
allocInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
|
||||||
|
@ -126,6 +127,7 @@ namespace hk
|
||||||
}
|
}
|
||||||
|
|
||||||
m_isFrameStarted = false;
|
m_isFrameStarted = false;
|
||||||
|
m_currentFrameIndex = (m_currentFrameIndex + 1) % SwapChain::MAX_FRAMES_IN_FLIGHT;
|
||||||
}
|
}
|
||||||
void Renderer::beginSwapChainRenderPass(VkCommandBuffer commandBuffer)
|
void Renderer::beginSwapChainRenderPass(VkCommandBuffer commandBuffer)
|
||||||
{
|
{
|
||||||
|
|
|
@ -25,7 +25,12 @@ namespace hk
|
||||||
bool isFrameInProgress() const {return m_isFrameStarted;}
|
bool isFrameInProgress() const {return m_isFrameStarted;}
|
||||||
VkCommandBuffer getCurrentCommandBuffer() const {
|
VkCommandBuffer getCurrentCommandBuffer() const {
|
||||||
assert(m_isFrameStarted && "Cannot get command buffer when frame not in progress");
|
assert(m_isFrameStarted && "Cannot get command buffer when frame not in progress");
|
||||||
return m_commandBuffers[m_currentImageIndex];
|
return m_commandBuffers[m_currentFrameIndex];
|
||||||
|
}
|
||||||
|
|
||||||
|
int getFrameIndex() const {
|
||||||
|
assert(m_isFrameStarted && "Cannot get frame index when frame not in progress");
|
||||||
|
return m_currentFrameIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
VkCommandBuffer beginFrame();
|
VkCommandBuffer beginFrame();
|
||||||
|
@ -46,6 +51,7 @@ namespace hk
|
||||||
std::vector<VkCommandBuffer> m_commandBuffers;
|
std::vector<VkCommandBuffer> m_commandBuffers;
|
||||||
|
|
||||||
uint32_t m_currentImageIndex;
|
uint32_t m_currentImageIndex;
|
||||||
|
int m_currentFrameIndex;
|
||||||
bool m_isFrameStarted;
|
bool m_isFrameStarted;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -272,15 +272,15 @@ namespace hk
|
||||||
subpass.pDepthStencilAttachment = &depthAttachmentRef;
|
subpass.pDepthStencilAttachment = &depthAttachmentRef;
|
||||||
|
|
||||||
VkSubpassDependency dependency = {};
|
VkSubpassDependency dependency = {};
|
||||||
dependency.srcSubpass = VK_SUBPASS_EXTERNAL;
|
|
||||||
dependency.srcAccessMask = 0;
|
|
||||||
dependency.srcStageMask =
|
|
||||||
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT | VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT;
|
|
||||||
dependency.dstSubpass = 0;
|
dependency.dstSubpass = 0;
|
||||||
dependency.dstStageMask =
|
dependency.dstStageMask =
|
||||||
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT | VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT;
|
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT | VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT;
|
||||||
dependency.dstAccessMask =
|
dependency.dstAccessMask =
|
||||||
VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
|
VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
|
||||||
|
dependency.srcSubpass = VK_SUBPASS_EXTERNAL;
|
||||||
|
dependency.srcAccessMask = 0;
|
||||||
|
dependency.srcStageMask =
|
||||||
|
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT | VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT;
|
||||||
|
|
||||||
std::array<VkAttachmentDescription, 2> attachments = {colorAttachment, depthAttachment};
|
std::array<VkAttachmentDescription, 2> attachments = {colorAttachment, depthAttachment};
|
||||||
VkRenderPassCreateInfo renderPassInfo = {};
|
VkRenderPassCreateInfo renderPassInfo = {};
|
||||||
|
@ -329,6 +329,7 @@ namespace hk
|
||||||
void SwapChain::createDepthResources()
|
void SwapChain::createDepthResources()
|
||||||
{
|
{
|
||||||
VkFormat depthFormat = findDepthFormat();
|
VkFormat depthFormat = findDepthFormat();
|
||||||
|
swapChainDepthFormat = depthFormat;
|
||||||
VkExtent2D swapChainExtent = getSwapChainExtent();
|
VkExtent2D swapChainExtent = getSwapChainExtent();
|
||||||
|
|
||||||
depthImages.resize(imageCount());
|
depthImages.resize(imageCount());
|
||||||
|
@ -422,14 +423,14 @@ namespace hk
|
||||||
VkPresentModeKHR SwapChain::chooseSwapPresentMode(
|
VkPresentModeKHR SwapChain::chooseSwapPresentMode(
|
||||||
const std::vector<VkPresentModeKHR> &availablePresentModes)
|
const std::vector<VkPresentModeKHR> &availablePresentModes)
|
||||||
{
|
{
|
||||||
for (const auto &availablePresentMode : availablePresentModes)
|
// for (const auto &availablePresentMode : availablePresentModes)
|
||||||
{
|
// {
|
||||||
if (availablePresentMode == VK_PRESENT_MODE_MAILBOX_KHR)
|
// if (availablePresentMode == VK_PRESENT_MODE_MAILBOX_KHR)
|
||||||
{
|
// {
|
||||||
std::cout << "Present mode: Mailbox" << std::endl;
|
// std::cout << "Present mode: Mailbox" << std::endl;
|
||||||
return availablePresentMode;
|
// return availablePresentMode;
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
// for (const auto &availablePresentMode : availablePresentModes)
|
// for (const auto &availablePresentMode : availablePresentModes)
|
||||||
// {
|
// {
|
||||||
|
|
|
@ -43,6 +43,12 @@ namespace hk
|
||||||
VkResult acquireNextImage(uint32_t *imageIndex);
|
VkResult acquireNextImage(uint32_t *imageIndex);
|
||||||
VkResult submitCommandBuffers(const VkCommandBuffer *buffers, uint32_t *imageIndex);
|
VkResult submitCommandBuffers(const VkCommandBuffer *buffers, uint32_t *imageIndex);
|
||||||
|
|
||||||
|
bool compareSwapFormats(const SwapChain &swapCahin) const
|
||||||
|
{
|
||||||
|
return swapCahin.swapChainDepthFormat == swapChainDepthFormat &&
|
||||||
|
swapCahin.swapChainImageFormat == swapChainImageFormat;
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void init();
|
void init();
|
||||||
void createSwapChain();
|
void createSwapChain();
|
||||||
|
@ -60,6 +66,7 @@ namespace hk
|
||||||
VkExtent2D chooseSwapExtent(const VkSurfaceCapabilitiesKHR &capabilities);
|
VkExtent2D chooseSwapExtent(const VkSurfaceCapabilitiesKHR &capabilities);
|
||||||
|
|
||||||
VkFormat swapChainImageFormat;
|
VkFormat swapChainImageFormat;
|
||||||
|
VkFormat swapChainDepthFormat;
|
||||||
VkExtent2D swapChainExtent;
|
VkExtent2D swapChainExtent;
|
||||||
|
|
||||||
std::vector<VkFramebuffer> swapChainFramebuffers;
|
std::vector<VkFramebuffer> swapChainFramebuffers;
|
||||||
|
|
|
@ -0,0 +1,93 @@
|
||||||
|
#include "simple_render_system.hpp"
|
||||||
|
|
||||||
|
// libs
|
||||||
|
#define GLM_FORCE_RADIANS
|
||||||
|
#define GLM_FORCE_DEPTH_ZERO_TO_ONE
|
||||||
|
#include <glm/glm.hpp>
|
||||||
|
#include <glm/gtc/constants.hpp>
|
||||||
|
|
||||||
|
// std
|
||||||
|
#include <stdexcept>
|
||||||
|
#include <array>
|
||||||
|
|
||||||
|
namespace hk
|
||||||
|
{
|
||||||
|
struct SimplePushConstantData
|
||||||
|
{
|
||||||
|
glm::mat2 transform{1.0f};
|
||||||
|
glm::vec2 offset;
|
||||||
|
alignas(16) glm::vec3 color;
|
||||||
|
};
|
||||||
|
|
||||||
|
SimpleRenderSystem::SimpleRenderSystem(Device &device, VkRenderPass renderPass) : m_device{device}
|
||||||
|
{
|
||||||
|
createPipelineLayout();
|
||||||
|
createPipeline(renderPass);
|
||||||
|
}
|
||||||
|
|
||||||
|
SimpleRenderSystem::~SimpleRenderSystem()
|
||||||
|
{
|
||||||
|
vkDestroyPipelineLayout(m_device.device(), m_pipelineLayout, nullptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SimpleRenderSystem::createPipelineLayout()
|
||||||
|
{
|
||||||
|
VkPushConstantRange pushConstantRange{};
|
||||||
|
pushConstantRange.stageFlags = VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT;
|
||||||
|
pushConstantRange.offset = 0;
|
||||||
|
pushConstantRange.size = sizeof(SimplePushConstantData);
|
||||||
|
|
||||||
|
VkPipelineLayoutCreateInfo pipelineLayoutInfo{};
|
||||||
|
pipelineLayoutInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
|
||||||
|
pipelineLayoutInfo.setLayoutCount = 0;
|
||||||
|
pipelineLayoutInfo.pSetLayouts = nullptr;
|
||||||
|
pipelineLayoutInfo.pushConstantRangeCount = 1;
|
||||||
|
pipelineLayoutInfo.pPushConstantRanges = &pushConstantRange;
|
||||||
|
|
||||||
|
if (vkCreatePipelineLayout(m_device.device(), &pipelineLayoutInfo, nullptr, &m_pipelineLayout) !=
|
||||||
|
VK_SUCCESS)
|
||||||
|
{
|
||||||
|
throw std::runtime_error("failed to create pipeline layout!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void SimpleRenderSystem::createPipeline(VkRenderPass renderPass)
|
||||||
|
{
|
||||||
|
assert(m_pipelineLayout != nullptr && "Cannot create pipeline before pipeline layout");
|
||||||
|
|
||||||
|
PipelineConfigInfo pipelineConfig{};
|
||||||
|
Pipeline::defaultPipelineConfigInfo(pipelineConfig);
|
||||||
|
|
||||||
|
pipelineConfig.renderPass = renderPass;
|
||||||
|
pipelineConfig.pipelineLayout = m_pipelineLayout;
|
||||||
|
m_pipeline = std::make_unique<Pipeline>(
|
||||||
|
m_device,
|
||||||
|
"shaders/simple_shader.vert.spv",
|
||||||
|
"shaders/simple_shader.frag.spv",
|
||||||
|
pipelineConfig);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SimpleRenderSystem::renderGameObjects(VkCommandBuffer commandBuffer, std::vector<GameObject> &gameObjects)
|
||||||
|
{
|
||||||
|
m_pipeline->bind(commandBuffer);
|
||||||
|
for (auto &obj : gameObjects)
|
||||||
|
{
|
||||||
|
obj.m_transform2d.rotation = glm::mod(obj.m_transform2d.rotation + 0.01f, glm::two_pi<float>());
|
||||||
|
|
||||||
|
SimplePushConstantData push{};
|
||||||
|
push.offset = obj.m_transform2d.translation;
|
||||||
|
push.color = obj.m_color;
|
||||||
|
push.transform = obj.m_transform2d.mat2();
|
||||||
|
|
||||||
|
vkCmdPushConstants(
|
||||||
|
commandBuffer,
|
||||||
|
m_pipelineLayout,
|
||||||
|
VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT,
|
||||||
|
0,
|
||||||
|
sizeof(SimplePushConstantData),
|
||||||
|
&push);
|
||||||
|
obj.m_model->bind(commandBuffer);
|
||||||
|
obj.m_model->draw(commandBuffer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,33 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "hk_device.hpp"
|
||||||
|
#include "hk_game_object.hpp"
|
||||||
|
#include "hk_pipeline.hpp"
|
||||||
|
|
||||||
|
// std
|
||||||
|
#include <memory>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
namespace hk
|
||||||
|
{
|
||||||
|
class SimpleRenderSystem
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
|
||||||
|
SimpleRenderSystem(Device &device, VkRenderPass renderPass);
|
||||||
|
~SimpleRenderSystem();
|
||||||
|
|
||||||
|
SimpleRenderSystem(const SimpleRenderSystem &) = delete;
|
||||||
|
SimpleRenderSystem &operator=(const SimpleRenderSystem &) = delete;
|
||||||
|
|
||||||
|
void renderGameObjects(VkCommandBuffer commandBuffer, std::vector<GameObject> &gameObjects);
|
||||||
|
|
||||||
|
private:
|
||||||
|
void createPipelineLayout();
|
||||||
|
void createPipeline(VkRenderPass renderPass);
|
||||||
|
|
||||||
|
Device &m_device;
|
||||||
|
std::unique_ptr<Pipeline> m_pipeline;
|
||||||
|
VkPipelineLayout m_pipelineLayout;
|
||||||
|
};
|
||||||
|
}
|
Loading…
Reference in New Issue