archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-07 15:31:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx/vk: Re-enable layout transitions in vulkan. Vulkan drivers take this hint seriously

Browse source 
- Fix enum typo
This commit is contained in:
kd-11 2017-04-03 12:18:16 +03:00
parent ce7d62968e
commit d33bc540bc
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rpcs3/Emu/RSX/VK/VKRenderTargets.h
View file

@ -12,6 +12,7 @@ namespace vk
struct render_target : public image struct render_target : public image
{ {
u16 native_pitch = 0; u16 native_pitch = 0;
VkImageAspectFlags attachment_aspect_flag = VK_IMAGE_ASPECT_COLOR_BIT;
render_target(vk::render_device &dev, render_target(vk::render_device &dev,
uint32_t memory_type_index, uint32_t memory_type_index,
@ -110,27 +111,33 @@ namespace rsx
if (format == rsx::surface_depth_format::z24s8) if (format == rsx::surface_depth_format::z24s8)
ds->native_pitch *= 2; ds->native_pitch *= 2;
ds->attachment_aspect_flag = range.aspectMask;
return ds; return ds;
} }
static void prepare_rtt_for_drawing(vk::command_buffer* pcmd, vk::render_target *surface) static void prepare_rtt_for_drawing(vk::command_buffer* pcmd, vk::render_target *surface)
{ {
// surface->change_layout(*pcmd, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); VkImageSubresourceRange range = vk::get_image_subresource_range(0, 0, 1, 1, surface->attachment_aspect_flag);
change_image_layout(*pcmd, surface->value, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, range);
} }
static void prepare_rtt_for_sampling(vk::command_buffer* pcmd, vk::render_target *surface) static void prepare_rtt_for_sampling(vk::command_buffer* pcmd, vk::render_target *surface)
{ {
// surface->change_layout(*pcmd, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL); VkImageSubresourceRange range = vk::get_image_subresource_range(0, 0, 1, 1, surface->attachment_aspect_flag);
change_image_layout(*pcmd, surface->value, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, range);
} }
static void prepare_ds_for_drawing(vk::command_buffer* pcmd, vk::render_target *surface) static void prepare_ds_for_drawing(vk::command_buffer* pcmd, vk::render_target *surface)
{ {
// surface->change_layout(*pcmd, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL); VkImageSubresourceRange range = vk::get_image_subresource_range(0, 0, 1, 1, surface->attachment_aspect_flag);
change_image_layout(*pcmd, surface->value, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL, range);
} }
static void prepare_ds_for_sampling(vk::command_buffer* pcmd, vk::render_target *surface) static void prepare_ds_for_sampling(vk::command_buffer* pcmd, vk::render_target *surface)
{ {
// surface->change_layout(*pcmd, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL); VkImageSubresourceRange range = vk::get_image_subresource_range(0, 0, 1, 1, surface->attachment_aspect_flag);
change_image_layout(*pcmd, surface->value, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, range);
} }
static bool rtt_has_format_width_height(const std::unique_ptr<vk::render_target> &rtt, surface_color_format format, size_t width, size_t height) static bool rtt_has_format_width_height(const std::unique_ptr<vk::render_target> &rtt, surface_color_format format, size_t width, size_t height)

2
rpcs3/Emu/RSX/gcm_enums.h
View file

@ -1001,7 +1001,7 @@ enum
NV3089_IMAGE_IN = 0x0000C40C >> 2, NV3089_IMAGE_IN = 0x0000C40C >> 2,
//lv1 hypervisor commands //lv1 hypervisor commands
GCM_SET_DRIVER_OBJECT = 0x0000E0000 >> 2, GCM_SET_DRIVER_OBJECT = 0x0000E000 >> 2,
GCM_FLIP_HEAD = 0X0000E920 >> 2, //0xE920:0xE924: Flip head 0 or 1 GCM_FLIP_HEAD = 0X0000E920 >> 2, //0xE920:0xE924: Flip head 0 or 1
GCM_DRIVER_QUEUE = 0X0000E940 >> 2, //0XE940:0xE95C: First two indices prepare display buffers, rest unknown GCM_DRIVER_QUEUE = 0X0000E940 >> 2, //0XE940:0xE95C: First two indices prepare display buffers, rest unknown
GCM_SET_USER_COMMAND = 0x0000EB00 >> 2, //0xEB00:0xEB04: User interrupt GCM_SET_USER_COMMAND = 0x0000EB00 >> 2, //0xEB00:0xEB04: User interrupt