AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-05-15 03:41:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Vulkan Blit command rather than Copy

Browse Source
This commit is contained in:
Jack Andersen 2016-06-28 16:00:02 -10:00
parent b04257c992
commit fba6d10b37
3 changed files with 50 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/boo/graphicsdev/Vulkan.hpp
View File

@ -47,6 +47,7 @@ struct VulkanContext
{ {
struct SwapChain struct SwapChain
{ {
VkFormat m_format = VK_FORMAT_UNDEFINED;
VkSwapchainKHR m_swapChain = VK_NULL_HANDLE; VkSwapchainKHR m_swapChain = VK_NULL_HANDLE;
struct Buffer struct Buffer
{ {

69
lib/graphicsdev/Vulkan.cpp
View File

@ -460,6 +460,7 @@ void VulkanContext::initSwapChain(VulkanContext::Window& windowCtx, VkSurfaceKHR
Window::SwapChain& sc = windowCtx.m_swapChains[windowCtx.m_activeSwapChain]; Window::SwapChain& sc = windowCtx.m_swapChains[windowCtx.m_activeSwapChain];
ThrowIfFailed(vkCreateSwapchainKHR(m_dev, &swapChainInfo, nullptr, &sc.m_swapChain)); ThrowIfFailed(vkCreateSwapchainKHR(m_dev, &swapChainInfo, nullptr, &sc.m_swapChain));
sc.m_format = format;
uint32_t swapchainImageCount; uint32_t swapchainImageCount;
ThrowIfFailed(vkGetSwapchainImagesKHR(m_dev, sc.m_swapChain, &swapchainImageCount, nullptr)); ThrowIfFailed(vkGetSwapchainImagesKHR(m_dev, sc.m_swapChain, &swapchainImageCount, nullptr));
@ -587,6 +588,7 @@ void VulkanContext::resizeSwapChain(VulkanContext::Window& windowCtx, VkSurfaceK
Window::SwapChain& sc = windowCtx.m_swapChains[windowCtx.m_activeSwapChain ^ 1]; Window::SwapChain& sc = windowCtx.m_swapChains[windowCtx.m_activeSwapChain ^ 1];
sc.destroy(m_dev); sc.destroy(m_dev);
ThrowIfFailed(vkCreateSwapchainKHR(m_dev, &swapChainInfo, nullptr, &sc.m_swapChain)); ThrowIfFailed(vkCreateSwapchainKHR(m_dev, &swapChainInfo, nullptr, &sc.m_swapChain));
sc.m_format = format;
uint32_t swapchainImageCount; uint32_t swapchainImageCount;
ThrowIfFailed(vkGetSwapchainImagesKHR(m_dev, sc.m_swapChain, &swapchainImageCount, nullptr)); ThrowIfFailed(vkGetSwapchainImagesKHR(m_dev, sc.m_swapChain, &swapchainImageCount, nullptr));
@ -2292,20 +2294,20 @@ struct VulkanCommandQueue : IGraphicsCommandQueue
if (render && depth) if (render && depth)
{ {
clr[0].clearValue.color.uint32[0] = m_clearColor[0] * 255; clr[0].clearValue.color.float32[0] = m_clearColor[0];
clr[0].clearValue.color.uint32[1] = m_clearColor[1] * 255; clr[0].clearValue.color.float32[1] = m_clearColor[1];
clr[0].clearValue.color.uint32[2] = m_clearColor[2] * 255; clr[0].clearValue.color.float32[2] = m_clearColor[2];
clr[0].clearValue.color.uint32[3] = m_clearColor[3] * 255; clr[0].clearValue.color.float32[3] = m_clearColor[3];
clr[0].aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; clr[0].aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
clr[1].aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT; clr[1].aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT;
vkCmdClearAttachments(m_cmdBufs[m_fillBuf], 2, clr, 1, &rect); vkCmdClearAttachments(m_cmdBufs[m_fillBuf], 2, clr, 1, &rect);
} }
else if (render) else if (render)
{ {
clr[0].clearValue.color.uint32[0] = m_clearColor[0] * 255; clr[0].clearValue.color.float32[0] = m_clearColor[0];
clr[0].clearValue.color.uint32[1] = m_clearColor[1] * 255; clr[0].clearValue.color.float32[1] = m_clearColor[1];
clr[0].clearValue.color.uint32[2] = m_clearColor[2] * 255; clr[0].clearValue.color.float32[2] = m_clearColor[2];
clr[0].clearValue.color.uint32[3] = m_clearColor[3] * 255; clr[0].clearValue.color.float32[3] = m_clearColor[3];
clr[0].aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; clr[0].aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
vkCmdClearAttachments(m_cmdBufs[m_fillBuf], 1, clr, 1, &rect); vkCmdClearAttachments(m_cmdBufs[m_fillBuf], 1, clr, 1, &rect);
} }
@ -2384,22 +2386,41 @@ struct VulkanCommandQueue : IGraphicsCommandQueue
} }
else else
{ {
VkImageCopy copyInfo = {}; if (sc.m_format == VK_FORMAT_R8G8B8A8_UNORM)
copyInfo.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; {
copyInfo.srcSubresource.mipLevel = 0; VkImageCopy copyInfo = {};
copyInfo.srcSubresource.baseArrayLayer = 0; copyInfo.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
copyInfo.srcSubresource.layerCount = 1; copyInfo.srcSubresource.mipLevel = 0;
copyInfo.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; copyInfo.srcSubresource.baseArrayLayer = 0;
copyInfo.dstSubresource.mipLevel = 0; copyInfo.srcSubresource.layerCount = 1;
copyInfo.dstSubresource.baseArrayLayer = 0; copyInfo.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
copyInfo.dstSubresource.layerCount = 1; copyInfo.dstSubresource.mipLevel = 0;
copyInfo.extent.width = csource->m_width; copyInfo.dstSubresource.baseArrayLayer = 0;
copyInfo.extent.height = csource->m_height; copyInfo.dstSubresource.layerCount = 1;
copyInfo.extent.depth = 1; copyInfo.extent.width = csource->m_width;
vkCmdCopyImage(cmdBuf, copyInfo.extent.height = csource->m_height;
csource->m_colorTex, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, copyInfo.extent.depth = 1;
dest.m_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, vkCmdCopyImage(cmdBuf,
1, &copyInfo); csource->m_colorTex, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
dest.m_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
1, &copyInfo);
}
else
{
VkImageBlit blitInfo = {};
blitInfo.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
blitInfo.srcSubresource.layerCount = 1;
blitInfo.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
blitInfo.dstSubresource.layerCount = 1;
blitInfo.dstOffsets[1].x = csource->m_width;
blitInfo.dstOffsets[1].y = csource->m_height;
blitInfo.srcOffsets[1].x = csource->m_width;
blitInfo.srcOffsets[1].y = csource->m_height;
vkCmdBlitImage(cmdBuf,
csource->m_colorTex, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
dest.m_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
1, &blitInfo, VK_FILTER_NEAREST);
}
} }
SetImageLayout(cmdBuf, dest.m_image, VK_IMAGE_ASPECT_COLOR_BIT, SetImageLayout(cmdBuf, dest.m_image, VK_IMAGE_ASPECT_COLOR_BIT,

8
test/main.cpp
View File

@ -239,8 +239,8 @@ struct TestApplicationCallback : IApplicationCallback
/* Make Tri-strip VBO */ /* Make Tri-strip VBO */
struct Vert struct Vert
{ {
float pos[3]; float pos[4];
float uv[2]; float uv[4];
}; };
static const Vert quad[4] = static const Vert quad[4] =
{ {
@ -255,8 +255,8 @@ struct TestApplicationCallback : IApplicationCallback
/* Make vertex format */ /* Make vertex format */
VertexElementDescriptor descs[2] = VertexElementDescriptor descs[2] =
{ {
{vbo, nullptr, VertexSemantic::Position3}, {vbo, nullptr, VertexSemantic::Position4},
{vbo, nullptr, VertexSemantic::UV2} {vbo, nullptr, VertexSemantic::UV4}
}; };
IVertexFormat* vfmt = ctx.newVertexFormat(2, descs); IVertexFormat* vfmt = ctx.newVertexFormat(2, descs);