This commit is contained in:
Joshua Ashton 2022-08-12 13:34:04 +01:00
parent 5951784c97
commit ee4bf54bf3
4 changed files with 32 additions and 8 deletions

View File

@ -8,6 +8,13 @@
namespace orange
{
class BufferPool
{
private:
VkBuffer m_buffer;
VkDeviceAddress m_va;
};
template <typename T>
using VulkanResult = Result<T, VkResult, VK_SUCCESS, VK_ERROR_UNKNOWN, VK_ERROR_UNKNOWN>;

View File

@ -27,4 +27,17 @@ namespace orange
.baseArrayLayer = 0,
.layerCount = 1,
};
constexpr VkFormat FormatToSrgbFormat(VkFormat format)
{
switch (format)
{
case VK_FORMAT_R8G8B8A8_UNORM:
return VK_FORMAT_R8G8B8A8_SRGB;
case VK_FORMAT_B8G8R8A8_UNORM:
return VK_FORMAT_B8G8R8A8_SRGB;
default:
return format;
}
}
}

View File

@ -230,7 +230,7 @@ int main(int argc, char** argv)
VkPipelineRasterizationStateCreateInfo rasterizationInfo =
{
.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO,
.cullMode = VK_CULL_MODE_NONE, //VK_CULL_MODE_BACK_BIT,
.cullMode = VK_CULL_MODE_NONE, //VK_CULL_MODE_BACK_BIT,
.frontFace = VK_FRONT_FACE_CLOCKWISE,
};
@ -295,7 +295,8 @@ int main(int argc, char** argv)
while (r_window->Update())
{
r_renderContext->BeginCommandBuffer(r_swapchain->CommandBuffer());
VkCommandBuffer cmdBuf = r_swapchain->CommandBuffer();
r_renderContext->BeginCommandBuffer(cmdBuf);
{
VkViewport viewport =
{
@ -313,8 +314,10 @@ int main(int argc, char** argv)
.extent = r_swapchain->Extent(),
};
vkCmdSetViewport(r_swapchain->CommandBuffer(), 0, 1, &viewport);
vkCmdSetScissor(r_swapchain->CommandBuffer(), 0, 1, &scissor);
vkCmdSetViewport(cmdBuf, 0, 1, &viewport);
vkCmdSetScissor(cmdBuf, 0, 1, &scissor);
vkCmdBindPipeline(cmdBuf, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
const VkRenderingAttachmentInfoKHR attachmentInfo =
{
@ -334,10 +337,11 @@ int main(int argc, char** argv)
.colorAttachmentCount = 1,
.pColorAttachments = &attachmentInfo,
};
vkCmdBeginRendering(r_swapchain->CommandBuffer(), &renderInfo);
vkCmdEndRendering(r_swapchain->CommandBuffer());
vkCmdBeginRendering(cmdBuf, &renderInfo);
vkCmdDraw(cmdBuf, 3, 1, 0, 0);
vkCmdEndRendering(cmdBuf);
}
r_renderContext->EndCommandBuffer(r_swapchain->CommandBuffer());
r_renderContext->EndCommandBuffer(cmdBuf);
r_swapchain->Present();
}

View File

@ -111,7 +111,7 @@ namespace orange
.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
.image = swapchainImages[i],
.viewType = VK_IMAGE_VIEW_TYPE_2D,
.format = r_format->format,
.format = FormatToSrgbFormat(r_format->format),
.subresourceRange = FirstMipSubresourceRange,
};