mirror of
https://github.com/redstrate/Novus.git
synced 2025-04-26 05:37:46 +00:00
renderer: Reformat code, misc cleanup
This commit is contained in:
parent
22ec76c6b4
commit
9d6f06bf1f
2 changed files with 212 additions and 207 deletions
|
|
@ -28,10 +28,7 @@ struct RenderTexture {
|
|||
VkSampler sampler = VK_NULL_HANDLE;
|
||||
};
|
||||
|
||||
enum class MaterialType {
|
||||
Object,
|
||||
Skin
|
||||
};
|
||||
enum class MaterialType { Object, Skin };
|
||||
|
||||
struct RenderMaterial {
|
||||
MaterialType type = MaterialType::Object;
|
||||
|
|
@ -57,7 +54,8 @@ struct RenderModel {
|
|||
class ImGuiPass;
|
||||
struct ImGuiContext;
|
||||
|
||||
class Renderer {
|
||||
class Renderer
|
||||
{
|
||||
public:
|
||||
Renderer();
|
||||
|
||||
|
|
@ -118,9 +116,13 @@ public:
|
|||
|
||||
void endSingleTimeCommands(VkCommandBuffer pT);
|
||||
|
||||
void inlineTransitionImageLayout(VkCommandBuffer commandBuffer, VkImage image, VkFormat format,
|
||||
VkImageAspectFlags aspect, VkImageSubresourceRange range,
|
||||
VkImageLayout oldLayout, VkImageLayout newLayout,
|
||||
void inlineTransitionImageLayout(VkCommandBuffer commandBuffer,
|
||||
VkImage image,
|
||||
VkFormat format,
|
||||
VkImageAspectFlags aspect,
|
||||
VkImageSubresourceRange range,
|
||||
VkImageLayout oldLayout,
|
||||
VkImageLayout newLayout,
|
||||
VkPipelineStageFlags src_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
|
||||
VkPipelineStageFlags dst_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT);
|
||||
|
||||
|
|
|
|||
|
|
@ -16,15 +16,14 @@
|
|||
#include "imgui.h"
|
||||
#include "imguipass.h"
|
||||
|
||||
VkResult CreateDebugUtilsMessengerEXT(
|
||||
VkInstance instance, const VkDebugUtilsMessengerCreateInfoEXT* pCreateInfo,
|
||||
VkResult CreateDebugUtilsMessengerEXT(VkInstance instance,
|
||||
const VkDebugUtilsMessengerCreateInfoEXT *pCreateInfo,
|
||||
const VkAllocationCallbacks *pAllocator,
|
||||
VkDebugUtilsMessengerEXT* pCallback) {
|
||||
|
||||
VkDebugUtilsMessengerEXT *pCallback)
|
||||
{
|
||||
// Note: It seems that static_cast<...> doesn't work. Use the C-style forced
|
||||
// cast.
|
||||
auto func = (PFN_vkCreateDebugUtilsMessengerEXT)vkGetInstanceProcAddr(
|
||||
instance, "vkCreateDebugUtilsMessengerEXT");
|
||||
auto func = (PFN_vkCreateDebugUtilsMessengerEXT)vkGetInstanceProcAddr(instance, "vkCreateDebugUtilsMessengerEXT");
|
||||
if (func != nullptr) {
|
||||
return func(instance, pCreateInfo, pAllocator, pCallback);
|
||||
} else {
|
||||
|
|
@ -32,17 +31,18 @@ VkResult CreateDebugUtilsMessengerEXT(
|
|||
}
|
||||
}
|
||||
|
||||
VKAPI_ATTR VkBool32 VKAPI_CALL
|
||||
DebugCallback(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
|
||||
VKAPI_ATTR VkBool32 VKAPI_CALL DebugCallback(VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
|
||||
VkDebugUtilsMessageTypeFlagsEXT messageType,
|
||||
const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData,
|
||||
void* pUserData) {
|
||||
void *pUserData)
|
||||
{
|
||||
qInfo() << pCallbackData->pMessage;
|
||||
|
||||
return VK_FALSE;
|
||||
}
|
||||
|
||||
Renderer::Renderer() {
|
||||
Renderer::Renderer()
|
||||
{
|
||||
Q_INIT_RESOURCE(shaders);
|
||||
|
||||
ctx = ImGui::CreateContext();
|
||||
|
|
@ -73,13 +73,9 @@ Renderer::Renderer() {
|
|||
}
|
||||
|
||||
VkDebugUtilsMessengerCreateInfoEXT debugCreateInfo = {};
|
||||
debugCreateInfo.sType =
|
||||
VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT;
|
||||
debugCreateInfo.messageSeverity =
|
||||
VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT |
|
||||
VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT;
|
||||
debugCreateInfo.messageType =
|
||||
VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT;
|
||||
debugCreateInfo.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT;
|
||||
debugCreateInfo.messageSeverity = VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT;
|
||||
debugCreateInfo.messageType = VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT;
|
||||
debugCreateInfo.pfnUserCallback = DebugCallback;
|
||||
|
||||
VkInstanceCreateInfo createInfo = {};
|
||||
|
|
@ -91,8 +87,7 @@ Renderer::Renderer() {
|
|||
vkCreateInstance(&createInfo, nullptr, &instance);
|
||||
|
||||
VkDebugUtilsMessengerEXT callback;
|
||||
CreateDebugUtilsMessengerEXT(instance, &debugCreateInfo, nullptr,
|
||||
&callback);
|
||||
CreateDebugUtilsMessengerEXT(instance, &debugCreateInfo, nullptr, &callback);
|
||||
|
||||
// pick physical device
|
||||
uint32_t deviceCount = 0;
|
||||
|
|
@ -116,12 +111,10 @@ Renderer::Renderer() {
|
|||
physicalDevice = devices[preferredDevice];
|
||||
|
||||
extensionCount = 0;
|
||||
vkEnumerateDeviceExtensionProperties(physicalDevice, nullptr,
|
||||
&extensionCount, nullptr);
|
||||
vkEnumerateDeviceExtensionProperties(physicalDevice, nullptr, &extensionCount, nullptr);
|
||||
|
||||
std::vector<VkExtensionProperties> extensionProperties(extensionCount);
|
||||
vkEnumerateDeviceExtensionProperties(
|
||||
physicalDevice, nullptr, &extensionCount, extensionProperties.data());
|
||||
vkEnumerateDeviceExtensionProperties(physicalDevice, nullptr, &extensionCount, extensionProperties.data());
|
||||
|
||||
// we want to choose the portability subset on platforms that
|
||||
// support it, this is a requirement of the portability spec
|
||||
|
|
@ -135,17 +128,14 @@ Renderer::Renderer() {
|
|||
|
||||
// create logical device
|
||||
uint32_t queueFamilyCount = 0;
|
||||
vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice, &queueFamilyCount,
|
||||
nullptr);
|
||||
vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice, &queueFamilyCount, nullptr);
|
||||
|
||||
std::vector<VkQueueFamilyProperties> queueFamilies(queueFamilyCount);
|
||||
vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice, &queueFamilyCount,
|
||||
queueFamilies.data());
|
||||
vkGetPhysicalDeviceQueueFamilyProperties(physicalDevice, &queueFamilyCount, queueFamilies.data());
|
||||
|
||||
int i = 0;
|
||||
for (const auto &queueFamily : queueFamilies) {
|
||||
if (queueFamily.queueCount > 0 &&
|
||||
queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
|
||||
if (queueFamily.queueCount > 0 && queueFamily.queueFlags & VK_QUEUE_GRAPHICS_BIT) {
|
||||
graphicsFamilyIndex = i;
|
||||
}
|
||||
|
||||
|
|
@ -195,8 +185,7 @@ Renderer::Renderer() {
|
|||
VkDeviceCreateInfo deviceCeateInfo = {};
|
||||
deviceCeateInfo.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
|
||||
deviceCeateInfo.pQueueCreateInfos = queueCreateInfos.data();
|
||||
deviceCeateInfo.queueCreateInfoCount =
|
||||
static_cast<uint32_t>(queueCreateInfos.size());
|
||||
deviceCeateInfo.queueCreateInfoCount = static_cast<uint32_t>(queueCreateInfos.size());
|
||||
deviceCeateInfo.ppEnabledExtensionNames = deviceExtensions.data();
|
||||
deviceCeateInfo.enabledExtensionCount = static_cast<uint32_t>(deviceExtensions.size());
|
||||
|
||||
|
|
@ -221,7 +210,8 @@ Renderer::Renderer() {
|
|||
qInfo() << "Initialized renderer!";
|
||||
}
|
||||
|
||||
bool Renderer::initSwapchain(VkSurfaceKHR surface, int width, int height) {
|
||||
bool Renderer::initSwapchain(VkSurfaceKHR surface, int width, int height)
|
||||
{
|
||||
vkQueueWaitIdle(presentQueue);
|
||||
|
||||
if (width == 0 || height == 0)
|
||||
|
|
@ -229,39 +219,31 @@ bool Renderer::initSwapchain(VkSurfaceKHR surface, int width, int height) {
|
|||
|
||||
// TODO: fix this pls
|
||||
VkBool32 supported;
|
||||
vkGetPhysicalDeviceSurfaceSupportKHR(physicalDevice, 0,
|
||||
surface, &supported);
|
||||
vkGetPhysicalDeviceSurfaceSupportKHR(physicalDevice, 0, surface, &supported);
|
||||
|
||||
// query swapchain support
|
||||
VkSurfaceCapabilitiesKHR capabilities;
|
||||
vkGetPhysicalDeviceSurfaceCapabilitiesKHR(
|
||||
physicalDevice, surface, &capabilities);
|
||||
vkGetPhysicalDeviceSurfaceCapabilitiesKHR(physicalDevice, surface, &capabilities);
|
||||
|
||||
std::vector<VkSurfaceFormatKHR> formats;
|
||||
|
||||
uint32_t formatCount;
|
||||
vkGetPhysicalDeviceSurfaceFormatsKHR(
|
||||
physicalDevice, surface, &formatCount, nullptr);
|
||||
vkGetPhysicalDeviceSurfaceFormatsKHR(physicalDevice, surface, &formatCount, nullptr);
|
||||
|
||||
formats.resize(formatCount);
|
||||
vkGetPhysicalDeviceSurfaceFormatsKHR(
|
||||
physicalDevice, surface, &formatCount, formats.data());
|
||||
vkGetPhysicalDeviceSurfaceFormatsKHR(physicalDevice, surface, &formatCount, formats.data());
|
||||
|
||||
std::vector<VkPresentModeKHR> presentModes;
|
||||
uint32_t presentModeCount;
|
||||
vkGetPhysicalDeviceSurfacePresentModesKHR(
|
||||
physicalDevice, surface, &presentModeCount, nullptr);
|
||||
vkGetPhysicalDeviceSurfacePresentModesKHR(physicalDevice, surface, &presentModeCount, nullptr);
|
||||
|
||||
presentModes.resize(presentModeCount);
|
||||
vkGetPhysicalDeviceSurfacePresentModesKHR(
|
||||
physicalDevice, surface, &presentModeCount,
|
||||
presentModes.data());
|
||||
vkGetPhysicalDeviceSurfacePresentModesKHR(physicalDevice, surface, &presentModeCount, presentModes.data());
|
||||
|
||||
// choosing swapchain features
|
||||
VkSurfaceFormatKHR swapchainSurfaceFormat = formats[0];
|
||||
for (const auto &availableFormat : formats) {
|
||||
if (availableFormat.format == VK_FORMAT_B8G8R8A8_UNORM &&
|
||||
availableFormat.colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) {
|
||||
if (availableFormat.format == VK_FORMAT_B8G8R8A8_UNORM && availableFormat.colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) {
|
||||
swapchainSurfaceFormat = availableFormat;
|
||||
}
|
||||
}
|
||||
|
|
@ -274,8 +256,7 @@ bool Renderer::initSwapchain(VkSurfaceKHR surface, int width, int height) {
|
|||
}
|
||||
|
||||
uint32_t imageCount = capabilities.minImageCount + 1;
|
||||
if (capabilities.maxImageCount > 0 &&
|
||||
imageCount > capabilities.maxImageCount) {
|
||||
if (capabilities.maxImageCount > 0 && imageCount > capabilities.maxImageCount) {
|
||||
imageCount = capabilities.maxImageCount;
|
||||
}
|
||||
|
||||
|
|
@ -307,8 +288,7 @@ bool Renderer::initSwapchain(VkSurfaceKHR surface, int width, int height) {
|
|||
swapchainExtent.width = width;
|
||||
swapchainExtent.height = height;
|
||||
|
||||
vkGetSwapchainImagesKHR(device, swapchain, &imageCount,
|
||||
nullptr);
|
||||
vkGetSwapchainImagesKHR(device, swapchain, &imageCount, nullptr);
|
||||
swapchainImages.resize(imageCount);
|
||||
vkGetSwapchainImagesKHR(device, swapchain, &imageCount, swapchainImages.data());
|
||||
|
||||
|
|
@ -441,22 +421,18 @@ bool Renderer::initSwapchain(VkSurfaceKHR surface, int width, int height) {
|
|||
return true;
|
||||
}
|
||||
|
||||
void Renderer::resize(VkSurfaceKHR surface, int width, int height) {
|
||||
void Renderer::resize(VkSurfaceKHR surface, int width, int height)
|
||||
{
|
||||
initSwapchain(surface, width, height);
|
||||
}
|
||||
|
||||
void Renderer::render(std::vector<RenderModel> models) {
|
||||
vkWaitForFences(
|
||||
device, 1,
|
||||
&inFlightFences[currentFrame],
|
||||
VK_TRUE, std::numeric_limits<uint64_t>::max());
|
||||
void Renderer::render(std::vector<RenderModel> models)
|
||||
{
|
||||
vkWaitForFences(device, 1, &inFlightFences[currentFrame], VK_TRUE, std::numeric_limits<uint64_t>::max());
|
||||
|
||||
uint32_t imageIndex = 0;
|
||||
VkResult result = vkAcquireNextImageKHR(
|
||||
device, swapchain,
|
||||
std::numeric_limits<uint64_t>::max(),
|
||||
imageAvailableSemaphores[currentFrame],
|
||||
VK_NULL_HANDLE, &imageIndex);
|
||||
VkResult result =
|
||||
vkAcquireNextImageKHR(device, swapchain, std::numeric_limits<uint64_t>::max(), imageAvailableSemaphores[currentFrame], VK_NULL_HANDLE, &imageIndex);
|
||||
|
||||
if (result == VK_ERROR_OUT_OF_DATE_KHR) {
|
||||
return;
|
||||
|
|
@ -533,8 +509,7 @@ void Renderer::render(std::vector<RenderModel> models) {
|
|||
vkCmdBindVertexBuffers(commandBuffer, 0, 1, &part.vertexBuffer, offsets);
|
||||
vkCmdBindIndexBuffer(commandBuffer, part.indexBuffer, 0, VK_INDEX_TYPE_UINT16);
|
||||
|
||||
glm::mat4 p = glm::perspective(glm::radians(45.0f), swapchainExtent.width / (float) swapchainExtent.height,
|
||||
0.1f, 100.0f);
|
||||
glm::mat4 p = glm::perspective(glm::radians(45.0f), swapchainExtent.width / (float)swapchainExtent.height, 0.1f, 100.0f);
|
||||
glm::mat4 v = view;
|
||||
glm::mat4 vp = p * v;
|
||||
|
||||
|
|
@ -542,13 +517,28 @@ void Renderer::render(std::vector<RenderModel> models) {
|
|||
|
||||
glm::mat4 m = glm::mat4(1.0f);
|
||||
|
||||
vkCmdPushConstants(commandBuffer, pipelineLayout, VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(glm::mat4), sizeof(glm::mat4), &m);
|
||||
vkCmdPushConstants(commandBuffer,
|
||||
pipelineLayout,
|
||||
VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT,
|
||||
sizeof(glm::mat4),
|
||||
sizeof(glm::mat4),
|
||||
&m);
|
||||
|
||||
int test = 0;
|
||||
vkCmdPushConstants(commandBuffer, pipelineLayout, VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(glm::mat4) * 2, sizeof(int), &test);
|
||||
vkCmdPushConstants(commandBuffer,
|
||||
pipelineLayout,
|
||||
VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT,
|
||||
sizeof(glm::mat4) * 2,
|
||||
sizeof(int),
|
||||
&test);
|
||||
|
||||
int type = (int)material.type;
|
||||
vkCmdPushConstants(commandBuffer, pipelineLayout, VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT, sizeof(glm::mat4) * 2 + sizeof(int), sizeof(int), &type);
|
||||
vkCmdPushConstants(commandBuffer,
|
||||
pipelineLayout,
|
||||
VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT,
|
||||
sizeof(glm::mat4) * 2 + sizeof(int),
|
||||
sizeof(int),
|
||||
&type);
|
||||
|
||||
vkCmdDrawIndexed(commandBuffer, part.numIndices, 1, 0, 0, 0);
|
||||
}
|
||||
|
|
@ -566,8 +556,7 @@ void Renderer::render(std::vector<RenderModel> models) {
|
|||
submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
|
||||
|
||||
VkSemaphore waitSemaphores[] = {imageAvailableSemaphores[currentFrame]};
|
||||
VkPipelineStageFlags waitStages[] = {
|
||||
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT};
|
||||
VkPipelineStageFlags waitStages[] = {VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT};
|
||||
submitInfo.waitSemaphoreCount = 1;
|
||||
submitInfo.pWaitSemaphores = waitSemaphores;
|
||||
submitInfo.pWaitDstStageMask = waitStages;
|
||||
|
|
@ -599,7 +588,8 @@ void Renderer::render(std::vector<RenderModel> models) {
|
|||
currentFrame = (currentFrame + 1) % 3;
|
||||
}
|
||||
|
||||
std::tuple<VkBuffer, VkDeviceMemory> Renderer::createBuffer(size_t size, VkBufferUsageFlags usageFlags) {
|
||||
std::tuple<VkBuffer, VkDeviceMemory> Renderer::createBuffer(size_t size, VkBufferUsageFlags usageFlags)
|
||||
{
|
||||
vkDeviceWaitIdle(device);
|
||||
|
||||
// create buffer
|
||||
|
|
@ -619,10 +609,7 @@ std::tuple<VkBuffer, VkDeviceMemory> Renderer::createBuffer(size_t size, VkBuffe
|
|||
VkMemoryAllocateInfo allocInfo = {};
|
||||
allocInfo.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
|
||||
allocInfo.allocationSize = memRequirements.size;
|
||||
allocInfo.memoryTypeIndex =
|
||||
findMemoryType(memRequirements.memoryTypeBits,
|
||||
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
|
||||
VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
|
||||
allocInfo.memoryTypeIndex = findMemoryType(memRequirements.memoryTypeBits, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
|
||||
|
||||
VkDeviceMemory memory;
|
||||
vkAllocateMemory(device, &allocInfo, nullptr, &memory);
|
||||
|
|
@ -632,14 +619,13 @@ std::tuple<VkBuffer, VkDeviceMemory> Renderer::createBuffer(size_t size, VkBuffe
|
|||
return {handle, memory};
|
||||
}
|
||||
|
||||
uint32_t Renderer::findMemoryType(uint32_t typeFilter, VkMemoryPropertyFlags properties) {
|
||||
uint32_t Renderer::findMemoryType(uint32_t typeFilter, VkMemoryPropertyFlags properties)
|
||||
{
|
||||
VkPhysicalDeviceMemoryProperties memProperties;
|
||||
vkGetPhysicalDeviceMemoryProperties(physicalDevice, &memProperties);
|
||||
|
||||
for (uint32_t i = 0; i < memProperties.memoryTypeCount; i++) {
|
||||
if ((typeFilter & (1 << i)) &&
|
||||
(memProperties.memoryTypes[i].propertyFlags & properties) ==
|
||||
properties) {
|
||||
if ((typeFilter & (1 << i)) && (memProperties.memoryTypes[i].propertyFlags & properties) == properties) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
|
|
@ -647,7 +633,8 @@ uint32_t Renderer::findMemoryType(uint32_t typeFilter, VkMemoryPropertyFlags pro
|
|||
return -1;
|
||||
}
|
||||
|
||||
RenderModel Renderer::addModel(const physis_MDL& model, int lod) {
|
||||
RenderModel Renderer::addModel(const physis_MDL &model, int lod)
|
||||
{
|
||||
RenderModel renderModel;
|
||||
renderModel.model = model;
|
||||
|
||||
|
|
@ -719,7 +706,8 @@ RenderModel Renderer::addModel(const physis_MDL& model, int lod) {
|
|||
return renderModel;
|
||||
}
|
||||
|
||||
void Renderer::initPipeline() {
|
||||
void Renderer::initPipeline()
|
||||
{
|
||||
VkPipelineShaderStageCreateInfo vertexShaderStageInfo = {};
|
||||
vertexShaderStageInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
|
||||
vertexShaderStageInfo.stage = VK_SHADER_STAGE_VERTEX_BIT;
|
||||
|
|
@ -848,7 +836,8 @@ void Renderer::initPipeline() {
|
|||
vkCreateGraphicsPipelines(device, VK_NULL_HANDLE, 1, &createInfo, nullptr, &pipeline);
|
||||
}
|
||||
|
||||
VkShaderModule Renderer::createShaderModule(const uint32_t* code, const int length) {
|
||||
VkShaderModule Renderer::createShaderModule(const uint32_t *code, const int length)
|
||||
{
|
||||
VkShaderModuleCreateInfo createInfo = {};
|
||||
createInfo.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
|
||||
createInfo.codeSize = length;
|
||||
|
|
@ -860,7 +849,8 @@ VkShaderModule Renderer::createShaderModule(const uint32_t* code, const int leng
|
|||
return shaderModule;
|
||||
}
|
||||
|
||||
VkShaderModule Renderer::loadShaderFromDisk(const std::string_view path) {
|
||||
VkShaderModule Renderer::loadShaderFromDisk(const std::string_view path)
|
||||
{
|
||||
QFile file((QLatin1String(path)));
|
||||
file.open(QFile::ReadOnly);
|
||||
|
||||
|
|
@ -872,7 +862,8 @@ VkShaderModule Renderer::loadShaderFromDisk(const std::string_view path) {
|
|||
return createShaderModule(reinterpret_cast<const uint32_t *>(contents.data()), contents.size());
|
||||
}
|
||||
|
||||
void Renderer::initDescriptors() {
|
||||
void Renderer::initDescriptors()
|
||||
{
|
||||
VkDescriptorPoolSize poolSize = {};
|
||||
poolSize.type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
|
||||
poolSize.descriptorCount = 150;
|
||||
|
|
@ -931,7 +922,8 @@ void Renderer::initDescriptors() {
|
|||
vkCreateDescriptorSetLayout(device, &layoutInfo, nullptr, &setLayout);
|
||||
}
|
||||
|
||||
void Renderer::initDepth(int width, int height) {
|
||||
void Renderer::initDepth(int width, int height)
|
||||
{
|
||||
VkImageCreateInfo imageCreateInfo = {};
|
||||
imageCreateInfo.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
|
||||
imageCreateInfo.imageType = VK_IMAGE_TYPE_2D;
|
||||
|
|
@ -973,7 +965,8 @@ void Renderer::initDepth(int width, int height) {
|
|||
vkCreateImageView(device, &viewCreateInfo, nullptr, &depthView);
|
||||
}
|
||||
|
||||
RenderTexture Renderer::addTexture(const uint32_t width, const uint32_t height, const uint8_t* data, const uint32_t data_size) {
|
||||
RenderTexture Renderer::addTexture(const uint32_t width, const uint32_t height, const uint8_t *data, const uint32_t data_size)
|
||||
{
|
||||
RenderTexture newTexture = {};
|
||||
|
||||
VkImageCreateInfo imageInfo = {};
|
||||
|
|
@ -999,8 +992,7 @@ RenderTexture Renderer::addTexture(const uint32_t width, const uint32_t height,
|
|||
VkMemoryAllocateInfo allocInfo = {};
|
||||
allocInfo.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
|
||||
allocInfo.allocationSize = memRequirements.size;
|
||||
allocInfo.memoryTypeIndex = findMemoryType(
|
||||
memRequirements.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
|
||||
allocInfo.memoryTypeIndex = findMemoryType(memRequirements.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
|
||||
|
||||
vkAllocateMemory(device, &allocInfo, nullptr, &newTexture.memory);
|
||||
|
||||
|
|
@ -1024,10 +1016,7 @@ RenderTexture Renderer::addTexture(const uint32_t width, const uint32_t height,
|
|||
allocInfo = {};
|
||||
allocInfo.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
|
||||
allocInfo.allocationSize = memRequirements.size;
|
||||
allocInfo.memoryTypeIndex =
|
||||
findMemoryType(memRequirements.memoryTypeBits,
|
||||
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
|
||||
VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
|
||||
allocInfo.memoryTypeIndex = findMemoryType(memRequirements.memoryTypeBits, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
|
||||
|
||||
vkAllocateMemory(device, &allocInfo, nullptr, &stagingBufferMemory);
|
||||
|
||||
|
|
@ -1048,9 +1037,12 @@ RenderTexture Renderer::addTexture(const uint32_t width, const uint32_t height,
|
|||
range.baseArrayLayer = 0;
|
||||
range.layerCount = 1;
|
||||
|
||||
inlineTransitionImageLayout(commandBuffer, newTexture.handle,
|
||||
imageInfo.format, VK_IMAGE_ASPECT_COLOR_BIT,
|
||||
range, VK_IMAGE_LAYOUT_UNDEFINED,
|
||||
inlineTransitionImageLayout(commandBuffer,
|
||||
newTexture.handle,
|
||||
imageInfo.format,
|
||||
VK_IMAGE_ASPECT_COLOR_BIT,
|
||||
range,
|
||||
VK_IMAGE_LAYOUT_UNDEFINED,
|
||||
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
|
||||
|
||||
VkBufferImageCopy region = {};
|
||||
|
|
@ -1058,15 +1050,16 @@ RenderTexture Renderer::addTexture(const uint32_t width, const uint32_t height,
|
|||
region.imageSubresource.mipLevel = 0;
|
||||
region.imageSubresource.baseArrayLayer = 0;
|
||||
region.imageSubresource.layerCount = 1;
|
||||
region.imageExtent = {(uint32_t)width,
|
||||
(uint32_t)height, 1};
|
||||
region.imageExtent = {(uint32_t)width, (uint32_t)height, 1};
|
||||
|
||||
vkCmdCopyBufferToImage(commandBuffer, stagingBuffer, newTexture.handle,
|
||||
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, ®ion);
|
||||
vkCmdCopyBufferToImage(commandBuffer, stagingBuffer, newTexture.handle, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, ®ion);
|
||||
|
||||
inlineTransitionImageLayout(commandBuffer, newTexture.handle,
|
||||
imageInfo.format, VK_IMAGE_ASPECT_COLOR_BIT,
|
||||
range, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
|
||||
inlineTransitionImageLayout(commandBuffer,
|
||||
newTexture.handle,
|
||||
imageInfo.format,
|
||||
VK_IMAGE_ASPECT_COLOR_BIT,
|
||||
range,
|
||||
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
|
||||
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
|
||||
|
||||
endSingleTimeCommands(commandBuffer);
|
||||
|
|
@ -1100,7 +1093,8 @@ RenderTexture Renderer::addTexture(const uint32_t width, const uint32_t height,
|
|||
return newTexture;
|
||||
}
|
||||
|
||||
VkCommandBuffer Renderer::beginSingleTimeCommands() {
|
||||
VkCommandBuffer Renderer::beginSingleTimeCommands()
|
||||
{
|
||||
VkCommandBufferAllocateInfo allocInfo = {};
|
||||
allocInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
|
||||
allocInfo.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
|
||||
|
|
@ -1119,7 +1113,8 @@ VkCommandBuffer Renderer::beginSingleTimeCommands() {
|
|||
return commandBuffer;
|
||||
}
|
||||
|
||||
void Renderer::endSingleTimeCommands(VkCommandBuffer commandBuffer) {
|
||||
void Renderer::endSingleTimeCommands(VkCommandBuffer commandBuffer)
|
||||
{
|
||||
vkEndCommandBuffer(commandBuffer);
|
||||
|
||||
VkSubmitInfo submitInfo = {};
|
||||
|
|
@ -1133,10 +1128,16 @@ void Renderer::endSingleTimeCommands(VkCommandBuffer commandBuffer) {
|
|||
vkFreeCommandBuffers(device, commandPool, 1, &commandBuffer);
|
||||
}
|
||||
|
||||
void Renderer::inlineTransitionImageLayout(VkCommandBuffer commandBuffer, VkImage image, VkFormat format,
|
||||
VkImageAspectFlags aspect, VkImageSubresourceRange range,
|
||||
VkImageLayout oldLayout, VkImageLayout newLayout,
|
||||
VkPipelineStageFlags src_stage_mask, VkPipelineStageFlags dst_stage_mask) {
|
||||
void Renderer::inlineTransitionImageLayout(VkCommandBuffer commandBuffer,
|
||||
VkImage image,
|
||||
VkFormat format,
|
||||
VkImageAspectFlags aspect,
|
||||
VkImageSubresourceRange range,
|
||||
VkImageLayout oldLayout,
|
||||
VkImageLayout newLayout,
|
||||
VkPipelineStageFlags src_stage_mask,
|
||||
VkPipelineStageFlags dst_stage_mask)
|
||||
{
|
||||
VkImageMemoryBarrier barrier = {};
|
||||
barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
|
||||
barrier.oldLayout = oldLayout;
|
||||
|
|
@ -1178,11 +1179,11 @@ void Renderer::inlineTransitionImageLayout(VkCommandBuffer commandBuffer, VkImag
|
|||
break;
|
||||
}
|
||||
|
||||
vkCmdPipelineBarrier(commandBuffer, src_stage_mask, dst_stage_mask, 0, 0,
|
||||
nullptr, 0, nullptr, 1, &barrier);
|
||||
vkCmdPipelineBarrier(commandBuffer, src_stage_mask, dst_stage_mask, 0, 0, nullptr, 0, nullptr, 1, &barrier);
|
||||
}
|
||||
|
||||
uint64_t Renderer::hash(const RenderModel& model, const RenderMaterial& material) {
|
||||
uint64_t Renderer::hash(const RenderModel &model, const RenderMaterial &material)
|
||||
{
|
||||
uint64_t hash = 0;
|
||||
hash += reinterpret_cast<intptr_t>((void *)&model);
|
||||
if (material.diffuseTexture)
|
||||
|
|
@ -1196,7 +1197,8 @@ uint64_t Renderer::hash(const RenderModel& model, const RenderMaterial& material
|
|||
return hash;
|
||||
}
|
||||
|
||||
VkDescriptorSet Renderer::createDescriptorFor(const RenderModel& model, const RenderMaterial& material) {
|
||||
VkDescriptorSet Renderer::createDescriptorFor(const RenderModel &model, const RenderMaterial &material)
|
||||
{
|
||||
VkDescriptorSet set;
|
||||
|
||||
VkDescriptorSetAllocateInfo allocateInfo = {};
|
||||
|
|
@ -1309,7 +1311,8 @@ VkDescriptorSet Renderer::createDescriptorFor(const RenderModel& model, const Re
|
|||
return set;
|
||||
}
|
||||
|
||||
void Renderer::createDummyTexture() {
|
||||
void Renderer::createDummyTexture()
|
||||
{
|
||||
VkImageCreateInfo imageInfo = {};
|
||||
imageInfo.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
|
||||
imageInfo.imageType = VK_IMAGE_TYPE_2D;
|
||||
|
|
@ -1333,8 +1336,7 @@ void Renderer::createDummyTexture() {
|
|||
VkMemoryAllocateInfo allocInfo = {};
|
||||
allocInfo.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
|
||||
allocInfo.allocationSize = memRequirements.size;
|
||||
allocInfo.memoryTypeIndex = findMemoryType(
|
||||
memRequirements.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
|
||||
allocInfo.memoryTypeIndex = findMemoryType(memRequirements.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
|
||||
|
||||
vkAllocateMemory(device, &allocInfo, nullptr, &dummyMemory);
|
||||
|
||||
|
|
@ -1358,10 +1360,7 @@ void Renderer::createDummyTexture() {
|
|||
allocInfo = {};
|
||||
allocInfo.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
|
||||
allocInfo.allocationSize = memRequirements.size;
|
||||
allocInfo.memoryTypeIndex =
|
||||
findMemoryType(memRequirements.memoryTypeBits,
|
||||
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
|
||||
VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
|
||||
allocInfo.memoryTypeIndex = findMemoryType(memRequirements.memoryTypeBits, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
|
||||
|
||||
vkAllocateMemory(device, &allocInfo, nullptr, &stagingBufferMemory);
|
||||
|
||||
|
|
@ -1384,9 +1383,12 @@ void Renderer::createDummyTexture() {
|
|||
range.baseArrayLayer = 0;
|
||||
range.layerCount = 1;
|
||||
|
||||
inlineTransitionImageLayout(commandBuffer, dummyImage,
|
||||
imageInfo.format, VK_IMAGE_ASPECT_COLOR_BIT,
|
||||
range, VK_IMAGE_LAYOUT_UNDEFINED,
|
||||
inlineTransitionImageLayout(commandBuffer,
|
||||
dummyImage,
|
||||
imageInfo.format,
|
||||
VK_IMAGE_ASPECT_COLOR_BIT,
|
||||
range,
|
||||
VK_IMAGE_LAYOUT_UNDEFINED,
|
||||
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
|
||||
|
||||
VkBufferImageCopy region = {};
|
||||
|
|
@ -1394,15 +1396,16 @@ void Renderer::createDummyTexture() {
|
|||
region.imageSubresource.mipLevel = 0;
|
||||
region.imageSubresource.baseArrayLayer = 0;
|
||||
region.imageSubresource.layerCount = 1;
|
||||
region.imageExtent = {(uint32_t)1,
|
||||
(uint32_t)1, 1};
|
||||
region.imageExtent = {(uint32_t)1, (uint32_t)1, 1};
|
||||
|
||||
vkCmdCopyBufferToImage(commandBuffer, stagingBuffer, dummyImage,
|
||||
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, ®ion);
|
||||
vkCmdCopyBufferToImage(commandBuffer, stagingBuffer, dummyImage, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, ®ion);
|
||||
|
||||
inlineTransitionImageLayout(commandBuffer, dummyImage,
|
||||
imageInfo.format, VK_IMAGE_ASPECT_COLOR_BIT,
|
||||
range, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
|
||||
inlineTransitionImageLayout(commandBuffer,
|
||||
dummyImage,
|
||||
imageInfo.format,
|
||||
VK_IMAGE_ASPECT_COLOR_BIT,
|
||||
range,
|
||||
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
|
||||
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
|
||||
|
||||
endSingleTimeCommands(commandBuffer);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue