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

vk: New images always should be UNDEFINED or PREINITIALIZED

Browse source
This commit is contained in:
kd-11 2017-09-22 23:09:55 +03:00
parent a04ecdbe0a
commit 23ad687e7e
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rpcs3/Emu/RSX/VK/VKGSRender.cpp
View file

@ -1078,7 +1078,7 @@ void VKGSRender::end()
{ {
if (!rsx::method_registers.fragment_textures[i].enabled()) if (!rsx::method_registers.fragment_textures[i].enabled())
{ {
m_program->bind_uniform({ vk::null_sampler(), vk::null_image_view(), VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL }, "tex" + std::to_string(i), m_current_frame->descriptor_set); m_program->bind_uniform({ vk::null_sampler(), vk::null_image_view(*m_current_command_buffer), VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL }, "tex" + std::to_string(i), m_current_frame->descriptor_set);
continue; continue;
} }
@ -1087,7 +1087,7 @@ void VKGSRender::end()
if (!texture0) if (!texture0)
{ {
LOG_ERROR(RSX, "Texture upload failed to texture index %d. Binding null sampler.", i); LOG_ERROR(RSX, "Texture upload failed to texture index %d. Binding null sampler.", i);
m_program->bind_uniform({ vk::null_sampler(), vk::null_image_view(), VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL }, "tex" + std::to_string(i), m_current_frame->descriptor_set); m_program->bind_uniform({ vk::null_sampler(), vk::null_image_view(*m_current_command_buffer), VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL }, "tex" + std::to_string(i), m_current_frame->descriptor_set);
continue; continue;
} }
@ -1132,7 +1132,7 @@ void VKGSRender::end()
{ {
if (!rsx::method_registers.vertex_textures[i].enabled()) if (!rsx::method_registers.vertex_textures[i].enabled())
{ {
m_program->bind_uniform({ vk::null_sampler(), vk::null_image_view(), VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL }, "vtex" + std::to_string(i), m_current_frame->descriptor_set); m_program->bind_uniform({ vk::null_sampler(), vk::null_image_view(*m_current_command_buffer), VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL }, "vtex" + std::to_string(i), m_current_frame->descriptor_set);
continue; continue;
} }
@ -1141,7 +1141,7 @@ void VKGSRender::end()
if (!texture0) if (!texture0)
{ {
LOG_ERROR(RSX, "Texture upload failed to vtexture index %d. Binding null sampler.", i); LOG_ERROR(RSX, "Texture upload failed to vtexture index %d. Binding null sampler.", i);
m_program->bind_uniform({ vk::null_sampler(), vk::null_image_view(), VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL }, "vtex" + std::to_string(i), m_current_frame->descriptor_set); m_program->bind_uniform({ vk::null_sampler(), vk::null_image_view(*m_current_command_buffer), VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL }, "vtex" + std::to_string(i), m_current_frame->descriptor_set);
continue; continue;
} }

5
rpcs3/Emu/RSX/VK/VKHelpers.cpp
View file

@ -211,19 +211,20 @@ namespace vk
return g_null_sampler; return g_null_sampler;
} }
VkImageView null_image_view() VkImageView null_image_view(vk::command_buffer &cmd)
{ {
if (g_null_image_view) if (g_null_image_view)
return g_null_image_view->value; return g_null_image_view->value;
g_null_texture.reset(new image(g_current_renderer, get_memory_mapping(g_current_renderer.gpu()).device_local, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, g_null_texture.reset(new image(g_current_renderer, get_memory_mapping(g_current_renderer.gpu()).device_local, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
VK_IMAGE_TYPE_2D, VK_FORMAT_B8G8R8A8_UNORM, 4, 4, 1, 1, 1, VK_SAMPLE_COUNT_1_BIT, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, VK_IMAGE_TYPE_2D, VK_FORMAT_B8G8R8A8_UNORM, 4, 4, 1, 1, 1, VK_SAMPLE_COUNT_1_BIT, VK_IMAGE_LAYOUT_UNDEFINED,
VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_SAMPLED_BIT, 0)); VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_SAMPLED_BIT, 0));
g_null_image_view.reset(new image_view(g_current_renderer, g_null_texture->value, VK_IMAGE_VIEW_TYPE_2D, g_null_image_view.reset(new image_view(g_current_renderer, g_null_texture->value, VK_IMAGE_VIEW_TYPE_2D,
VK_FORMAT_B8G8R8A8_UNORM, {VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_G, VK_COMPONENT_SWIZZLE_B, VK_COMPONENT_SWIZZLE_A}, VK_FORMAT_B8G8R8A8_UNORM, {VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_G, VK_COMPONENT_SWIZZLE_B, VK_COMPONENT_SWIZZLE_A},
{VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1})); {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}));
change_image_layout(cmd, g_null_texture.get(), VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1});
return g_null_image_view->value; return g_null_image_view->value;
} }

2
rpcs3/Emu/RSX/VK/VKHelpers.h
View file

@ -71,7 +71,7 @@ namespace vk
VkImageSubresourceRange get_image_subresource_range(uint32_t base_layer, uint32_t base_mip, uint32_t layer_count, uint32_t level_count, VkImageAspectFlags aspect); VkImageSubresourceRange get_image_subresource_range(uint32_t base_layer, uint32_t base_mip, uint32_t layer_count, uint32_t level_count, VkImageAspectFlags aspect);
VkSampler null_sampler(); VkSampler null_sampler();
VkImageView null_image_view(); VkImageView null_image_view(vk::command_buffer&);
void destroy_global_resources(); void destroy_global_resources();