diff --git a/client/application.cpp b/client/application.cpp index d174a59b..b450d5a7 100644 --- a/client/application.cpp +++ b/client/application.cpp @@ -762,6 +762,7 @@ void application::initialize_vulkan() vk_device_extensions.push_back(VK_KHR_16BIT_STORAGE_EXTENSION_NAME); vk_device_extensions.push_back(VK_EXT_SUBGROUP_SIZE_CONTROL_EXTENSION_NAME); vk_device_extensions.push_back(VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME); + vk_device_extensions.push_back(VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME); optional_device_extensions.emplace(VK_IMG_FILTER_CUBIC_EXTENSION_NAME); optional_device_extensions.emplace(VK_KHR_CREATE_RENDERPASS_2_EXTENSION_NAME); optional_device_extensions.emplace(VK_KHR_FRAGMENT_SHADING_RATE_EXTENSION_NAME); @@ -900,6 +901,9 @@ void application::initialize_vulkan() vk::PhysicalDeviceFloat16Int8FeaturesKHR{ .shaderFloat16 = true, }, + vk::PhysicalDeviceTimelineSemaphoreFeaturesKHR{ + .timelineSemaphore = true, + }, }; if (utils::contains(vk_device_extensions, VK_KHR_CREATE_RENDERPASS_2_EXTENSION_NAME) and diff --git a/client/decoder/pyrowave/decoder.cpp b/client/decoder/pyrowave/decoder.cpp index 55db82e6..b91fac83 100644 --- a/client/decoder/pyrowave/decoder.cpp +++ b/client/decoder/pyrowave/decoder.cpp @@ -119,8 +119,18 @@ decoder::decoder( view_info.subresourceRange.aspectMask = vk::ImageAspectFlagBits::ePlane1; item.view_cb = vk::raii::ImageView(device, view_info); view_info.subresourceRange.aspectMask = vk::ImageAspectFlagBits::ePlane2; - item.view_cr = vk::raii::ImageView(device, view_info); + + item.semaphore = vk::raii::Semaphore( + device, + vk::StructureChain{ + vk::SemaphoreCreateInfo{}, + vk::SemaphoreTypeCreateInfo{ + .semaphoreType = vk::SemaphoreType::eTimeline, + }, + } + .get()); + ++i; } @@ -242,22 +252,46 @@ void decoder::worker_function(uint32_t queue_family_index) barrier); } dec.decode(cmd_buf, *input, views); + { + vk::ImageMemoryBarrier barrier{ + .srcAccessMask = vk::AccessFlagBits::eMemoryWrite, + .dstAccessMask = vk::AccessFlagBits::eMemoryRead, + .oldLayout = vk::ImageLayout::eGeneral, + .newLayout = vk::ImageLayout::eGeneral, + .image = item->image, + .subresourceRange = { + .aspectMask = vk::ImageAspectFlagBits::eColor, + .levelCount = 1, + .layerCount = 1, + }, + }; + cmd_buf.pipelineBarrier( + vk::PipelineStageFlagBits::eComputeShader, + vk::PipelineStageFlagBits::eFragmentShader, + {}, + {}, + {}, + barrier); + } cmd_buf.end(); application::get_queue().lock()->submit( - vk::SubmitInfo{ - .commandBufferCount = 1, - .pCommandBuffers = &*cmd_buf, - }, + vk::StructureChain{ + vk::SubmitInfo{ + .commandBufferCount = 1, + .pCommandBuffers = &*cmd_buf, + .signalSemaphoreCount = 1, + .pSignalSemaphores = &*item->semaphore, + }, + vk::TimelineSemaphoreSubmitInfo{ + .signalSemaphoreValueCount = 1, + .pSignalSemaphoreValues = &++item->semaphore_val, + }, + } + .get(), *fence); - try - { - auto res = dec.device.waitForFences(*fence, true, UINT64_MAX); - if (res != vk::Result::eSuccess) - spdlog::warn("waitForFences failed"); - - auto scene = weak_scene.lock(); + if (auto scene = weak_scene.lock()) scene->push_blit_handle( accumulator, std::make_shared( @@ -266,7 +300,15 @@ void decoder::worker_function(uint32_t queue_family_index) item->view_full, item->image, &item->current_layout, + *item->semaphore, + item->semaphore_val, item->free)); + + try + { + auto res = dec.device.waitForFences(*fence, true, UINT64_MAX); + if (res != vk::Result::eSuccess) + spdlog::warn("waitForFences failed"); } catch (...) {} diff --git a/client/decoder/pyrowave/decoder.h b/client/decoder/pyrowave/decoder.h index b0898239..cf3ecd45 100644 --- a/client/decoder/pyrowave/decoder.h +++ b/client/decoder/pyrowave/decoder.h @@ -50,6 +50,8 @@ public: vk::raii::ImageView & image_view; vk::Image image = nullptr; vk::ImageLayout * current_layout = nullptr; + vk::Semaphore semaphore = nullptr; + uint64_t & semaphore_val; std::atomic_bool & free; @@ -67,6 +69,8 @@ private: vk::raii::ImageView view_cr = nullptr; vk::ImageLayout current_layout = vk::ImageLayout::eUndefined; std::atomic_bool free = true; + vk::raii::Semaphore semaphore = nullptr; + uint64_t semaphore_val = 0; }; vk::raii::SamplerYcbcrConversion ycbcr_conversion; diff --git a/client/scenes/stream.cpp b/client/scenes/stream.cpp index e3daeb93..3956e095 100644 --- a/client/scenes/stream.cpp +++ b/client/scenes/stream.cpp @@ -927,6 +927,25 @@ void scenes::stream::render(const XrFrameState & frame_state) command_buffer.end(); vk::SubmitInfo submit_info; submit_info.setCommandBuffers(*command_buffer); + std::vector semaphores; + std::vector semaphore_vals; + std::vector wait_stages; + for (auto b: current_blit_handles) + { + if (b and b->semaphore) + { + semaphores.push_back(b->semaphore); + semaphore_vals.push_back(b->semaphore_val); + wait_stages.push_back(vk::PipelineStageFlagBits::eFragmentShader); + } + } + submit_info.setWaitDstStageMask(wait_stages); + submit_info.setWaitSemaphores(semaphores); + vk::TimelineSemaphoreSubmitInfo sem_info{ + .waitSemaphoreValueCount = uint32_t(semaphore_vals.size()), + .pWaitSemaphoreValues = semaphore_vals.data(), + }; + submit_info.pNext = &sem_info; queue.lock()->submit(submit_info, *fence); #if WIVRN_FEATURE_RENDERDOC renderdoc_end(*vk_instance);