diff --git a/client/decoder/android/android_decoder.cpp b/client/decoder/android/android_decoder.cpp index 71df4ec5..2a906ed5 100644 --- a/client/decoder/android/android_decoder.cpp +++ b/client/decoder/android/android_decoder.cpp @@ -805,8 +805,6 @@ void decoder::blit(vk::raii::CommandBuffer& command_buffer, blit_handle & handle .dstAccessMask = vk::AccessFlagBits::eShaderRead, .oldLayout = vk::ImageLayout::eUndefined, .newLayout = vk::ImageLayout::eShaderReadOnlyOptimal, - .srcQueueFamilyIndex = vk::QueueFamilyIgnored, - .dstQueueFamilyIndex = vk::QueueFamilyIgnored, .image = *handle.vk_data->vimage, .subresourceRange = { .aspectMask = vk::ImageAspectFlagBits::eColor, diff --git a/client/decoder/ffmpeg/ffmpeg_decoder.cpp b/client/decoder/ffmpeg/ffmpeg_decoder.cpp index 40ef5ece..bd6c7b38 100644 --- a/client/decoder/ffmpeg/ffmpeg_decoder.cpp +++ b/client/decoder/ffmpeg/ffmpeg_decoder.cpp @@ -85,24 +85,25 @@ decoder::decoder( { free_images[i] = i; - vk::ImageCreateInfo image_info; - image_info.imageType = vk::ImageType::e2D; - image_info.format = vk::Format::eA8B8G8R8SrgbPack32; - image_info.extent.width = description.width; - image_info.extent.height = description.height; - image_info.extent.depth = 1; - image_info.mipLevels = 1; - image_info.arrayLayers = 1; - image_info.samples = vk::SampleCountFlagBits::e1; - image_info.tiling = vk::ImageTiling::eLinear; - image_info.usage = vk::ImageUsageFlagBits::eSampled | vk::ImageUsageFlagBits::eTransferSrc; - image_info.sharingMode = vk::SharingMode::eExclusive; - image_info.queueFamilyIndexCount = 0; - image_info.pQueueFamilyIndices = nullptr; - image_info.initialLayout = vk::ImageLayout::eUndefined; + vk::ImageCreateInfo image_info{ + .imageType = vk::ImageType::e2D, + .format = vk::Format::eA8B8G8R8SrgbPack32, + .extent = { + .width = description.width, + .height = description.height, + .depth = 1, + }, + .mipLevels = 1, + .arrayLayers = 1, + .samples = vk::SampleCountFlagBits::e1, + .tiling = vk::ImageTiling::eLinear, + .usage = vk::ImageUsageFlagBits::eSampled | vk::ImageUsageFlagBits::eTransferSrc, + .initialLayout = vk::ImageLayout::eUndefined, + }; - VmaAllocationCreateInfo alloc_info{}; - alloc_info.requiredFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + VmaAllocationCreateInfo alloc_info{ + .requiredFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT + }; decoded_images[i].image = image_allocation(image_info, alloc_info); @@ -138,17 +139,18 @@ void decoder::blit(vk::raii::CommandBuffer& command_buffer, blit_handle & handle // Transition layout to VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL // TODO: transition only if needed - vk::ImageMemoryBarrier barrier; - barrier.image = handle.image; - barrier.subresourceRange.aspectMask = vk::ImageAspectFlagBits::eColor; - barrier.subresourceRange.levelCount = 1; - barrier.subresourceRange.layerCount = 1; - barrier.srcQueueFamilyIndex = vk::QueueFamilyIgnored; - barrier.dstQueueFamilyIndex = vk::QueueFamilyIgnored; - barrier.srcAccessMask = vk::AccessFlagBits::eTransferWrite; - barrier.dstAccessMask = vk::AccessFlagBits::eTransferWrite; - barrier.oldLayout = vk::ImageLayout::eUndefined; - barrier.newLayout = vk::ImageLayout::eTransferSrcOptimal; + vk::ImageMemoryBarrier barrier{ + .srcAccessMask = vk::AccessFlagBits::eTransferWrite, + .dstAccessMask = vk::AccessFlagBits::eTransferWrite, + .oldLayout = vk::ImageLayout::eUndefined, + .newLayout = vk::ImageLayout::eTransferSrcOptimal, + .image = handle.image, + .subresourceRange = { + .aspectMask = vk::ImageAspectFlagBits::eColor, + .levelCount = 1, + .layerCount = 1, + }, + }; command_buffer.pipelineBarrier(vk::PipelineStageFlagBits::eAllCommands, vk::PipelineStageFlagBits::eAllCommands, vk::DependencyFlags{}, {}, {}, barrier); diff --git a/client/render/text_rasterizer.cpp b/client/render/text_rasterizer.cpp index d26fa17c..d6c1a2d0 100644 --- a/client/render/text_rasterizer.cpp +++ b/client/render/text_rasterizer.cpp @@ -1,7 +1,6 @@ /* * WiVRn VR streaming - * Copyright (C) 2022 Guillaume Meunier - * Copyright (C) 2022 Patrick Nicolas + * Copyright (C) 2022-2024 Guillaume Meunier * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -140,39 +139,44 @@ text_rasterizer::text_rasterizer(vk::raii::Device& device, vk::raii::PhysicalDev } } -image_allocation text_rasterizer::create_image(vk::Extent2D size, VmaMemoryUsage usage) +image_allocation text_rasterizer::create_image(vk::Extent2D size) { - vk::ImageCreateInfo image_info; - image_info.imageType = vk::ImageType::e2D; - image_info.format = text::format; - image_info.extent.width = size.width; - image_info.extent.height = size.height; - image_info.extent.depth = 1; - image_info.mipLevels = 1; - image_info.arrayLayers = 1; - image_info.samples = vk::SampleCountFlagBits::e1; - image_info.tiling = vk::ImageTiling::eOptimal; - image_info.usage = vk::ImageUsageFlagBits::eSampled | vk::ImageUsageFlagBits::eTransferDst; - image_info.sharingMode = vk::SharingMode::eExclusive; - image_info.initialLayout = vk::ImageLayout::eUndefined; + image_allocation alloc{vk::ImageCreateInfo{ + .imageType = vk::ImageType::e2D, + .format = text::format, + .extent = { + .width = size.width, + .height = size.height, + .depth = 1, + }, + .mipLevels = 1, + .arrayLayers = 1, + .samples = vk::SampleCountFlagBits::e1, + .tiling = vk::ImageTiling::eOptimal, + .usage = vk::ImageUsageFlagBits::eSampled | vk::ImageUsageFlagBits::eTransferDst, + .sharingMode = vk::SharingMode::eExclusive, + .initialLayout = vk::ImageLayout::eUndefined, + }, + VmaAllocationCreateInfo{ + .flags = 0, + .usage = VMA_MEMORY_USAGE_AUTO, + }}; - VmaAllocationCreateInfo alloc_info{}; - alloc_info.usage = VMA_MEMORY_USAGE_GPU_ONLY; - - return image_allocation{image_info, alloc_info}; + return alloc; } -buffer_allocation text_rasterizer::create_buffer(size_t size, VmaMemoryUsage usage) +buffer_allocation text_rasterizer::create_buffer(size_t size) { - vk::BufferCreateInfo buffer_info; - buffer_info.size = size; - buffer_info.usage = vk::BufferUsageFlagBits::eTransferSrc; - buffer_info.sharingMode = vk::SharingMode::eExclusive; + buffer_allocation alloc{vk::BufferCreateInfo{ + .size = size, + .usage = vk::BufferUsageFlagBits::eTransferSrc, + }, + VmaAllocationCreateInfo { + .flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT, + .usage = VMA_MEMORY_USAGE_AUTO, + }}; - VmaAllocationCreateInfo alloc_info{}; - alloc_info.usage = VMA_MEMORY_USAGE_CPU_TO_GPU; - - return buffer_allocation{buffer_info, alloc_info}; + return alloc; } text_rasterizer::~text_rasterizer() @@ -285,9 +289,9 @@ text text_rasterizer::render(std::string_view s) return_value.size.width = x_max - x_min; return_value.size.height = y_max - y_min; - return_value.image = create_image(return_value.size, VMA_MEMORY_USAGE_GPU_ONLY); + return_value.image = create_image(return_value.size); - buffer_allocation staging_buffer = create_buffer(rendered_text.size(), VMA_MEMORY_USAGE_CPU_TO_GPU); + buffer_allocation staging_buffer = create_buffer(rendered_text.size()); void * mapped = staging_buffer.map(); memcpy(mapped, rendered_text.data(), rendered_text.size()); @@ -308,8 +312,6 @@ text text_rasterizer::render(std::string_view s) .dstAccessMask = vk::AccessFlagBits::eTransferWrite, .oldLayout = vk::ImageLayout::eUndefined, .newLayout = vk::ImageLayout::eTransferDstOptimal, - .srcQueueFamilyIndex = vk::QueueFamilyIgnored, - .dstQueueFamilyIndex = vk::QueueFamilyIgnored, .image = vk::Image{return_value.image}, .subresourceRange = { .aspectMask = vk::ImageAspectFlagBits::eColor, diff --git a/client/render/text_rasterizer.h b/client/render/text_rasterizer.h index 2ef62bc1..142e2cc0 100644 --- a/client/render/text_rasterizer.h +++ b/client/render/text_rasterizer.h @@ -1,7 +1,7 @@ /* * WiVRn VR streaming - * Copyright (C) 2022 Guillaume Meunier - * Copyright (C) 2022 Patrick Nicolas + * Copyright (C) 2022-2024 Guillaume Meunier + * Copyright (C) 2022-2023 Patrick Nicolas * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -57,8 +57,8 @@ class text_rasterizer hb_font_t * font{}; hb_buffer_t * buffer{}; - image_allocation create_image(vk::Extent2D size, VmaMemoryUsage usage); - buffer_allocation create_buffer(size_t size, VmaMemoryUsage usage); + image_allocation create_image(vk::Extent2D size); + buffer_allocation create_buffer(size_t size); vk::raii::DeviceMemory allocate_memory(vk::Buffer buffer, vk::MemoryPropertyFlags flags); public: diff --git a/client/scenes/stream.cpp b/client/scenes/stream.cpp index c33ca67b..c589de9f 100644 --- a/client/scenes/stream.cpp +++ b/client/scenes/stream.cpp @@ -278,8 +278,6 @@ void scenes::stream::render() barrier.dstAccessMask = vk::AccessFlagBits::eShaderRead; barrier.oldLayout = vk::ImageLayout::eUndefined; barrier.newLayout = shard_accumulator::framebuffer_expected_layout; - barrier.srcQueueFamilyIndex = vk::QueueFamilyIgnored; - barrier.dstQueueFamilyIndex = vk::QueueFamilyIgnored; barrier.image = (vk::Image)decoder_output[i].image; barrier.subresourceRange.aspectMask = vk::ImageAspectFlagBits::eColor; barrier.subresourceRange.baseMipLevel = 0; @@ -335,8 +333,6 @@ void scenes::stream::render() barrier.dstAccessMask = vk::AccessFlagBits::eShaderRead; barrier.oldLayout = shard_accumulator::framebuffer_expected_layout; barrier.newLayout = vk::ImageLayout::eShaderReadOnlyOptimal; - barrier.srcQueueFamilyIndex = vk::QueueFamilyIgnored; - barrier.dstQueueFamilyIndex = vk::QueueFamilyIgnored; barrier.image = (vk::Image)decoder_output[i].image; barrier.subresourceRange.aspectMask = vk::ImageAspectFlagBits::eColor; barrier.subresourceRange.baseMipLevel = 0;