From a26154680ee443216d7346ea2f44a1205cc251f9 Mon Sep 17 00:00:00 2001 From: Karl Schultz Date: Fri, 20 Jan 2017 13:19:20 -0700 Subject: build: Enable declaration hiding warning on Windows Fixes #1388 Turn on the Windows compiler option (4456) to report hidden declarations. Fix all places where this was occurring. Change-Id: I3346d87da8b70d6299c206fcac68520a091ed1a6 --- demos/cube.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'demos/cube.cpp') diff --git a/demos/cube.cpp b/demos/cube.cpp index f607bc06..20425431 100644 --- a/demos/cube.cpp +++ b/demos/cube.cpp @@ -479,16 +479,16 @@ 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]); - - result = present_queue.submit(1, &submit_info, vk::Fence()); + auto const present_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, &present_submit_info, vk::Fence()); VERIFY(result == vk::Result::eSuccess); } @@ -1153,18 +1153,18 @@ struct Demo { } if (separate_present_queue) { - auto const cmd_pool_info = vk::CommandPoolCreateInfo().setQueueFamilyIndex(present_queue_family_index); + auto const present_cmd_pool_info = vk::CommandPoolCreateInfo().setQueueFamilyIndex(present_queue_family_index); - result = device.createCommandPool(&cmd_pool_info, nullptr, &present_cmd_pool); + result = device.createCommandPool(&present_cmd_pool_info, nullptr, &present_cmd_pool); VERIFY(result == vk::Result::eSuccess); - auto const cmd = vk::CommandBufferAllocateInfo() - .setCommandPool(present_cmd_pool) - .setLevel(vk::CommandBufferLevel::ePrimary) - .setCommandBufferCount(1); + auto const present_cmd = vk::CommandBufferAllocateInfo() + .setCommandPool(present_cmd_pool) + .setLevel(vk::CommandBufferLevel::ePrimary) + .setCommandBufferCount(1); for (uint32_t i = 0; i < swapchainImageCount; i++) { - result = device.allocateCommandBuffers(&cmd, &buffers[i].graphics_to_present_cmd); + result = device.allocateCommandBuffers(&present_cmd, &buffers[i].graphics_to_present_cmd); VERIFY(result == vk::Result::eSuccess); build_image_ownership_cmd(i); -- cgit v1.2.3