mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-15 22:21:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

vk: Add support for other formats as FSR output

Browse Source
This commit is contained in:
kd-11 2021-08-21 16:25:05 +03:00 committed by kd-11
parent afc71341a5
commit 9080d09583
4 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Emu/RSX/VK/VKRenderPass.cpp
View File

@ -245,7 +245,7 @@ namespace vk
renderpass_key_blob key(renderpass_key);
VkSampleCountFlagBits samples = static_cast<VkSampleCountFlagBits>(key.sample_count);
std::vector<VkImageLayout> rtv_layouts;
VkImageLayout dsv_layout;
VkImageLayout dsv_layout = VK_IMAGE_LAYOUT_UNDEFINED;
VkFormat color_format = static_cast<VkFormat>(key.color_format);
VkFormat depth_format = static_cast<VkFormat>(key.depth_format);

49
rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp
View File

@ -197,15 +197,15 @@ namespace vk
{
dispose_images();
auto initialize_image_impl = [output_w, output_h](VkImageUsageFlags usage)
const auto pdev = vk::get_current_renderer();
auto initialize_image_impl = [pdev, output_w, output_h](VkImageUsageFlags usage, VkFormat format)
{
const auto pdev = vk::get_current_renderer();
return std::make_unique<vk::viewable_image>(
*pdev, // Owner
pdev->get_memory_mapping().device_local, // Must be in device optimal memory
VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
VK_IMAGE_TYPE_2D,
VK_FORMAT_B8G8R8A8_UNORM, // The only format guaranteed by spec
format,
output_w, output_h, 1, 1, 1, VK_SAMPLE_COUNT_1_BIT, // Dimensions (w, h, d, mips, layers, samples)
VK_IMAGE_LAYOUT_UNDEFINED,
VK_IMAGE_TILING_OPTIMAL,
@ -215,27 +215,56 @@ namespace vk
RSX_FORMAT_CLASS_COLOR);
};
bool failed = false;
if (mode & UPSCALE_LEFT_VIEW)
const VkFlags usage_mask_output = VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
const VkFlags usage_mask_intermediate = VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_SAMPLED_BIT;
bool failed = true;
VkFormat data_format = VK_FORMAT_UNDEFINED;
// Check if it is possible to actually write to the format we want.
// Fallback to RGBA8 is supported as well
std::array<VkFormat, 2> supported_formats = { VK_FORMAT_B8G8R8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM };
for (const auto& format : supported_formats)
{
m_output_left = initialize_image_impl(VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT);
const VkFlags all_required_bits = VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT | VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT | VK_FORMAT_FEATURE_TRANSFER_SRC_BIT;
if ((pdev->get_format_properties(format).optimalTilingFeatures & all_required_bits) == all_required_bits)
{
data_format = format;
failed = false;
break;
}
}
if ((mode & UPSCALE_LEFT_VIEW) && !failed)
{
m_output_left = initialize_image_impl(usage_mask_output, data_format);
failed |= (m_output_left->value == VK_NULL_HANDLE);
}
if ((mode & UPSCALE_RIGHT_VIEW) && !failed)
{
m_output_right = initialize_image_impl(VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT);
m_output_right = initialize_image_impl(usage_mask_output, data_format);
failed |= (m_output_right->value == VK_NULL_HANDLE);
}
if (!failed)
{
m_intermediate_data = initialize_image_impl(VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_SAMPLED_BIT);
m_intermediate_data = initialize_image_impl(usage_mask_intermediate, data_format);
failed |= (m_intermediate_data->value == VK_NULL_HANDLE);
}
if (failed)
{
rsx_log.warning("FSR is enabled, but the system is out of memory. Will fall back to bilinear upscaling");
dispose_images();
if (data_format != VK_FORMAT_UNDEFINED)
{
dispose_images();
rsx_log.warning("FSR is enabled, but the system is out of memory. Will fall back to bilinear upscaling.");
}
else
{
ensure(!m_output_left && !m_output_right && !m_intermediate_data);
rsx_log.error("FSR is not supported by this driver and hardware combination.");
}
}
}

2
rpcs3/Emu/RSX/VK/vkutils/device.cpp
View File

@ -524,7 +524,7 @@ namespace vk
return m_transfer_queue_family;
}
const VkFormatProperties render_device::get_format_properties(VkFormat format)
const VkFormatProperties render_device::get_format_properties(VkFormat format) const
{
auto found = pgpu->format_properties.find(format);
if (found != pgpu->format_properties.end())

4
rpcs3/Emu/RSX/VK/vkutils/device.h
View File

@ -46,7 +46,7 @@ namespace vk
VkPhysicalDeviceMemoryProperties memory_properties;
std::vector<VkQueueFamilyProperties> queue_props;
std::unordered_map<VkFormat, VkFormatProperties> format_properties;
mutable std::unordered_map<VkFormat, VkFormatProperties> format_properties;
gpu_shader_types_support shader_types_support{};
VkPhysicalDeviceDriverPropertiesKHR driver_properties{};
@ -117,7 +117,7 @@ namespace vk
void create(vk::physical_device& pdev, u32 graphics_queue_idx, u32 present_queue_idx, u32 transfer_queue_idx);
void destroy();
const VkFormatProperties get_format_properties(VkFormat format);
const VkFormatProperties get_format_properties(VkFormat format) const;
bool get_compatible_memory_type(u32 typeBits, u32 desired_mask, u32* type_index) const;
void rebalance_memory_type_usage();