diff options
Diffstat (limited to 'demos/cube.cpp')
| -rw-r--r-- | demos/cube.cpp | 1101 |
1 files changed, 415 insertions, 686 deletions
diff --git a/demos/cube.cpp b/demos/cube.cpp index 7f3155f2..4d9c7224 100644 --- a/demos/cube.cpp +++ b/demos/cube.cpp @@ -56,18 +56,18 @@ #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) #ifdef _WIN32 -#define ERR_EXIT(err_msg, err_class) \ - do { \ - if (!suppress_popups) \ - MessageBox(nullptr, err_msg, err_class, MB_OK); \ - exit(1); \ +#define ERR_EXIT(err_msg, err_class) \ + do { \ + if (!suppress_popups) \ + MessageBox(nullptr, err_msg, err_class, MB_OK); \ + exit(1); \ } while (0) #else -#define ERR_EXIT(err_msg, err_class) \ - do { \ - printf(err_msg); \ - fflush(stdout); \ - exit(1); \ +#define ERR_EXIT(err_msg, err_class) \ + do { \ + printf(err_msg); \ + fflush(stdout); \ + exit(1); \ } while (0) #endif @@ -75,14 +75,14 @@ struct texture_object { vk::Sampler sampler; vk::Image image; - vk::ImageLayout imageLayout { vk::ImageLayout::eUndefined }; + vk::ImageLayout imageLayout{vk::ImageLayout::eUndefined}; vk::MemoryAllocateInfo mem_alloc; vk::DeviceMemory mem; vk::ImageView view; - int32_t tex_width {0}; - int32_t tex_height {0}; + int32_t tex_width{0}; + int32_t tex_height{0}; }; static char const *const tex_files[] = {"lunarg.ppm"}; @@ -209,29 +209,22 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); #endif #if defined(VK_USE_PLATFORM_WAYLAND_KHR) -static void handle_ping(void *data, wl_shell_surface *shell_surface, - uint32_t serial) { +static void handle_ping(void *data, wl_shell_surface *shell_surface, uint32_t serial) { wl_shell_surface_pong(shell_surface, serial); } -static void handle_configure(void *data, wl_shell_surface *shell_surface, - uint32_t edges, int32_t width, int32_t height) {} +static void handle_configure(void *data, wl_shell_surface *shell_surface, uint32_t edges, int32_t width, int32_t height) {} static void handle_popup_done(void *data, wl_shell_surface *shell_surface) {} -static const wl_shell_surface_listener shell_surface_listener = { - handle_ping, handle_configure, handle_popup_done}; +static const wl_shell_surface_listener shell_surface_listener = {handle_ping, handle_configure, handle_popup_done}; -static void handle_announce_global_object(void *data, - struct wl_registry *wl_registry, - uint32_t name, const char *interface, +static void handle_announce_global_object(void *data, struct wl_registry *wl_registry, uint32_t name, const char *interface, uint32_t version) {} -static void handle_announce_global_object_remove( - void *data, struct wl_registry *wl_registry, uint32_t name) {} +static void handle_announce_global_object_remove(void *data, struct wl_registry *wl_registry, uint32_t name) {} -static const wl_registry_listener registry_listener = { - handle_announce_global_object, handle_announce_global_object_remove}; +static const wl_registry_listener registry_listener = {handle_announce_global_object, handle_announce_global_object_remove}; #elif defined(VK_USE_PLATFORM_MIR_KHR) #endif @@ -240,29 +233,23 @@ struct Demo { : #if defined(VK_USE_PLATFORM_WIN32_KHR) connection{nullptr}, - window{nullptr}, - minsize(POINT{ - 0, 0}), // Use explicit construction to avoid MSVC error C2797. + window{nullptr}, minsize(POINT{0, 0}), // Use explicit construction to avoid MSVC error C2797. #endif #if defined(VK_USE_PLATFORM_XLIB_KHR) - xlib_window{0}, - xlib_wm_delete_window{0}, display{nullptr}, + xlib_window{0}, xlib_wm_delete_window{0}, display{nullptr}, #elif defined(VK_USE_PLATFORM_XCB_KHR) - xcb_window{0}, screen{nullptr}, connection{nullptr}, + xcb_window{0}, + screen{nullptr}, connection{nullptr}, #elif defined(VK_USE_PLATFORM_WAYLAND_KHR) display{nullptr}, - registry{nullptr}, compositor{nullptr}, window{nullptr}, - shell{nullptr}, shell_surface{nullptr}, + registry{nullptr}, compositor{nullptr}, window{nullptr}, shell{nullptr}, shell_surface{nullptr}, #elif defined(VK_USE_PLATFORM_MIR_KHR) #endif - prepared{false}, use_staging_buffer{false}, use_xlib{false}, - graphics_queue_family_index{0}, present_queue_family_index{0}, - enabled_extension_count{0}, enabled_layer_count{0}, width{0}, - height{0}, swapchainImageCount{0}, frame_index{0}, spin_angle{0.0f}, - spin_increment{0.0f}, pause{false}, quit{false}, curFrame{0}, - frameCount{0}, validate{false}, use_break{false}, - suppress_popups{false}, current_buffer{0}, queue_family_count{0} { + prepared{false}, use_staging_buffer{false}, use_xlib{false}, graphics_queue_family_index{0}, + present_queue_family_index{0}, enabled_extension_count{0}, enabled_layer_count{0}, width{0}, height{0}, + swapchainImageCount{0}, frame_index{0}, spin_angle{0.0f}, spin_increment{0.0f}, pause{false}, quit{false}, curFrame{0}, + frameCount{0}, validate{false}, use_break{false}, suppress_popups{false}, current_buffer{0}, queue_family_count{0} { #if defined(VK_USE_PLATFORM_WIN32_KHR) memset(name, '\0', APP_NAME_STR_LEN); #endif @@ -272,8 +259,7 @@ struct Demo { } void build_image_ownership_cmd(uint32_t const &i) { - auto const cmd_buf_info = vk::CommandBufferBeginInfo().setFlags( - vk::CommandBufferUsageFlagBits::eSimultaneousUse); + auto const cmd_buf_info = vk::CommandBufferBeginInfo().setFlags(vk::CommandBufferUsageFlagBits::eSimultaneousUse); auto result = buffers[i].graphics_to_present_cmd.begin(&cmd_buf_info); VERIFY(result == vk::Result::eSuccess); @@ -286,22 +272,18 @@ struct Demo { .setSrcQueueFamilyIndex(graphics_queue_family_index) .setDstQueueFamilyIndex(present_queue_family_index) .setImage(buffers[i].image) - .setSubresourceRange(vk::ImageSubresourceRange( - vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1)); + .setSubresourceRange(vk::ImageSubresourceRange(vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1)); buffers[i].graphics_to_present_cmd.pipelineBarrier( - vk::PipelineStageFlagBits::eColorAttachmentOutput, - vk::PipelineStageFlagBits::eColorAttachmentOutput, - vk::DependencyFlagBits(), 0, nullptr, 0, nullptr, 1, - &image_ownership_barrier); + vk::PipelineStageFlagBits::eColorAttachmentOutput, vk::PipelineStageFlagBits::eColorAttachmentOutput, + vk::DependencyFlagBits(), 0, nullptr, 0, nullptr, 1, &image_ownership_barrier); result = buffers[i].graphics_to_present_cmd.end(); VERIFY(result == vk::Result::eSuccess); } - vk::Bool32 check_layers(uint32_t check_count, - char const *const *const check_names, - uint32_t layer_count, vk::LayerProperties *layers) { + vk::Bool32 check_layers(uint32_t check_count, char const *const *const check_names, uint32_t layer_count, + vk::LayerProperties *layers) { for (uint32_t i = 0; i < check_count; i++) { vk::Bool32 found = VK_FALSE; for (uint32_t j = 0; j < layer_count; j++) { @@ -406,8 +388,7 @@ struct Demo { .setEnabledLayerCount(0) .setPpEnabledLayerNames(nullptr) .setEnabledExtensionCount(enabled_extension_count) - .setPpEnabledExtensionNames( - (const char *const *)extension_names) + .setPpEnabledExtensionNames((const char *const *)extension_names) .setPEnabledFeatures(nullptr); if (separate_present_queue) { @@ -433,9 +414,8 @@ struct Demo { device.resetFences(1, &fences[frame_index]); // Get the index of the next available swapchain image: - auto result = device.acquireNextImageKHR( - swapchain, UINT64_MAX, image_acquired_semaphores[frame_index], - fences[frame_index], ¤t_buffer); + auto result = device.acquireNextImageKHR(swapchain, UINT64_MAX, image_acquired_semaphores[frame_index], fences[frame_index], + ¤t_buffer); if (result == vk::Result::eErrorOutOfDateKHR) { // swapchain is out of date (e.g. the window was resized) and // must be recreated: @@ -456,17 +436,15 @@ struct Demo { // that the image won't be rendered to until the presentation // engine has fully released ownership to the application, and it is // okay to render to the image. - vk::PipelineStageFlags const pipe_stage_flags = - vk::PipelineStageFlagBits::eColorAttachmentOutput; - auto const submit_info = - vk::SubmitInfo() - .setPWaitDstStageMask(&pipe_stage_flags) - .setWaitSemaphoreCount(1) - .setPWaitSemaphores(&image_acquired_semaphores[frame_index]) - .setCommandBufferCount(1) - .setPCommandBuffers(&buffers[current_buffer].cmd) - .setSignalSemaphoreCount(1) - .setPSignalSemaphores(&draw_complete_semaphores[frame_index]); + vk::PipelineStageFlags const pipe_stage_flags = vk::PipelineStageFlagBits::eColorAttachmentOutput; + auto const submit_info = vk::SubmitInfo() + .setPWaitDstStageMask(&pipe_stage_flags) + .setWaitSemaphoreCount(1) + .setPWaitSemaphores(&image_acquired_semaphores[frame_index]) + .setCommandBufferCount(1) + .setPCommandBuffers(&buffers[current_buffer].cmd) + .setSignalSemaphoreCount(1) + .setPSignalSemaphores(&draw_complete_semaphores[frame_index]); result = graphics_queue.submit(1, &submit_info, vk::Fence()); VERIFY(result == vk::Result::eSuccess); @@ -476,17 +454,14 @@ struct Demo { // present queue before presenting, waiting for the draw complete // semaphore and signalling the ownership released semaphore when // finished - auto const submit_info = - vk::SubmitInfo() - .setPWaitDstStageMask(&pipe_stage_flags) - .setWaitSemaphoreCount(1) - .setPWaitSemaphores(&draw_complete_semaphores[frame_index]) - .setCommandBufferCount(1) - .setPCommandBuffers( - &buffers[current_buffer].graphics_to_present_cmd) - .setSignalSemaphoreCount(1) - .setPSignalSemaphores( - &image_ownership_semaphores[frame_index]); + auto const submit_info = vk::SubmitInfo() + .setPWaitDstStageMask(&pipe_stage_flags) + .setWaitSemaphoreCount(1) + .setPWaitSemaphores(&draw_complete_semaphores[frame_index]) + .setCommandBufferCount(1) + .setPCommandBuffers(&buffers[current_buffer].graphics_to_present_cmd) + .setSignalSemaphoreCount(1) + .setPSignalSemaphores(&image_ownership_semaphores[frame_index]); result = present_queue.submit(1, &submit_info, vk::Fence()); VERIFY(result == vk::Result::eSuccess); @@ -494,16 +469,13 @@ struct Demo { // If we are using separate queues we have to wait for image ownership, // otherwise wait for draw complete - auto const presentInfo = - vk::PresentInfoKHR() - .setWaitSemaphoreCount(1) - .setPWaitSemaphores( - separate_present_queue - ? &image_ownership_semaphores[frame_index] - : &draw_complete_semaphores[frame_index]) - .setSwapchainCount(1) - .setPSwapchains(&swapchain) - .setPImageIndices(¤t_buffer); + auto const presentInfo = vk::PresentInfoKHR() + .setWaitSemaphoreCount(1) + .setPWaitSemaphores(separate_present_queue ? &image_ownership_semaphores[frame_index] + : &draw_complete_semaphores[frame_index]) + .setSwapchainCount(1) + .setPSwapchains(&swapchain) + .setPImageIndices(¤t_buffer); result = present_queue.presentKHR(&presentInfo); frame_index += 1; @@ -521,41 +493,30 @@ struct Demo { } void draw_build_cmd(vk::CommandBuffer commandBuffer) { - auto const commandInfo = vk::CommandBufferBeginInfo().setFlags( - vk::CommandBufferUsageFlagBits::eSimultaneousUse); - - vk::ClearValue const clearValues[2] = { - vk::ClearColorValue(std::array<float, 4>({{0.2f, 0.2f, 0.2f, 0.2f}})), - vk::ClearDepthStencilValue(1.0f, 0u)}; - - auto const passInfo = - vk::RenderPassBeginInfo() - .setRenderPass(render_pass) - .setFramebuffer(framebuffers[current_buffer]) - .setRenderArea( - vk::Rect2D(vk::Offset2D(0, 0), - vk::Extent2D((uint32_t)width, (uint32_t)height))) - .setClearValueCount(2) - .setPClearValues(clearValues); + auto const commandInfo = vk::CommandBufferBeginInfo().setFlags(vk::CommandBufferUsageFlagBits::eSimultaneousUse); + + vk::ClearValue const clearValues[2] = {vk::ClearColorValue(std::array<float, 4>({{0.2f, 0.2f, 0.2f, 0.2f}})), + vk::ClearDepthStencilValue(1.0f, 0u)}; + + auto const passInfo = vk::RenderPassBeginInfo() + .setRenderPass(render_pass) + .setFramebuffer(framebuffers[current_buffer]) + .setRenderArea(vk::Rect2D(vk::Offset2D(0, 0), vk::Extent2D((uint32_t)width, (uint32_t)height))) + .setClearValueCount(2) + .setPClearValues(clearValues); auto result = commandBuffer.begin(&commandInfo); VERIFY(result == vk::Result::eSuccess); commandBuffer.beginRenderPass(&passInfo, vk::SubpassContents::eInline); commandBuffer.bindPipeline(vk::PipelineBindPoint::eGraphics, pipeline); - commandBuffer.bindDescriptorSets(vk::PipelineBindPoint::eGraphics, - pipeline_layout, 0, 1, &desc_set, 0, - nullptr); - - auto const viewport = vk::Viewport() - .setWidth((float)width) - .setHeight((float)height) - .setMinDepth((float)0.0f) - .setMaxDepth((float)1.0f); + commandBuffer.bindDescriptorSets(vk::PipelineBindPoint::eGraphics, pipeline_layout, 0, 1, &desc_set, 0, nullptr); + + auto const viewport = + vk::Viewport().setWidth((float)width).setHeight((float)height).setMinDepth((float)0.0f).setMaxDepth((float)1.0f); commandBuffer.setViewport(0, 1, &viewport); - vk::Rect2D const scissor(vk::Offset2D(0, 0), - vk::Extent2D(width, height)); + vk::Rect2D const scissor(vk::Offset2D(0, 0), vk::Extent2D(width, height)); commandBuffer.setScissor(0, 1, &scissor); commandBuffer.draw(12 * 3, 1, 0, 0); // Note that ending the renderpass changes the image's layout from @@ -581,14 +542,11 @@ struct Demo { .setSrcQueueFamilyIndex(graphics_queue_family_index) .setDstQueueFamilyIndex(present_queue_family_index) .setImage(buffers[current_buffer].image) - .setSubresourceRange(vk::ImageSubresourceRange( - vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1)); + .setSubresourceRange(vk::ImageSubresourceRange(vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1)); - commandBuffer.pipelineBarrier( - vk::PipelineStageFlagBits::eColorAttachmentOutput, - vk::PipelineStageFlagBits::eBottomOfPipe, - vk::DependencyFlagBits(), 0, nullptr, 0, nullptr, 1, - &image_ownership_barrier); + commandBuffer.pipelineBarrier(vk::PipelineStageFlagBits::eColorAttachmentOutput, + vk::PipelineStageFlagBits::eBottomOfPipe, vk::DependencyFlagBits(), 0, nullptr, 0, + nullptr, 1, &image_ownership_barrier); } result = commandBuffer.end(); @@ -612,9 +570,7 @@ struct Demo { device.createFence(&fenceInfo, nullptr, &fence); vk::CommandBuffer const commandBuffers[] = {cmd}; - auto const submitInfo = - vk::SubmitInfo().setCommandBufferCount(1).setPCommandBuffers( - commandBuffers); + auto const submitInfo = vk::SubmitInfo().setCommandBufferCount(1).setPCommandBuffers(commandBuffers); result = graphics_queue.submit(1, &submitInfo, fence); VERIFY(result == vk::Result::eSuccess); @@ -642,9 +598,8 @@ struct Demo { use_staging_buffer = true; continue; } - if ((strcmp(argv[i], "--present_mode") == 0) && - (i < argc - 1)) { - presentMode = (vk::PresentModeKHR)atoi(argv[i+1]); + if ((strcmp(argv[i], "--present_mode") == 0) && (i < argc - 1)) { + presentMode = (vk::PresentModeKHR)atoi(argv[i + 1]); i++; continue; } @@ -660,8 +615,8 @@ struct Demo { fprintf(stderr, "--xlib is deprecated and no longer does anything"); continue; } - if (strcmp(argv[i], "--c") == 0 && frameCount == UINT32_MAX && - i < argc - 1 && sscanf(argv[i + 1], "%d", &frameCount) == 1) { + if (strcmp(argv[i], "--c") == 0 && frameCount == UINT32_MAX && i < argc - 1 && + sscanf(argv[i + 1], "%d", &frameCount) == 1) { i++; continue; } @@ -670,15 +625,14 @@ struct Demo { continue; } - fprintf(stderr, - "Usage:\n %s [--use_staging] [--validate] [--break] " - "[--c <framecount>] [--suppress_popups] [--present_mode <present mode enum>]\n" - "VK_PRESENT_MODE_IMMEDIATE_KHR = %d\n" - "VK_PRESENT_MODE_MAILBOX_KHR = %d\n" - "VK_PRESENT_MODE_FIFO_KHR = %d\n" - "VK_PRESENT_MODE_FIFO_RELAXED_KHR = %d\n", - APP_SHORT_NAME, VK_PRESENT_MODE_IMMEDIATE_KHR, VK_PRESENT_MODE_MAILBOX_KHR, - VK_PRESENT_MODE_FIFO_KHR, VK_PRESENT_MODE_FIFO_RELAXED_KHR); + fprintf(stderr, "Usage:\n %s [--use_staging] [--validate] [--break] " + "[--c <framecount>] [--suppress_popups] [--present_mode <present mode enum>]\n" + "VK_PRESENT_MODE_IMMEDIATE_KHR = %d\n" + "VK_PRESENT_MODE_MAILBOX_KHR = %d\n" + "VK_PRESENT_MODE_FIFO_KHR = %d\n" + "VK_PRESENT_MODE_FIFO_RELAXED_KHR = %d\n", + APP_SHORT_NAME, VK_PRESENT_MODE_IMMEDIATE_KHR, VK_PRESENT_MODE_MAILBOX_KHR, VK_PRESENT_MODE_FIFO_KHR, + VK_PRESENT_MODE_FIFO_RELAXED_KHR); fflush(stderr); exit(1); } @@ -696,13 +650,11 @@ struct Demo { spin_increment = 0.2f; pause = false; - mat4x4_perspective(projection_matrix, (float)degreesToRadians(45.0f), - 1.0f, 0.1f, 100.0f); + mat4x4_perspective(projection_matrix, (float)degreesToRadians(45.0f), 1.0f, 0.1f, 100.0f); mat4x4_look_at(view_matrix, eye, origin, up); mat4x4_identity(model_matrix); - projection_matrix[1][1] *= - -1; // Flip projection matrix from GL to Vulkan orientation. + projection_matrix[1][1] *= -1; // Flip projection matrix from GL to Vulkan orientation. } void init_connection() { @@ -750,54 +702,38 @@ struct Demo { enabled_extension_count = 0; enabled_layer_count = 0; - char const *const instance_validation_layers_alt1[] = { - "VK_LAYER_LUNARG_standard_validation"}; + char const *const instance_validation_layers_alt1[] = {"VK_LAYER_LUNARG_standard_validation"}; char const *const instance_validation_layers_alt2[] = { - "VK_LAYER_GOOGLE_threading", - "VK_LAYER_LUNARG_parameter_validation", - "VK_LAYER_LUNARG_object_tracker", - "VK_LAYER_LUNARG_image", - "VK_LAYER_LUNARG_core_validation", - "VK_LAYER_LUNARG_swapchain", + "VK_LAYER_GOOGLE_threading", "VK_LAYER_LUNARG_parameter_validation", "VK_LAYER_LUNARG_object_tracker", + "VK_LAYER_LUNARG_image", "VK_LAYER_LUNARG_core_validation", "VK_LAYER_LUNARG_swapchain", "VK_LAYER_GOOGLE_unique_objects"}; // Look for validation layers vk::Bool32 validation_found = VK_FALSE; if (validate) { - auto result = vk::enumerateInstanceLayerProperties( - &instance_layer_count, nullptr); + auto result = vk::enumerateInstanceLayerProperties(&instance_layer_count, nullptr); VERIFY(result == vk::Result::eSuccess); instance_validation_layers = instance_validation_layers_alt1; if (instance_layer_count > 0) { - std::unique_ptr<vk::LayerProperties[]> instance_layers( - new vk::LayerProperties[instance_layer_count]); - result = vk::enumerateInstanceLayerProperties( - &instance_layer_count, instance_layers.get()); + std::unique_ptr<vk::LayerProperties[]> instance_layers(new vk::LayerProperties[instance_layer_count]); + result = vk::enumerateInstanceLayerProperties(&instance_layer_count, instance_layers.get()); VERIFY(result == vk::Result::eSuccess); - validation_found = - check_layers(ARRAY_SIZE(instance_validation_layers_alt1), - instance_validation_layers, - instance_layer_count, instance_layers.get()); + validation_found = check_layers(ARRAY_SIZE(instance_validation_layers_alt1), instance_validation_layers, + instance_layer_count, instance_layers.get()); if (validation_found) { - enabled_layer_count = - ARRAY_SIZE(instance_validation_layers_alt1); + enabled_layer_count = ARRAY_SIZE(instance_validation_layers_alt1); enabled_layers[0] = "VK_LAYER_LUNARG_standard_validation"; validation_layer_count = 1; } else { // use alternative set of validation layers - instance_validation_layers = - instance_validation_layers_alt2; - enabled_layer_count = - ARRAY_SIZE(instance_validation_layers_alt2); - validation_found = check_layers( - ARRAY_SIZE(instance_validation_layers_alt2), - instance_validation_layers, instance_layer_count, - instance_layers.get()); - validation_layer_count = - ARRAY_SIZE(instance_validation_layers_alt2); + instance_validation_layers = instance_validation_layers_alt2; + enabled_layer_count = ARRAY_SIZE(instance_validation_layers_alt2); + validation_found = check_layers(ARRAY_SIZE(instance_validation_layers_alt2), instance_validation_layers, + instance_layer_count, instance_layers.get()); + validation_layer_count = ARRAY_SIZE(instance_validation_layers_alt2); for (uint32_t i = 0; i < validation_layer_count; i++) { enabled_layers[i] = instance_validation_layers[i]; } @@ -818,51 +754,38 @@ struct Demo { vk::Bool32 platformSurfaceExtFound = VK_FALSE; memset(extension_names, 0, sizeof(extension_names)); - auto result = vk::enumerateInstanceExtensionProperties( - nullptr, &instance_extension_count, nullptr); + auto result = vk::enumerateInstanceExtensionProperties(nullptr, &instance_extension_count, nullptr); VERIFY(result == vk::Result::eSuccess); if (instance_extension_count > 0) { - std::unique_ptr<vk::ExtensionProperties[]> instance_extensions( - new vk::ExtensionProperties[instance_extension_count]); - result = vk::enumerateInstanceExtensionProperties( - nullptr, &instance_extension_count, instance_extensions.get()); + std::unique_ptr<vk::ExtensionProperties[]> instance_extensions(new vk::ExtensionProperties[instance_extension_count]); + result = vk::enumerateInstanceExtensionProperties(nullptr, &instance_extension_count, instance_extensions.get()); VERIFY(result == vk::Result::eSuccess); for (uint32_t i = 0; i < instance_extension_count; i++) { - if (!strcmp(VK_KHR_SURFACE_EXTENSION_NAME, - instance_extensions[i].extensionName)) { + if (!strcmp(VK_KHR_SURFACE_EXTENSION_NAME, instance_extensions[i].extensionName)) { surfaceExtFound = 1; - extension_names[enabled_extension_count++] = - VK_KHR_SURFACE_EXTENSION_NAME; + extension_names[enabled_extension_count++] = VK_KHR_SURFACE_EXTENSION_NAME; } #if defined(VK_USE_PLATFORM_WIN32_KHR) - if (!strcmp(VK_KHR_WIN32_SURFACE_EXTENSION_NAME, - instance_extensions[i].extensionName)) { + if (!strcmp(VK_KHR_WIN32_SURFACE_EXTENSION_NAME, instance_extensions[i].extensionName)) { platformSurfaceExtFound = 1; - extension_names[enabled_extension_count++] = - VK_KHR_WIN32_SURFACE_EXTENSION_NAME; + extension_names[enabled_extension_count++] = VK_KHR_WIN32_SURFACE_EXTENSION_NAME; } #elif defined(VK_USE_PLATFORM_XLIB_KHR) - if (!strcmp(VK_KHR_XLIB_SURFACE_EXTENSION_NAME, - instance_extensions[i].extensionName)) { + if (!strcmp(VK_KHR_XLIB_SURFACE_EXTENSION_NAME, instance_extensions[i].extensionName)) { platformSurfaceExtFound = 1; - extension_names[enabled_extension_count++] = - VK_KHR_XLIB_SURFACE_EXTENSION_NAME; + extension_names[enabled_extension_count++] = VK_KHR_XLIB_SURFACE_EXTENSION_NAME; } #elif defined(VK_USE_PLATFORM_XCB_KHR) - if (!strcmp(VK_KHR_XCB_SURFACE_EXTENSION_NAME, - instance_extensions[i].extensionName)) { + if (!strcmp(VK_KHR_XCB_SURFACE_EXTENSION_NAME, instance_extensions[i].extensionName)) { platformSurfaceExtFound = 1; - extension_names[enabled_extension_count++] = - VK_KHR_XCB_SURFACE_EXTENSION_NAME; + extension_names[enabled_extension_count++] = VK_KHR_XCB_SURFACE_EXTENSION_NAME; } #elif defined(VK_USE_PLATFORM_WAYLAND_KHR) - if (!strcmp(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME, - instance_extensions[i].extensionName)) { + if (!strcmp(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME, instance_extensions[i].extensionName)) { platformSurfaceExtFound = 1; - extension_names[enabled_extension_count++] = - VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME; + extension_names[enabled_extension_count++] = VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME; } #elif defined(VK_USE_PLATFORM_MIR_KHR) #endif @@ -883,8 +806,7 @@ struct Demo { if (!platformSurfaceExtFound) { #if defined(VK_USE_PLATFORM_WIN32_KHR) ERR_EXIT("vkEnumerateInstanceExtensionProperties failed to find " - "the " VK_KHR_WIN32_SURFACE_EXTENSION_NAME - " extension.\n\n" + "the " VK_KHR_WIN32_SURFACE_EXTENSION_NAME " extension.\n\n" "Do you have a compatible Vulkan installable client " "driver (ICD) installed?\n" "Please look at the Getting Started guide for additional " @@ -900,8 +822,7 @@ struct Demo { "vkCreateInstance Failure"); #elif defined(VK_USE_PLATFORM_WAYLAND_KHR) ERR_EXIT("vkEnumerateInstanceExtensionProperties failed to find " - "the " VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME - " extension.\n\n" + "the " VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME " extension.\n\n" "Do you have a compatible Vulkan installable client " "driver (ICD) installed?\n" "Please look at the Getting Started guide for additional " @@ -924,13 +845,12 @@ struct Demo { .setPEngineName(APP_SHORT_NAME) .setEngineVersion(0) .setApiVersion(VK_API_VERSION_1_0); - auto const inst_info = - vk::InstanceCreateInfo() - .setPApplicationInfo(&app) - .setEnabledLayerCount(enabled_layer_count) - .setPpEnabledLayerNames(instance_validation_layers) - .setEnabledExtensionCount(enabled_extension_count) - .setPpEnabledExtensionNames(extension_names); + auto const inst_info = vk::InstanceCreateInfo() + .setPApplicationInfo(&app) + .setEnabledLayerCount(enabled_layer_count) + .setPpEnabledLayerNames(instance_validation_layers) + .setEnabledExtensionCount(enabled_extension_count) + .setPpEnabledExtensionNames(extension_names); result = vk::createInstance(&inst_info, nullptr, &inst); if (result == vk::Result::eErrorIncompatibleDriver) { @@ -959,10 +879,8 @@ struct Demo { assert(gpu_count > 0); if (gpu_count > 0) { - std::unique_ptr<vk::PhysicalDevice[]> physical_devices( - new vk::PhysicalDevice[gpu_count]); - result = inst.enumeratePhysicalDevices(&gpu_count, - physical_devices.get()); + std::unique_ptr<vk::PhysicalDevice[]> physical_devices(new vk::PhysicalDevice[gpu_count]); + result = inst.enumeratePhysicalDevices(&gpu_count, physical_devices.get()); VERIFY(result == vk::Result::eSuccess); /* For cube demo we just grab the first physical device */ gpu = physical_devices[0]; @@ -982,23 +900,18 @@ struct Demo { enabled_extension_count = 0; memset(extension_names, 0, sizeof(extension_names)); - result = gpu.enumerateDeviceExtensionProperties( - nullptr, &device_extension_count, nullptr); + result = gpu.enumerateDeviceExtensionProperties(nullptr, &device_extension_count, nullptr); VERIFY(result == vk::Result::eSuccess); if (device_extension_count > 0) { - std::unique_ptr<vk::ExtensionProperties[]> device_extensions( - new vk::ExtensionProperties[device_extension_count]); - result = gpu.enumerateDeviceExtensionProperties( - nullptr, &device_extension_count, device_extensions.get()); + std::unique_ptr<vk::ExtensionProperties[]> device_extensions(new vk::ExtensionProperties[device_extension_count]); + result = gpu.enumerateDeviceExtensionProperties(nullptr, &device_extension_count, device_extensions.get()); VERIFY(result == vk::Result::eSuccess); for (uint32_t i = 0; i < device_extension_count; i++) { - if (!strcmp(VK_KHR_SWAPCHAIN_EXTENSION_NAME, - device_extensions[i].extensionName)) { + if (!strcmp(VK_KHR_SWAPCHAIN_EXTENSION_NAME, device_extensions[i].extensionName)) { swapchainExtFound = 1; - extension_names[enabled_extension_count++] = - VK_KHR_SWAPCHAIN_EXTENSION_NAME; + extension_names[enabled_extension_count++] = VK_KHR_SWAPCHAIN_EXTENSION_NAME; } assert(enabled_extension_count < 64); } @@ -1034,49 +947,36 @@ struct Demo { // Create a WSI surface for the window: #if defined(VK_USE_PLATFORM_WIN32_KHR) { - auto const createInfo = vk::Win32SurfaceCreateInfoKHR() - .setHinstance(connection) - .setHwnd(window); + auto const createInfo = vk::Win32SurfaceCreateInfoKHR().setHinstance(connection).setHwnd(window); - auto result = - inst.createWin32SurfaceKHR(&createInfo, nullptr, &surface); + auto result = inst.createWin32SurfaceKHR(&createInfo, nullptr, &surface); VERIFY(result == vk::Result::eSuccess); } #elif defined(VK_USE_PLATFORM_WAYLAND_KHR) { - auto const createInfo = vk::WaylandSurfaceCreateInfoKHR() - .setDisplay(display) - .setSurface(window); + auto const createInfo = vk::WaylandSurfaceCreateInfoKHR().setDisplay(display).setSurface(window); - auto result = - inst.createWaylandSurfaceKHR(&createInfo, nullptr, &surface); + auto result = inst.createWaylandSurfaceKHR(&createInfo, nullptr, &surface); VERIFY(result == vk::Result::eSuccess); } #elif defined(VK_USE_PLATFORM_MIR_KHR) #elif defined(VK_USE_PLATFORM_XLIB_KHR) { - auto const createInfo = - vk::XlibSurfaceCreateInfoKHR().setDpy(display).setWindow( - xlib_window); + auto const createInfo = vk::XlibSurfaceCreateInfoKHR().setDpy(display).setWindow(xlib_window); - auto result = - inst.createXlibSurfaceKHR(&createInfo, nullptr, &surface); + auto result = inst.createXlibSurfaceKHR(&createInfo, nullptr, &surface); VERIFY(result == vk::Result::eSuccess); } #elif defined(VK_USE_PLATFORM_XCB_KHR) { - auto const createInfo = vk::XcbSurfaceCreateInfoKHR() - .setConnection(connection) - .setWindow(xcb_window); + auto const createInfo = vk::XcbSurfaceCreateInfoKHR().setConnection(connection).setWindow(xcb_window); - auto result = - inst.createXcbSurfaceKHR(&createInfo, nullptr, &surface); + auto result = inst.createXcbSurfaceKHR(&createInfo, nullptr, &surface); VERIFY(result == vk::Result::eSuccess); } #endif // Iterate over each queue to learn whether it supports presenting: - std::unique_ptr<vk::Bool32[]> supportsPresent( - new vk::Bool32[queue_family_count]); + std::unique_ptr<vk::Bool32[]> supportsPresent(new vk::Bool32[queue_family_count]); for (uint32_t i = 0; i < queue_family_count; i++) { gpu.getSurfaceSupportKHR(i, surface, &supportsPresent[i]); } @@ -1110,16 +1010,13 @@ struct Demo { } // Generate error if could not find both a graphics and a present queue - if (graphicsQueueFamilyIndex == UINT32_MAX || - presentQueueFamilyIndex == UINT32_MAX) { - ERR_EXIT("Could not find both graphics and present queues\n", - "Swapchain Initialization Failure"); + if (graphicsQueueFamilyIndex == UINT32_MAX || presentQueueFamilyIndex == UINT32_MAX) { + ERR_EXIT("Could not find both graphics and present queues\n", "Swapchain Initialization Failure"); } graphics_queue_family_index = graphicsQueueFamilyIndex; present_queue_family_index = presentQueueFamilyIndex; - separate_present_queue = - (graphics_queue_family_index != present_queue_family_index); + separate_present_queue = (graphics_queue_family_index != present_queue_family_index); create_device(); @@ -1135,17 +1032,14 @@ struct Demo { auto result = gpu.getSurfaceFormatsKHR(surface, &formatCount, nullptr); VERIFY(result == vk::Result::eSuccess); - std::unique_ptr<vk::SurfaceFormatKHR[]> surfFormats( - new vk::SurfaceFormatKHR[formatCount]); - result = - gpu.getSurfaceFormatsKHR(surface, &formatCount, surfFormats.get()); + std::unique_ptr<vk::SurfaceFormatKHR[]> surfFormats(new vk::SurfaceFormatKHR[formatCount]); + result = gpu.getSurfaceFormatsKHR(surface, &formatCount, surfFormats.get()); VERIFY(result == vk::Result::eSuccess); // If the format list includes just one entry of VK_FORMAT_UNDEFINED, // the surface has no preferred format. Otherwise, at least one // supported format will be returned. - if (formatCount == 1 && - surfFormats[0].format == vk::Format::eUndefined) { + if (formatCount == 1 && surfFormats[0].format == vk::Format::eUndefined) { format = vk::Format::eB8G8R8A8Unorm; } else { assert(formatCount >= 1); @@ -1162,21 +1056,17 @@ struct Demo { // Create fences that we can use to throttle if we get too far // ahead of the image presents - auto const fence_ci = - vk::FenceCreateInfo().setFlags(vk::FenceCreateFlagBits::eSignaled); + auto const fence_ci = vk::FenceCreateInfo().setFlags(vk::FenceCreateFlagBits::eSignaled); for (uint32_t i = 0; i < FRAME_LAG; i++) { device.createFence(&fence_ci, nullptr, &fences[i]); - result = device.createSemaphore(&semaphoreCreateInfo, nullptr, - &image_acquired_semaphores[i]); + result = device.createSemaphore(&semaphoreCreateInfo, nullptr, &image_acquired_semaphores[i]); VERIFY(result == vk::Result::eSuccess); - result = device.createSemaphore(&semaphoreCreateInfo, nullptr, - &draw_complete_semaphores[i]); + result = device.createSemaphore(&semaphoreCreateInfo, nullptr, &draw_complete_semaphores[i]); VERIFY(result == vk::Result::eSuccess); if (separate_present_queue) { - result = device.createSemaphore(&semaphoreCreateInfo, nullptr, - &image_ownership_semaphores[i]); + result = device.createSemaphore(&semaphoreCreateInfo, nullptr, &image_ownership_semaphores[i]); VERIFY(result == vk::Result::eSuccess); } } @@ -1187,11 +1077,8 @@ struct Demo { } void prepare() { - auto const cmd_pool_info = - vk::CommandPoolCreateInfo().setQueueFamilyIndex( - graphics_queue_family_index); - auto result = - device.createCommandPool(&cmd_pool_info, nullptr, &cmd_pool); + auto const cmd_pool_info = vk::CommandPoolCreateInfo().setQueueFamilyIndex(graphics_queue_family_index); + auto result = device.createCommandPool(&cmd_pool_info, nullptr, &cmd_pool); VERIFY(result == vk::Result::eSuccess); auto const cmd = vk::CommandBufferAllocateInfo() @@ -1202,8 +1089,7 @@ struct Demo { result = device.allocateCommandBuffers(&cmd, &this->cmd); VERIFY(result == vk::Result::eSuccess); - auto const cmd_buf_info = - vk::CommandBufferBeginInfo().setPInheritanceInfo(nullptr); + auto const cmd_buf_info = vk::CommandBufferBeginInfo().setPInheritanceInfo(nullptr); result = this->cmd.begin(&cmd_buf_info); VERIFY(result == vk::Result::eSuccess); @@ -1223,12 +1109,9 @@ struct Demo { } if (separate_present_queue) { - auto const cmd_pool_info = - vk::CommandPoolCreateInfo().setQueueFamilyIndex( - present_queue_family_index); + auto const cmd_pool_info = vk::CommandPoolCreateInfo().setQueueFamilyIndex(present_queue_family_index); - result = device.createCommandPool(&cmd_pool_info, nullptr, - &present_cmd_pool); + result = device.createCommandPool(&cmd_pool_info, nullptr, &present_cmd_pool); VERIFY(result == vk::Result::eSuccess); auto const cmd = vk::CommandBufferAllocateInfo() @@ -1237,8 +1120,7 @@ struct Demo { .setCommandBufferCount(1); for (uint32_t i = 0; i < swapchainImageCount; i++) { - result = device.allocateCommandBuffers( - &cmd, &buffers[i].graphics_to_present_cmd); + result = device.allocateCommandBuffers(&cmd, &buffers[i].graphics_to_present_cmd); VERIFY(result == vk::Result::eSuccess); build_image_ownership_cmd(i); @@ -1260,8 +1142,7 @@ struct Demo { * that need to be flushed before beginning the render loop. */ flush_init_cmd(); - if(staging_texture.image) - { + if (staging_texture.image) { destroy_texture_image(&staging_texture); } @@ -1278,14 +1159,11 @@ struct Demo { VERIFY(result == vk::Result::eSuccess); uint32_t presentModeCount; - result = - gpu.getSurfacePresentModesKHR(surface, &presentModeCount, nullptr); + result = gpu.getSurfacePresentModesKHR(surface, &presentModeCount, nullptr); VERIFY(result == vk::Result::eSuccess); - std::unique_ptr<vk::PresentModeKHR[]> presentModes( - new vk::PresentModeKHR[presentModeCount]); - result = gpu.getSurfacePresentModesKHR(surface, &presentModeCount, - presentModes.get()); + std::unique_ptr<vk::PresentModeKHR[]> presentModes(new vk::PresentModeKHR[presentModeCount]); + result = gpu.getSurfacePresentModesKHR(surface, &presentModeCount, presentModes.get()); VERIFY(result == vk::Result::eSuccess); vk::Extent2D swapchainExtent; @@ -1338,8 +1216,7 @@ struct Demo { // even // though that may mean some tearing. - if(presentMode != swapchainPresentMode) - { + if (presentMode != swapchainPresentMode) { for (size_t i = 0; i < presentModeCount; ++i) { if (presentModes[i] == presentMode) { swapchainPresentMode = presentMode; @@ -1348,8 +1225,7 @@ struct Demo { } } - if(swapchainPresentMode != presentMode) - { + if (swapchainPresentMode != presentMode) { ERR_EXIT("Present mode specified is not supported\n", "Present mode unsupported"); } @@ -1357,42 +1233,38 @@ struct Demo { // to // own only 1 image at a time, besides the images being displayed and // queued for display): - uint32_t desiredNumberOfSwapchainImages = - surfCapabilities.minImageCount + 1; + uint32_t desiredNumberOfSwapchainImages = surfCapabilities.minImageCount + 1; // If maxImageCount is 0, we can ask for as many images as we want, // otherwise // we're limited to maxImageCount - if ((surfCapabilities.maxImageCount > 0) && - (desiredNumberOfSwapchainImages > surfCapabilities.maxImageCount)) { + if ((surfCapabilities.maxImageCount > 0) && (desiredNumberOfSwapchainImages > surfCapabilities.maxImageCount)) { // Application must settle for fewer images than desired: desiredNumberOfSwapchainImages = surfCapabilities.maxImageCount; } vk::SurfaceTransformFlagBitsKHR preTransform; - if (surfCapabilities.supportedTransforms & - vk::SurfaceTransformFlagBitsKHR::eIdentity) { + if (surfCapabilities.supportedTransforms & vk::SurfaceTransformFlagBitsKHR::eIdentity) { preTransform = vk::SurfaceTransformFlagBitsKHR::eIdentity; } else { preTransform = surfCapabilities.currentTransform; } - auto const swapchain_ci = - vk::SwapchainCreateInfoKHR() - .setSurface(surface) - .setMinImageCount(desiredNumberOfSwapchainImages) - .setImageFormat(format) - .setImageColorSpace(color_space) - .setImageExtent({swapchainExtent.width, swapchainExtent.height}) - .setImageArrayLayers(1) - .setImageUsage(vk::ImageUsageFlagBits::eColorAttachment) - .setImageSharingMode(vk::SharingMode::eExclusive) - .setQueueFamilyIndexCount(0) - .setPQueueFamilyIndices(nullptr) - .setPreTransform(preTransform) - .setCompositeAlpha(vk::CompositeAlphaFlagBitsKHR::eOpaque) - .setPresentMode(swapchainPresentMode) - .setClipped(true) - .setOldSwapchain(oldSwapchain); + auto const swapchain_ci = vk::SwapchainCreateInfoKHR() + .setSurface(surface) + .setMinImageCount(desiredNumberOfSwapchainImages) + .setImageFormat(format) + .setImageColorSpace(color_space) + .setImageExtent({swapchainExtent.width, swapchainExtent.height}) + .setImageArrayLayers(1) + .setImageUsage(vk::ImageUsageFlagBits::eColorAttachment) + .setImageSharingMode(vk::SharingMode::eExclusive) + .setQueueFamilyIndexCount(0) + .setPQueueFamilyIndices(nullptr) + .setPreTransform(preTransform) + .setCompositeAlpha(vk::CompositeAlphaFlagBitsKHR::eOpaque) + .setPresentMode(swapchainPresentMode) + .setClipped(true) + .setOldSwapchain(oldSwapchain); result = device.createSwapchainKHR(&swapchain_ci, nullptr, &swapchain); VERIFY(result == vk::Result::eSuccess); @@ -1406,14 +1278,11 @@ struct Demo { device.destroySwapchainKHR(oldSwapchain, nullptr); } - result = device.getSwapchainImagesKHR(swapchain, &swapchainImageCount, - nullptr); + result = device.getSwapchainImagesKHR(swapchain, &swapchainImageCount, nullptr); VERIFY(result == vk::Result::eSuccess); - std::unique_ptr<vk::Image[]> swapchainImages( - new vk::Image[swapchainImageCount]); - result = device.getSwapchainImagesKHR(swapchain, &swapchainImageCount, - swapchainImages.get()); + std::unique_ptr<vk::Image[]> swapchainImages(new vk::Image[swapchainImageCount]); + result = device.getSwapchainImagesKHR(swapchain, &swapchainImageCount, swapchainImages.get()); VERIFY(result == vk::Result::eSuccess); buffers.reset(new SwapchainBuffers[swapchainImageCount]); @@ -1424,13 +1293,11 @@ struct Demo { .setImage(swapchainImages[i]) .setViewType(vk::ImageViewType::e2D) .setFormat(format) - .setSubresourceRange(vk::ImageSubresourceRange( - vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1)); + .setSubresourceRange(vk::ImageSubresourceRange(vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1)); buffers[i].image = swapchainImages[i]; - result = device.createImageView(&color_image_view, nullptr, - &buffers[i].view); + result = device.createImageView(&color_image_view, nullptr, &buffers[i].view); VERIFY(result == vk::Result::eSuccess); } } @@ -1456,12 +1323,8 @@ struct Demo { data.attr[i][3] = 0; } - auto const buf_info = - vk::BufferCreateInfo() - .setSize(sizeof(data)) - .setUsage(vk::BufferUsageFlagBits::eUniformBuffer); - auto result = - device.createBuffer(&buf_info, nullptr, &uniform_data.buf); + auto const buf_info = vk::BufferCreateInfo().setSize(sizeof(data)).setUsage(vk::BufferUsageFlagBits::eUniformBuffer); + auto result = device.createBuffer(&buf_info, nullptr, &uniform_data.buf); VERIFY(result == vk::Result::eSuccess); vk::MemoryRequirements mem_reqs; @@ -1470,20 +1333,15 @@ struct Demo { uniform_data.mem_alloc.setAllocationSize(mem_reqs.size); uniform_data.mem_alloc.setMemoryTypeIndex(0); - bool const pass = memory_type_from_properties( - mem_reqs.memoryTypeBits, - vk::MemoryPropertyFlagBits::eHostVisible | - vk::MemoryPropertyFlagBits::eHostCoherent, - &uniform_data.mem_alloc.memoryTypeIndex); + bool const pass = memory_type_from_properties(mem_reqs.memoryTypeBits, vk::MemoryPropertyFlagBits::eHostVisible | + vk::MemoryPropertyFlagBits::eHostCoherent, + &uniform_data.mem_alloc.memoryTypeIndex); VERIFY(pass); - result = device.allocateMemory(&uniform_data.mem_alloc, nullptr, - &(uniform_data.mem)); + result = device.allocateMemory(&uniform_data.mem_alloc, nullptr, &(uniform_data.mem)); VERIFY(result == vk::Result::eSuccess); - auto pData = device.mapMemory(uniform_data.mem, 0, - uniform_data.mem_alloc.allocationSize, - vk::MemoryMapFlags()); + auto pData = device.mapMemory(uniform_data.mem, 0, uniform_data.mem_alloc.allocationSize, vk::MemoryMapFlags()); VERIFY(pData.result == vk::Result::eSuccess); memcpy(pData.value, &data, sizeof data); @@ -1501,20 +1359,19 @@ struct Demo { void prepare_depth() { depth.format = vk::Format::eD16Unorm; - auto const image = - vk::ImageCreateInfo() - .setImageType(vk::ImageType::e2D) - .setFormat(depth.format) - .setExtent({(uint32_t)width, (uint32_t)height, 1}) - .setMipLevels(1) - .setArrayLayers(1) - .setSamples(vk::SampleCountFlagBits::e1) - .setTiling(vk::ImageTiling::eOptimal) - .setUsage(vk::ImageUsageFlagBits::eDepthStencilAttachment) - .setSharingMode(vk::SharingMode::eExclusive) - .setQueueFamilyIndexCount(0) - .setPQueueFamilyIndices(nullptr) - .setInitialLayout(vk::ImageLayout::eUndefined); + auto const image = vk::ImageCreateInfo() + .setImageType(vk::ImageType::e2D) + .setFormat(depth.format) + .setExtent({(uint32_t)width, (uint32_t)height, 1}) + .setMipLevels(1) + .setArrayLayers(1) + .setSamples(vk::SampleCountFlagBits::e1) + .setTiling(vk::ImageTiling::eOptimal) + .setUsage(vk::ImageUsageFlagBits::eDepthStencilAttachment) + .setSharingMode(vk::SharingMode::eExclusive) + .setQueueFamilyIndexCount(0) + .setPQueueFamilyIndices(nullptr) + .setInitialLayout(vk::ImageLayout::eUndefined); auto result = device.createImage(&image, nullptr, &depth.image); VERIFY(result == vk::Result::eSuccess); @@ -1525,9 +1382,8 @@ struct Demo { depth.mem_alloc.setAllocationSize(mem_reqs.size); depth.mem_alloc.setMemoryTypeIndex(0); - auto const pass = memory_type_from_properties( - mem_reqs.memoryTypeBits, vk::MemoryPropertyFlagBits(0), - &depth.mem_alloc.memoryTypeIndex); + auto const pass = + memory_type_from_properties(mem_reqs.memoryTypeBits, vk::MemoryPropertyFlagBits(0), &depth.mem_alloc.memoryTypeIndex); VERIFY(pass); result = device.allocateMemory(&depth.mem_alloc, nullptr, &depth.mem); @@ -1540,68 +1396,50 @@ struct Demo { .setImage(depth.image) .setViewType(vk::ImageViewType::e2D) .setFormat(depth.format) - .setSubresourceRange(vk::ImageSubresourceRange( - vk::ImageAspectFlagBits::eDepth, 0, 1, 0, 1)); + .setSubresourceRange(vk::ImageSubresourceRange(vk::ImageAspectFlagBits::eDepth, 0, 1, 0, 1)); result = device.createImageView(&view, nullptr, &depth.view); VERIFY(result == vk::Result::eSuccess); } void prepare_descriptor_layout() { - vk::DescriptorSetLayoutBinding const layout_bindings[2] = { - vk::DescriptorSetLayoutBinding() - .setBinding(0) - .setDescriptorType(vk::DescriptorType::eUniformBuffer) - .setDescriptorCount(1) - .setStageFlags(vk::ShaderStageFlagBits::eVertex) - .setPImmutableSamplers(nullptr), - vk::DescriptorSetLayoutBinding() - .setBinding(1) - .setDescriptorType(vk::DescriptorType::eCombinedImageSampler) - .setDescriptorCount(texture_count) - .setStageFlags(vk::ShaderStageFlagBits::eFragment) - .setPImmutableSamplers(nullptr)}; - - auto const descriptor_layout = - vk::DescriptorSetLayoutCreateInfo().setBindingCount(2).setPBindings( - layout_bindings); - - auto result = device.createDescriptorSetLayout(&descriptor_layout, - nullptr, &desc_layout); + vk::DescriptorSetLayoutBinding const layout_bindings[2] = {vk::DescriptorSetLayoutBinding() + .setBinding(0) + .setDescriptorType(vk::DescriptorType::eUniformBuffer) + .setDescriptorCount(1) + .setStageFlags(vk::ShaderStageFlagBits::eVertex) + .setPImmutableSamplers(nullptr), + vk::DescriptorSetLayoutBinding() + .setBinding(1) + .setDescriptorType(vk::DescriptorType::eCombinedImageSampler) + .setDescriptorCount(texture_count) + .setStageFlags(vk::ShaderStageFlagBits::eFragment) + .setPImmutableSamplers(nullptr)}; + + auto const descriptor_layout = vk::DescriptorSetLayoutCreateInfo().setBindingCount(2).setPBindings(layout_bindings); + + auto result = device.createDescriptorSetLayout(&descriptor_layout, nullptr, &desc_layout); VERIFY(result == vk::Result::eSuccess); - auto const pPipelineLayoutCreateInfo = - vk::PipelineLayoutCreateInfo().setSetLayoutCount(1).setPSetLayouts( - &desc_layout); + auto const pPipelineLayoutCreateInfo = vk::PipelineLayoutCreateInfo().setSetLayoutCount(1).setPSetLayouts(&desc_layout); - result = device.createPipelineLayout(&pPipelineLayoutCreateInfo, - nullptr, &pipeline_layout); + result = device.createPipelineLayout(&pPipelineLayoutCreateInfo, nullptr, &pipeline_layout); VERIFY(result == vk::Result::eSuccess); } void prepare_descriptor_pool() { vk::DescriptorPoolSize const poolSizes[2] = { - vk::DescriptorPoolSize() - .setType(vk::DescriptorType::eUniformBuffer) - .setDescriptorCount(1), - vk::DescriptorPoolSize() - .setType(vk::DescriptorType::eCombinedImageSampler) - .setDescriptorCount(texture_count)}; - - auto const descriptor_pool = vk::DescriptorPoolCreateInfo() - .setMaxSets(1) - .setPoolSizeCount(2) - .setPPoolSizes(poolSizes); - - auto result = - device.createDescriptorPool(&descriptor_pool, nullptr, &desc_pool); + vk::DescriptorPoolSize().setType(vk::DescriptorType::eUniformBuffer).setDescriptorCount(1), + vk::DescriptorPoolSize().setType(vk::DescriptorType::eCombinedImageSampler).setDescriptorCount(texture_count)}; + + auto const descriptor_pool = vk::DescriptorPoolCreateInfo().setMaxSets(1).setPoolSizeCount(2).setPPoolSizes(poolSizes); + + auto result = device.createDescriptorPool(&descriptor_pool, nullptr, &desc_pool); VERIFY(result == vk::Result::eSuccess); } void prepare_descriptor_set() { - auto const alloc_info = vk::DescriptorSetAllocateInfo() - .setDescriptorPool(desc_pool) - .setDescriptorSetCount(1) - .setPSetLayouts(&desc_layout); + auto const alloc_info = + vk::DescriptorSetAllocateInfo().setDescriptorPool(desc_pool).setDescriptorSetCount(1).setPSetLayouts(&desc_layout); auto result = device.allocateDescriptorSets(&alloc_info, &desc_set); VERIFY(result == vk::Result::eSuccess); @@ -1644,8 +1482,7 @@ struct Demo { for (uint32_t i = 0; i < swapchainImageCount; i++) { attachments[0] = buffers[i].view; - auto const result = - device.createFramebuffer(&fb_info, nullptr, &framebuffers[i]); + auto const result = device.createFramebuffer(&fb_info, nullptr, &framebuffers[i]); VERIFY(result == vk::Result::eSuccess); } } @@ -1663,15 +1500,11 @@ struct Demo { void prepare_pipeline() { vk::PipelineCacheCreateInfo const pipelineCacheInfo; - auto result = device.createPipelineCache(&pipelineCacheInfo, nullptr, - &pipelineCache); + auto result = device.createPipelineCache(&pipelineCacheInfo, nullptr, &pipelineCache); VERIFY(result == vk::Result::eSuccess); vk::PipelineShaderStageCreateInfo const shaderStageInfo[2] = { - vk::PipelineShaderStageCreateInfo() - .setStage(vk::ShaderStageFlagBits::eVertex) - .setModule(prepare_vs()) - .setPName("main"), + vk::PipelineShaderStageCreateInfo().setStage(vk::ShaderStageFlagBits::eVertex).setModule(prepare_vs()).setPName("main"), vk::PipelineShaderStageCreateInfo() .setStage(vk::ShaderStageFlagBits::eFragment) .setModule(prepare_fs()) @@ -1679,24 +1512,19 @@ struct Demo { vk::PipelineVertexInputStateCreateInfo const vertexInputInfo; - auto const inputAssemblyInfo = - vk::PipelineInputAssemblyStateCreateInfo().setTopology( - vk::PrimitiveTopology::eTriangleList); + auto const inputAssemblyInfo = vk::PipelineInputAssemblyStateCreateInfo().setTopology(vk::PrimitiveTopology::eTriangleList); // TODO: Where are pViewports and pScissors set? - auto const viewportInfo = vk::PipelineViewportStateCreateInfo() - .setViewportCount(1) - .setScissorCount(1); - - auto const rasterizationInfo = - vk::PipelineRasterizationStateCreateInfo() - .setDepthClampEnable(VK_FALSE) - .setRasterizerDiscardEnable(VK_FALSE) - .setPolygonMode(vk::PolygonMode::eFill) - .setCullMode(vk::CullModeFlagBits::eBack) - .setFrontFace(vk::FrontFace::eCounterClockwise) - .setDepthBiasEnable(VK_FALSE) - .setLineWidth(1.0f); + auto const viewportInfo = vk::PipelineViewportStateCreateInfo().setViewportCount(1).setScissorCount(1); + + auto const rasterizationInfo = vk::PipelineRasterizationStateCreateInfo() + .setDepthClampEnable(VK_FALSE) + .setRasterizerDiscardEnable(VK_FALSE) + .setPolygonMode(vk::PolygonMode::eFill) + .setCullMode(vk::CullModeFlagBits::eBack) + .setFrontFace(vk::FrontFace::eCounterClockwise) + .setDepthBiasEnable(VK_FALSE) + .setLineWidth(1.0f); auto const multisampleInfo = vk::PipelineMultisampleStateCreateInfo(); @@ -1705,33 +1533,26 @@ struct Demo { .setPassOp(vk::StencilOp::eKeep) .setCompareOp(vk::CompareOp::eAlways); - auto const depthStencilInfo = - vk::PipelineDepthStencilStateCreateInfo() - .setDepthTestEnable(VK_TRUE) - .setDepthWriteEnable(VK_TRUE) - .setDepthCompareOp(vk::CompareOp::eLessOrEqual) - .setDepthBoundsTestEnable(VK_FALSE) - .setStencilTestEnable(VK_FALSE) - .setFront(stencilOp) - .setBack(stencilOp); + auto const depthStencilInfo = vk::PipelineDepthStencilStateCreateInfo() + .setDepthTestEnable(VK_TRUE) + .setDepthWriteEnable(VK_TRUE) + .setDepthCompareOp(vk::CompareOp::eLessOrEqual) + .setDepthBoundsTestEnable(VK_FALSE) + .setStencilTestEnable(VK_FALSE) + .setFront(stencilOp) + .setBack(stencilOp); vk::PipelineColorBlendAttachmentState const colorBlendAttachments[1] = { vk::PipelineColorBlendAttachmentState().setColorWriteMask( - vk::ColorComponentFlagBits::eR | - vk::ColorComponentFlagBits::eG | - vk::ColorComponentFlagBits::eB | + vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eG | vk::ColorComponentFlagBits::eB | vk::ColorComponentFlagBits::eA)}; - auto const colorBlendInfo = vk::PipelineColorBlendStateCreateInfo() - .setAttachmentCount(1) - .setPAttachments(colorBlendAttachments); + auto const colorBlendInfo = + vk::PipelineColorBlendStateCreateInfo().setAttachmentCount(1).setPAttachments(colorBlendAttachments); - vk::DynamicState const dynamicStates[2] = {vk::DynamicState::eViewport, - vk::DynamicState::eScissor}; + vk::DynamicState const dynamicStates[2] = {vk::DynamicState::eViewport, vk::DynamicState::eScissor}; - auto const dynamicStateInfo = vk::PipelineDynamicStateCreateInfo() - .setPDynamicStates(dynamicStates) - .setDynamicStateCount(2); + auto const dynamicStateInfo = vk::PipelineDynamicStateCreateInfo().setPDynamicStates(dynamicStates).setDynamicStateCount(2); auto const pipeline = vk::GraphicsPipelineCreateInfo() .setStageCount(2) @@ -1747,8 +1568,7 @@ struct Demo { .setLayout(pipeline_layout) .setRenderPass(render_pass); - result = device.createGraphicsPipelines(pipelineCache, 1, &pipeline, - nullptr, &this->pipeline); + result = device.createGraphicsPipelines(pipelineCache, 1, &pipeline, nullptr, &this->pipeline); VERIFY(result == vk::Result::eSuccess); device.destroyShaderModule(frag_shader_module, nullptr); @@ -1764,47 +1584,40 @@ struct Demo { // the renderpass, the color attachment's layout will be transitioned to // LAYOUT_PRESENT_SRC_KHR to be ready to present. This is all done as part of // the renderpass, no barriers are necessary. - const vk::AttachmentDescription attachments[2] = { - vk::AttachmentDescription() - .setFormat(format) - .setSamples(vk::SampleCountFlagBits::e1) - .setLoadOp(vk::AttachmentLoadOp::eClear) - .setStoreOp(vk::AttachmentStoreOp::eStore) - .setStencilLoadOp(vk::AttachmentLoadOp::eDontCare) - .setStencilStoreOp(vk::AttachmentStoreOp::eDontCare) - .setInitialLayout(vk::ImageLayout::eUndefined) - .setFinalLayout(vk::ImageLayout::ePresentSrcKHR), - vk::AttachmentDescription() - .setFormat(depth.format) - .setSamples(vk::SampleCountFlagBits::e1) - .setLoadOp(vk::AttachmentLoadOp::eClear) - .setStoreOp(vk::AttachmentStoreOp::eDontCare) - .setStencilLoadOp(vk::AttachmentLoadOp::eDontCare) - .setStencilStoreOp(vk::AttachmentStoreOp::eDontCare) - .setInitialLayout( - vk::ImageLayout::eUndefined) - .setFinalLayout( - vk::ImageLayout::eDepthStencilAttachmentOptimal)}; - - auto const color_reference = - vk::AttachmentReference().setAttachment(0).setLayout( - vk::ImageLayout::eColorAttachmentOptimal); + const vk::AttachmentDescription attachments[2] = {vk::AttachmentDescription() + .setFormat(format) + .setSamples(vk::SampleCountFlagBits::e1) + .setLoadOp(vk::AttachmentLoadOp::eClear) + .setStoreOp(vk::AttachmentStoreOp::eStore) + .setStencilLoadOp(vk::AttachmentLoadOp::eDontCare) + .setStencilStoreOp(vk::AttachmentStoreOp::eDontCare) + .setInitialLayout(vk::ImageLayout::eUndefined) + .setFinalLayout(vk::ImageLayout::ePresentSrcKHR), + vk::AttachmentDescription() + .setFormat(depth.format) + .setSamples(vk::SampleCountFlagBits::e1) + .setLoadOp(vk::AttachmentLoadOp::eClear) + .setStoreOp(vk::AttachmentStoreOp::eDontCare) + .setStencilLoadOp(vk::AttachmentLoadOp::eDontCare) + .setStencilStoreOp(vk::AttachmentStoreOp::eDontCare) + .setInitialLayout(vk::ImageLayout::eUndefined) + .setFinalLayout(vk::ImageLayout::eDepthStencilAttachmentOptimal)}; + + auto const color_reference = vk::AttachmentReference().setAttachment(0).setLayout(vk::ImageLayout::eColorAttachmentOptimal); auto const depth_reference = - vk::AttachmentReference().setAttachment(1).setLayout( - vk::ImageLayout::eDepthStencilAttachmentOptimal); - - auto const subpass = - vk::SubpassDescription() - .setPipelineBindPoint(vk::PipelineBindPoint::eGraphics) - .setInputAttachmentCount(0) - .setPInputAttachments(nullptr) - .setColorAttachmentCount(1) - .setPColorAttachments(&color_reference) - .setPResolveAttachments(nullptr) - .setPDepthStencilAttachment(&depth_reference) - .setPreserveAttachmentCount(0) - .setPPreserveAttachments(nullptr); + vk::AttachmentReference().setAttachment(1).setLayout(vk::ImageLayout::eDepthStencilAttachmentOptimal); + + auto const subpass = vk::SubpassDescription() + .setPipelineBindPoint(vk::PipelineBindPoint::eGraphics) + .setInputAttachmentCount(0) + .setPInputAttachments(nullptr) + .setColorAttachmentCount(1) + .setPColorAttachments(&color_reference) + .setPResolveAttachments(nullptr) + .setPDepthStencilAttachment(&depth_reference) + .setPreserveAttachmentCount(0) + .setPPreserveAttachments(nullptr); auto const rp_info = vk::RenderPassCreateInfo() .setAttachmentCount(2) @@ -1819,21 +1632,16 @@ struct Demo { } vk::ShaderModule prepare_shader_module(const void *code, size_t size) { - auto const moduleCreateInfo = - vk::ShaderModuleCreateInfo().setCodeSize(size).setPCode( - (uint32_t const *)code); + auto const moduleCreateInfo = vk::ShaderModuleCreateInfo().setCodeSize(size).setPCode((uint32_t const *)code); vk::ShaderModule module; - auto result = - device.createShaderModule(&moduleCreateInfo, nullptr, &module); + auto result = device.createShaderModule(&moduleCreateInfo, nullptr, &module); VERIFY(result == vk::Result::eSuccess); return module; } - void prepare_texture_image(const char *filename, texture_object *tex_obj, - vk::ImageTiling tiling, - vk::ImageUsageFlags usage, + void prepare_texture_image(const char *filename, texture_object *tex_obj, vk::ImageTiling tiling, vk::ImageUsageFlags usage, vk::MemoryPropertyFlags required_props) { int32_t tex_width; int32_t tex_height; @@ -1844,23 +1652,21 @@ struct Demo { tex_obj->tex_width = tex_width; tex_obj->tex_height = tex_height; - auto const image_create_info = - vk::ImageCreateInfo() - .setImageType(vk::ImageType::e2D) - .setFormat(vk::Format::eR8G8B8A8Unorm) - .setExtent({(uint32_t)tex_width, (uint32_t)tex_height, 1}) - .setMipLevels(1) - .setArrayLayers(1) - .setSamples(vk::SampleCountFlagBits::e1) - .setTiling(tiling) - .setUsage(usage) - .setSharingMode(vk::SharingMode::eExclusive) - .setQueueFamilyIndexCount(0) - .setPQueueFamilyIndices(nullptr) - .setInitialLayout(vk::ImageLayout::ePreinitialized); - - auto result = - device.createImage(&image_create_info, nullptr, &tex_obj->image); + auto const image_create_info = vk::ImageCreateInfo() + .setImageType(vk::ImageType::e2D) + .setFormat(vk::Format::eR8G8B8A8Unorm) + .setExtent({(uint32_t)tex_width, (uint32_t)tex_height, 1}) + .setMipLevels(1) + .setArrayLayers(1) + .setSamples(vk::SampleCountFlagBits::e1) + .setTiling(tiling) + .setUsage(usage) + .setSharingMode(vk::SharingMode::eExclusive) + .setQueueFamilyIndexCount(0) + .setPQueueFamilyIndices(nullptr) + .setInitialLayout(vk::ImageLayout::ePreinitialized); + + auto result = device.createImage(&image_create_info, nullptr, &tex_obj->image); VERIFY(result == vk::Result::eSuccess); vk::MemoryRequirements mem_reqs; @@ -1869,13 +1675,10 @@ struct Demo { tex_obj->mem_alloc.setAllocationSize(mem_reqs.size); tex_obj->mem_alloc.setMemoryTypeIndex(0); - auto pass = - memory_type_from_properties(mem_reqs.memoryTypeBits, required_props, - &tex_obj->mem_alloc.memoryTypeIndex); + auto pass = memory_type_from_properties(mem_reqs.memoryTypeBits, required_props, &tex_obj->mem_alloc.memoryTypeIndex); VERIFY(pass == true); - result = device.allocateMemory(&tex_obj->mem_alloc, nullptr, - &(tex_obj->mem)); + result = device.allocateMemory(&tex_obj->mem_alloc, nullptr, &(tex_obj->mem)); VERIFY(result == vk::Result::eSuccess); result = device.bindImageMemory(tex_obj->image, tex_obj->mem, 0); @@ -1883,19 +1686,14 @@ struct Demo { if (required_props & vk::MemoryPropertyFlagBits::eHostVisible) { auto const subres = - vk::ImageSubresource() - .setAspectMask(vk::ImageAspectFlagBits::eColor) - .setMipLevel(0) - .setArrayLayer(0); + vk::ImageSubresource().setAspectMask(vk::ImageAspectFlagBits::eColor).setMipLevel(0).setArrayLayer(0); vk::SubresourceLayout layout; device.getImageSubresourceLayout(tex_obj->image, &subres, &layout); - auto data = device.mapMemory(tex_obj->mem, 0, - tex_obj->mem_alloc.allocationSize); + auto data = device.mapMemory(tex_obj->mem, 0, tex_obj->mem_alloc.allocationSize); VERIFY(data.result == vk::Result::eSuccess); - if (!loadTexture(filename, (uint8_t *)data.value, &layout, - &tex_width, &tex_height)) { + if (!loadTexture(filename, (uint8_t *)data.value, &layout, &tex_width, &tex_height)) { fprintf(stderr, "Error loading texture: %s\n", filename); } @@ -1911,60 +1709,40 @@ struct Demo { gpu.getFormatProperties(tex_format, &props); for (uint32_t i = 0; i < texture_count; i++) { - if ((props.linearTilingFeatures & - vk::FormatFeatureFlagBits::eSampledImage) && - !use_staging_buffer) { + if ((props.linearTilingFeatures & vk::FormatFeatureFlagBits::eSampledImage) && !use_staging_buffer) { /* Device can texture using linear textures */ - prepare_texture_image( - tex_files[i], &textures[i], vk::ImageTiling::eLinear, - vk::ImageUsageFlagBits::eSampled, - vk::MemoryPropertyFlagBits::eHostVisible | - vk::MemoryPropertyFlagBits::eHostCoherent); + prepare_texture_image(tex_files[i], &textures[i], vk::ImageTiling::eLinear, vk::ImageUsageFlagBits::eSampled, + vk::MemoryPropertyFlagBits::eHostVisible | vk::MemoryPropertyFlagBits::eHostCoherent); // Nothing in the pipeline needs to be complete to start, and don't allow fragment // shader to run until layout transition completes - set_image_layout(textures[i].image, vk::ImageAspectFlagBits::eColor, - vk::ImageLayout::ePreinitialized, textures[i].imageLayout, - vk::AccessFlagBits::eHostWrite, vk::PipelineStageFlagBits::eTopOfPipe, + set_image_layout(textures[i].image, vk::ImageAspectFlagBits::eColor, vk::ImageLayout::ePreinitialized, + textures[i].imageLayout, vk::AccessFlagBits::eHostWrite, vk::PipelineStageFlagBits::eTopOfPipe, vk::PipelineStageFlagBits::eFragmentShader); staging_texture.image = vk::Image(); - } else if (props.optimalTilingFeatures & - vk::FormatFeatureFlagBits::eSampledImage) { + } else if (props.optimalTilingFeatures & vk::FormatFeatureFlagBits::eSampledImage) { /* Must use staging buffer to copy linear texture to optimized */ - prepare_texture_image( - tex_files[i], &staging_texture, vk::ImageTiling::eLinear, - vk::ImageUsageFlagBits::eTransferSrc, - vk::MemoryPropertyFlagBits::eHostVisible | - vk::MemoryPropertyFlagBits::eHostCoherent); + prepare_texture_image(tex_files[i], &staging_texture, vk::ImageTiling::eLinear, + vk::ImageUsageFlagBits::eTransferSrc, + vk::MemoryPropertyFlagBits::eHostVisible | vk::MemoryPropertyFlagBits::eHostCoherent); - prepare_texture_image(tex_files[i], &textures[i], - vk::ImageTiling::eOptimal, - vk::ImageUsageFlagBits::eTransferDst | - vk::ImageUsageFlagBits::eSampled, + prepare_texture_image(tex_files[i], &textures[i], vk::ImageTiling::eOptimal, + vk::ImageUsageFlagBits::eTransferDst | vk::ImageUsageFlagBits::eSampled, vk::MemoryPropertyFlagBits::eDeviceLocal); - set_image_layout( - staging_texture.image, vk::ImageAspectFlagBits::eColor, - vk::ImageLayout::ePreinitialized, - vk::ImageLayout::eTransferSrcOptimal, - vk::AccessFlagBits::eHostWrite, - vk::PipelineStageFlagBits::eTopOfPipe, - vk::PipelineStageFlagBits::eTransfer); - - set_image_layout( - textures[i].image, vk::ImageAspectFlagBits::eColor, - vk::ImageLayout::ePreinitialized, - vk::ImageLayout::eTransferDstOptimal, - vk::AccessFlagBits::eHostWrite, - vk::PipelineStageFlagBits::eTopOfPipe, - vk::PipelineStageFlagBits::eTransfer); - - auto const subresource = - vk::ImageSubresourceLayers() - .setAspectMask(vk::ImageAspectFlagBits::eColor) - .setMipLevel(0) - .setBaseArrayLayer(0) - .setLayerCount(1); + set_image_layout(staging_texture.image, vk::ImageAspectFlagBits::eColor, vk::ImageLayout::ePreinitialized, + vk::ImageLayout::eTransferSrcOptimal, vk::AccessFlagBits::eHostWrite, + vk::PipelineStageFlagBits::eTopOfPipe, vk::PipelineStageFlagBits::eTransfer); + + set_image_layout(textures[i].image, vk::ImageAspectFlagBits::eColor, vk::ImageLayout::ePreinitialized, + vk::ImageLayout::eTransferDstOptimal, vk::AccessFlagBits::eHostWrite, + vk::PipelineStageFlagBits::eTopOfPipe, vk::PipelineStageFlagBits::eTransfer); + + auto const subresource = vk::ImageSubresourceLayers() + .setAspectMask(vk::ImageAspectFlagBits::eColor) + .setMipLevel(0) + .setBaseArrayLayer(0) + .setLayerCount(1); auto const copy_region = vk::ImageCopy() @@ -1972,58 +1750,45 @@ struct Demo { .setSrcOffset({0, 0, 0}) .setDstSubresource(subresource) .setDstOffset({0, 0, 0}) - .setExtent({(uint32_t)staging_texture.tex_width, - (uint32_t)staging_texture.tex_height, 1}); - - cmd.copyImage( - staging_texture.image, vk::ImageLayout::eTransferSrcOptimal, - textures[i].image, vk::ImageLayout::eTransferDstOptimal, 1, - ©_region); - - set_image_layout(textures[i].image, - vk::ImageAspectFlagBits::eColor, - vk::ImageLayout::eTransferDstOptimal, - textures[i].imageLayout, - vk::AccessFlagBits::eTransferWrite, - vk::PipelineStageFlagBits::eTransfer, + .setExtent({(uint32_t)staging_texture.tex_width, (uint32_t)staging_texture.tex_height, 1}); + + cmd.copyImage(staging_texture.image, vk::ImageLayout::eTransferSrcOptimal, textures[i].image, + vk::ImageLayout::eTransferDstOptimal, 1, ©_region); + + set_image_layout(textures[i].image, vk::ImageAspectFlagBits::eColor, vk::ImageLayout::eTransferDstOptimal, + textures[i].imageLayout, vk::AccessFlagBits::eTransferWrite, vk::PipelineStageFlagBits::eTransfer, vk::PipelineStageFlagBits::eFragmentShader); } else { - assert( - !"No support for R8G8B8A8_UNORM as texture image format"); + assert(!"No support for R8G8B8A8_UNORM as texture image format"); } - auto const samplerInfo = - vk::SamplerCreateInfo() - .setMagFilter(vk::Filter::eNearest) - .setMinFilter(vk::Filter::eNearest) - .setMipmapMode(vk::SamplerMipmapMode::eNearest) - .setAddressModeU(vk::SamplerAddressMode::eClampToEdge) - .setAddressModeV(vk::SamplerAddressMode::eClampToEdge) - .setAddressModeW(vk::SamplerAddressMode::eClampToEdge) - .setMipLodBias(0.0f) - .setAnisotropyEnable(VK_FALSE) - .setMaxAnisotropy(1) - .setCompareEnable(VK_FALSE) - .setCompareOp(vk::CompareOp::eNever) - .setMinLod(0.0f) - .setMaxLod(0.0f) - .setBorderColor(vk::BorderColor::eFloatOpaqueWhite) - .setUnnormalizedCoordinates(VK_FALSE); - - auto result = device.createSampler(&samplerInfo, nullptr, - &textures[i].sampler); + auto const samplerInfo = vk::SamplerCreateInfo() + .setMagFilter(vk::Filter::eNearest) + .setMinFilter(vk::Filter::eNearest) + .setMipmapMode(vk::SamplerMipmapMode::eNearest) + .setAddressModeU(vk::SamplerAddressMode::eClampToEdge) + .setAddressModeV(vk::SamplerAddressMode::eClampToEdge) + .setAddressModeW(vk::SamplerAddressMode::eClampToEdge) + .setMipLodBias(0.0f) + .setAnisotropyEnable(VK_FALSE) + .setMaxAnisotropy(1) + .setCompareEnable(VK_FALSE) + .setCompareOp(vk::CompareOp::eNever) + .setMinLod(0.0f) + .setMaxLod(0.0f) + .setBorderColor(vk::BorderColor::eFloatOpaqueWhite) + .setUnnormalizedCoordinates(VK_FALSE); + + auto result = device.createSampler(&samplerInfo, nullptr, &textures[i].sampler); VERIFY(result == vk::Result::eSuccess); - auto const viewInfo = - vk::ImageViewCreateInfo() - .setImage(textures[i].image) - .setViewType(vk::ImageViewType::e2D) - .setFormat(tex_format) - .setSubresourceRange(vk::ImageSubresourceRange( - vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1)); + auto const viewInfo = vk::ImageViewCreateInfo() + .setImage(textures[i].image) + .setViewType(vk::ImageViewType::e2D) + .setFormat(tex_format) + .setSubresourceRange(vk::ImageSubresourceRange(vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1)); - result = - device.createImageView(&viewInfo, nullptr, &textures[i].view); + result = device.createImageView(&viewInfo, nullptr, &textures[i].view); VERIFY(result == vk::Result::eSuccess); } } @@ -2119,11 +1884,8 @@ struct Demo { prepare(); } - void set_image_layout(vk::Image image, vk::ImageAspectFlags aspectMask, - vk::ImageLayout oldLayout, vk::ImageLayout newLayout, - vk::AccessFlags srcAccessMask, - vk::PipelineStageFlags src_stages, - vk::PipelineStageFlags dest_stages) { + void set_image_layout(vk::Image image, vk::ImageAspectFlags aspectMask, vk::ImageLayout oldLayout, vk::ImageLayout newLayout, + vk::AccessFlags srcAccessMask, vk::PipelineStageFlags src_stages, vk::PipelineStageFlags dest_stages) { assert(cmd); auto DstAccessMask = [](vk::ImageLayout const &layout) { @@ -2143,8 +1905,7 @@ struct Demo { break; case vk::ImageLayout::eShaderReadOnlyOptimal: // Make sure any Copy or CPU writes to image are flushed - flags = vk::AccessFlagBits::eShaderRead | - vk::AccessFlagBits::eInputAttachmentRead; + flags = vk::AccessFlagBits::eShaderRead | vk::AccessFlagBits::eInputAttachmentRead; break; case vk::ImageLayout::eTransferSrcOptimal: flags = vk::AccessFlagBits::eTransferRead; @@ -2167,11 +1928,9 @@ struct Demo { .setSrcQueueFamilyIndex(0) .setDstQueueFamilyIndex(0) .setImage(image) - .setSubresourceRange(vk::ImageSubresourceRange( - aspectMask, 0, 1, 0, 1)); + .setSubresourceRange(vk::ImageSubresourceRange(aspectMask, 0, 1, 0, 1)); - cmd.pipelineBarrier(src_stages, dest_stages, vk::DependencyFlagBits(), - 0, nullptr, 0, nullptr, 1, &barrier); + cmd.pipelineBarrier(src_stages, dest_stages, vk::DependencyFlagBits(), 0, nullptr, 0, nullptr, 1, &barrier); } void update_data_buffer() { @@ -2181,15 +1940,12 @@ struct Demo { // Rotate around the Y axis mat4x4 Model; mat4x4_dup(Model, model_matrix); - mat4x4_rotate(model_matrix, Model, 0.0f, 1.0f, 0.0f, - (float)degreesToRadians(spin_angle)); + mat4x4_rotate(model_matrix, Model, 0.0f, 1.0f, 0.0f, (float)degreesToRadians(spin_angle)); mat4x4 MVP; mat4x4_mul(MVP, VP, model_matrix); - auto data = device.mapMemory(uniform_data.mem, 0, - uniform_data.mem_alloc.allocationSize, - vk::MemoryMapFlags()); + auto data = device.mapMemory(uniform_data.mem, 0, uniform_data.mem_alloc.allocationSize, vk::MemoryMapFlags()); VERIFY(data.result == vk::Result::eSuccess); memcpy(data.value, (const void *)&MVP[0][0], sizeof(MVP)); @@ -2197,9 +1953,7 @@ struct Demo { device.unmapMemory(uniform_data.mem); } - bool loadTexture(const char *filename, uint8_t *rgba_data, - vk::SubresourceLayout *layout, int32_t *width, - int32_t *height) { + bool loadTexture(const char *filename, uint8_t *rgba_data, vk::SubresourceLayout *layout, int32_t *width, int32_t *height) { FILE *fPtr = fopen(filename, "rb"); if (!fPtr) { return false; @@ -2250,15 +2004,12 @@ struct Demo { return true; } - bool memory_type_from_properties(uint32_t typeBits, - vk::MemoryPropertyFlags requirements_mask, - uint32_t *typeIndex) { + bool memory_type_from_properties(uint32_t typeBits, vk::MemoryPropertyFlags requirements_mask, uint32_t *typeIndex) { // Search memtypes to find first index with those properties for (uint32_t i = 0; i < VK_MAX_MEMORY_TYPES; i++) { if ((typeBits & 1) == 1) { // Type is available, does it match user properties? - if ((memory_properties.memoryTypes[i].propertyFlags & - requirements_mask) == requirements_mask) { + if ((memory_properties.memoryTypes[i].propertyFlags & requirements_mask) == requirements_mask) { *typeIndex = i; return true; } @@ -2346,25 +2097,19 @@ struct Demo { int numberOfVisuals; XVisualInfo vInfoTemplate = {}; vInfoTemplate.screen = DefaultScreen(display); - XVisualInfo *visualInfo = XGetVisualInfo( - display, visualMask, &vInfoTemplate, &numberOfVisuals); + XVisualInfo *visualInfo = XGetVisualInfo(display, visualMask, &vInfoTemplate, &numberOfVisuals); - Colormap colormap = - XCreateColormap(display, RootWindow(display, vInfoTemplate.screen), - visualInfo->visual, AllocNone); + Colormap colormap = XCreateColormap(display, RootWindow(display, vInfoTemplate.screen), visualInfo->visual, AllocNone); XSetWindowAttributes windowAttributes = {}; windowAttributes.colormap = colormap; windowAttributes.background_pixel = 0xFFFFFFFF; windowAttributes.border_pixel = 0; - windowAttributes.event_mask = - KeyPressMask | KeyReleaseMask | StructureNotifyMask | ExposureMask; + windowAttributes.event_mask = KeyPressMask | KeyReleaseMask | StructureNotifyMask | ExposureMask; - xlib_window = XCreateWindow( - display, RootWindow(display, vInfoTemplate.screen), 0, 0, width, - height, 0, visualInfo->depth, InputOutput, visualInfo->visual, - CWBackPixel | CWBorderPixel | CWEventMask | CWColormap, - &windowAttributes); + xlib_window = XCreateWindow(display, RootWindow(display, vInfoTemplate.screen), 0, 0, width, height, 0, visualInfo->depth, + InputOutput, visualInfo->visual, CWBackPixel | CWBorderPixel | CWEventMask | CWColormap, + &windowAttributes); XSelectInput(display, xlib_window, ExposureMask | KeyPressMask); XMapWindow(display, xlib_window); @@ -2396,8 +2141,7 @@ struct Demo { } break; case ConfigureNotify: - if (((int32_t)width != event->xconfigure.width) || - ((int32_t)height != event->xconfigure.height)) { + if (((int32_t)width != event->xconfigure.width) || ((int32_t)height != event->xconfigure.height)) { width = event->xconfigure.width; height = event->xconfigure.height; resize(); @@ -2439,14 +2183,12 @@ struct Demo { // TODO: Resize window break; case XCB_CLIENT_MESSAGE: - if ((*(xcb_client_message_event_t *)event).data.data32[0] == - (*atom_wm_delete_window).atom) { + if ((*(xcb_client_message_event_t *)event).data.data32[0] == (*atom_wm_delete_window).atom) { quit = true; } break; case XCB_KEY_RELEASE: { - const xcb_key_release_event_t *key = - (const xcb_key_release_event_t *)event; + const xcb_key_release_event_t *key = (const xcb_key_release_event_t *)event; switch (key->detail) { case 0x9: // Escape @@ -2464,8 +2206,7 @@ struct Demo { } } break; case XCB_CONFIGURE_NOTIFY: { - const xcb_configure_notify_event_t *cfg = - (const xcb_configure_notify_event_t *)event; + const xcb_configure_notify_event_t *cfg = (const xcb_configure_notify_event_t *)event; if ((width != cfg->width) || (height != cfg->height)) { width = cfg->width; height = cfg->height; @@ -2510,27 +2251,19 @@ struct Demo { value_mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK; value_list[0] = screen->black_pixel; - value_list[1] = XCB_EVENT_MASK_KEY_RELEASE | XCB_EVENT_MASK_EXPOSURE | - XCB_EVENT_MASK_STRUCTURE_NOTIFY; + value_list[1] = XCB_EVENT_MASK_KEY_RELEASE | XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_STRUCTURE_NOTIFY; - xcb_create_window(connection, XCB_COPY_FROM_PARENT, xcb_window, - screen->root, 0, 0, width, height, 0, - XCB_WINDOW_CLASS_INPUT_OUTPUT, screen->root_visual, - value_mask, value_list); + xcb_create_window(connection, XCB_COPY_FROM_PARENT, xcb_window, screen->root, 0, 0, width, height, 0, + XCB_WINDOW_CLASS_INPUT_OUTPUT, screen->root_visual, value_mask, value_list); /* Magic code that will send notification when window is destroyed */ - xcb_intern_atom_cookie_t cookie = - xcb_intern_atom(connection, 1, 12, "WM_PROTOCOLS"); - xcb_intern_atom_reply_t *reply = - xcb_intern_atom_reply(connection, cookie, 0); + xcb_intern_atom_cookie_t cookie = xcb_intern_atom(connection, 1, 12, "WM_PROTOCOLS"); + xcb_intern_atom_reply_t *reply = xcb_intern_atom_reply(connection, cookie, 0); - xcb_intern_atom_cookie_t cookie2 = - xcb_intern_atom(connection, 0, 16, "WM_DELETE_WINDOW"); + xcb_intern_atom_cookie_t cookie2 = xcb_intern_atom(connection, 0, 16, "WM_DELETE_WINDOW"); atom_wm_delete_window = xcb_intern_atom_reply(connection, cookie2, 0); - xcb_change_property(connection, XCB_PROP_MODE_REPLACE, xcb_window, - (*reply).atom, 4, 32, 1, - &(*atom_wm_delete_window).atom); + xcb_change_property(connection, XCB_PROP_MODE_REPLACE, xcb_window, (*reply).atom, 4, 32, 1, &(*atom_wm_delete_window).atom); free(reply); @@ -2540,8 +2273,7 @@ struct Demo { // consecutive // runs const uint32_t coords[] = {100, 100}; - xcb_configure_window(connection, xcb_window, - XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y, coords); + xcb_configure_window(connection, xcb_window, XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y, coords); } #elif defined(VK_USE_PLATFORM_WAYLAND_KHR) @@ -2571,8 +2303,7 @@ struct Demo { exit(1); } - wl_shell_surface_add_listener(shell_surface, &shell_surface_listener, - this); + wl_shell_surface_add_listener(shell_surface, &shell_surface_listener, this); wl_shell_surface_set_toplevel(shell_surface); wl_shell_surface_set_title(shell_surface, APP_SHORT_NAME); } @@ -2731,8 +2462,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { return (DefWindowProc(hWnd, uMsg, wParam, lParam)); } -int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR pCmdLine, - int nCmdShow) { +int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR pCmdLine, int nCmdShow) { // TODO: Gah.. refactor. This isn't 1989. MSG msg; // message bool done; // flag saying when app is complete @@ -2761,8 +2491,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR pCmdLine, argv[iii] = (char *)malloc(sizeof(char) * (wideCharLen + 1)); if (argv[iii] != nullptr) { - wcstombs_s(&numConverted, argv[iii], wideCharLen + 1, - commandLineArgs[iii], wideCharLen + 1); + wcstombs_s(&numConverted, argv[iii], wideCharLen + 1, commandLineArgs[iii], wideCharLen + 1); } } } @@ -2832,11 +2561,11 @@ int main(int argc, char **argv) { demo.prepare(); #if defined(VK_USE_PLATFORM_XCB_KHR) -demo.run_xcb(); + demo.run_xcb(); #elif defined(VK_USE_PLATFORM_XLIB_KHR) -demo.run_xlib(); + demo.run_xlib(); #elif defined(VK_USE_PLATFORM_WAYLAND_KHR) -demo.run(); + demo.run(); #elif defined(VK_USE_PLATFORM_MIR_KHR) #endif |