quick/Quake-III-Arena-VS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
Artem Kharytoniuk 2017-05-28 23:31:36 +03:00
parent d82b2e6d5f
commit 7bf5958eb7
1 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/engine/renderer/vk.cpp
View File

@ -710,35 +710,44 @@ void vk_initialize() {
vkGetDeviceQueue(vk.device, vk.queue_family_index, 0, &vk.queue); vkGetDeviceQueue(vk.device, vk.queue_family_index, 0, &vk.queue);
vk.swapchain = create_swapchain(vk.physical_device, vk.device, vk.surface, vk.surface_format); //
// Swapchain.
//
{
vk.swapchain = create_swapchain(vk.physical_device, vk.device, vk.surface, vk.surface_format);
VK_CHECK(vkGetSwapchainImagesKHR(vk.device, vk.swapchain, &vk.swapchain_image_count, nullptr)); VK_CHECK(vkGetSwapchainImagesKHR(vk.device, vk.swapchain, &vk.swapchain_image_count, nullptr));
if (vk.swapchain_image_count > MAX_SWAPCHAIN_IMAGES)
vk.swapchain_image_count = MAX_SWAPCHAIN_IMAGES;
if (vk.swapchain_image_count > MAX_SWAPCHAIN_IMAGES) VkResult result = vkGetSwapchainImagesKHR(vk.device, vk.swapchain, &vk.swapchain_image_count, vk.swapchain_images);
ri.Error( ERR_FATAL, "initialize_vulkan: swapchain image count (%d) exceeded limit (%d)", vk.swapchain_image_count, MAX_SWAPCHAIN_IMAGES ); if (result != VK_SUCCESS && result != VK_INCOMPLETE)
ri.Error(ERR_FATAL, "vk_initialize: vkGetSwapchainImagesKHR failed");
VK_CHECK(vkGetSwapchainImagesKHR(vk.device, vk.swapchain, &vk.swapchain_image_count, vk.swapchain_images)); for (uint32_t i = 0; i < vk.swapchain_image_count; i++) {
VkImageViewCreateInfo desc;
for (std::size_t i = 0; i < vk.swapchain_image_count; i++) { desc.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
VkImageViewCreateInfo desc; desc.pNext = nullptr;
desc.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; desc.flags = 0;
desc.pNext = nullptr; desc.image = vk.swapchain_images[i];
desc.flags = 0; desc.viewType = VK_IMAGE_VIEW_TYPE_2D;
desc.image = vk.swapchain_images[i]; desc.format = vk.surface_format.format;
desc.viewType = VK_IMAGE_VIEW_TYPE_2D; desc.components.r = VK_COMPONENT_SWIZZLE_IDENTITY;
desc.format = vk.surface_format.format; desc.components.g = VK_COMPONENT_SWIZZLE_IDENTITY;
desc.components.r = VK_COMPONENT_SWIZZLE_IDENTITY; desc.components.b = VK_COMPONENT_SWIZZLE_IDENTITY;
desc.components.g = VK_COMPONENT_SWIZZLE_IDENTITY; desc.components.a = VK_COMPONENT_SWIZZLE_IDENTITY;
desc.components.b = VK_COMPONENT_SWIZZLE_IDENTITY; desc.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
desc.components.a = VK_COMPONENT_SWIZZLE_IDENTITY; desc.subresourceRange.baseMipLevel = 0;
desc.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; desc.subresourceRange.levelCount = 1;
desc.subresourceRange.baseMipLevel = 0; desc.subresourceRange.baseArrayLayer = 0;
desc.subresourceRange.levelCount = 1; desc.subresourceRange.layerCount = 1;
desc.subresourceRange.baseArrayLayer = 0; VK_CHECK(vkCreateImageView(vk.device, &desc, nullptr, &vk.swapchain_image_views[i]));
desc.subresourceRange.layerCount = 1; }
VK_CHECK(vkCreateImageView(vk.device, &desc, nullptr, &vk.swapchain_image_views[i]));
} }
//
// Command pool.
//
{ {
VkCommandPoolCreateInfo desc; VkCommandPoolCreateInfo desc;
desc.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; desc.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO;
@ -749,6 +758,9 @@ void vk_initialize() {
VK_CHECK(vkCreateCommandPool(vk.device, &desc, nullptr, &vk.command_pool)); VK_CHECK(vkCreateCommandPool(vk.device, &desc, nullptr, &vk.command_pool));
} }
//
// Command buffer.
//
{ {
VkCommandBufferAllocateInfo alloc_info; VkCommandBufferAllocateInfo alloc_info;
alloc_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; alloc_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;