mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-11 18:50:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx: Minor fixes

Browse source 
- texture_cache: Fix internal size calculation for subresources
- vk: Delay dynamic state updates until just about to draw to ensure no flush has discarded the cb state
This commit is contained in:
kd-11 2017-11-05 17:57:00 +03:00
commit 8733505d0a
3 changed files with 48 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rpcs3/Emu/RSX/Common/texture_cache.h
View file

@ -1292,13 +1292,13 @@ namespace rsx
} }
else else
{ {
u16 internal_height = rsx::apply_resolution_scale(rsc.h, true); u16 internal_width = tex_width;
if (extended_dimension == rsx::texture_dimension_extended::texture_dimension_1d) u16 internal_height = tex_height;
internal_height = 1;
get_native_dimensions(internal_width, internal_height, rsc.surface);
if (!rsc.is_bound || !g_cfg.video.strict_rendering_mode) if (!rsc.is_bound || !g_cfg.video.strict_rendering_mode)
{ {
if (rsc.w == tex_width && rsc.h == tex_height) if (rsc.w == internal_width && rsc.h == internal_height)
{ {
if (rsc.is_bound) if (rsc.is_bound)
{ {
@ -1315,9 +1315,12 @@ namespace rsx
LOG_WARNING(RSX, "Attempting to sample a currently bound render target @ 0x%x", texaddr); LOG_WARNING(RSX, "Attempting to sample a currently bound render target @ 0x%x", texaddr);
} }
internal_width = rsx::apply_resolution_scale(internal_width, true);
internal_height = (extended_dimension == rsx::texture_dimension_extended::texture_dimension_1d)? 1: rsx::apply_resolution_scale(internal_height, true);
return{ rsc.surface->get_surface(), rsc.base_address, format, rsx::apply_resolution_scale(rsc.x, false), rsx::apply_resolution_scale(rsc.y, false), return{ rsc.surface->get_surface(), rsc.base_address, format, rsx::apply_resolution_scale(rsc.x, false), rsx::apply_resolution_scale(rsc.y, false),
rsx::apply_resolution_scale(rsc.w, true), internal_height, texture_upload_context::framebuffer_storage, internal_width, internal_height, texture_upload_context::framebuffer_storage, rsc.is_depth_surface, scale_x, scale_y,
rsc.is_depth_surface, scale_x, scale_y, rsx::texture_dimension_extended::texture_dimension_2d }; rsx::texture_dimension_extended::texture_dimension_2d };
} }
} }
} }

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

@ -962,11 +962,13 @@ void VKGSRender::begin()
m_current_frame->descriptor_set = new_descriptor_set; m_current_frame->descriptor_set = new_descriptor_set;
m_current_frame->used_descriptors++; m_current_frame->used_descriptors++;
}
void VKGSRender::update_draw_state()
{
std::chrono::time_point<steady_clock> start = steady_clock::now(); std::chrono::time_point<steady_clock> start = steady_clock::now();
float actual_line_width = rsx::method_registers.line_width(); float actual_line_width = rsx::method_registers.line_width();
vkCmdSetLineWidth(*m_current_command_buffer, actual_line_width); vkCmdSetLineWidth(*m_current_command_buffer, actual_line_width);
if (rsx::method_registers.poly_offset_fill_enabled()) if (rsx::method_registers.poly_offset_fill_enabled())
@ -981,13 +983,45 @@ void VKGSRender::begin()
vkCmdSetDepthBias(*m_current_command_buffer, 0.f, 0.f, 0.f); vkCmdSetDepthBias(*m_current_command_buffer, 0.f, 0.f, 0.f);
} }
//Update dynamic state
if (rsx::method_registers.blend_enabled())
{
//Update blend constants
auto blend_colors = rsx::get_constant_blend_colors();
vkCmdSetBlendConstants(*m_current_command_buffer, blend_colors.data());
}
if (rsx::method_registers.stencil_test_enabled())
{
const bool two_sided_stencil = rsx::method_registers.two_sided_stencil_test_enabled();
VkStencilFaceFlags face_flag = (two_sided_stencil) ? VK_STENCIL_FACE_FRONT_BIT : VK_STENCIL_FRONT_AND_BACK;
vkCmdSetStencilWriteMask(*m_current_command_buffer, face_flag, rsx::method_registers.stencil_mask());
vkCmdSetStencilCompareMask(*m_current_command_buffer, face_flag, rsx::method_registers.stencil_func_mask());
vkCmdSetStencilReference(*m_current_command_buffer, face_flag, rsx::method_registers.stencil_func_ref());
if (two_sided_stencil)
{
vkCmdSetStencilWriteMask(*m_current_command_buffer, VK_STENCIL_FACE_BACK_BIT, rsx::method_registers.back_stencil_mask());
vkCmdSetStencilCompareMask(*m_current_command_buffer, VK_STENCIL_FACE_BACK_BIT, rsx::method_registers.back_stencil_func_mask());
vkCmdSetStencilReference(*m_current_command_buffer, VK_STENCIL_FACE_BACK_BIT, rsx::method_registers.back_stencil_func_ref());
}
}
if (rsx::method_registers.depth_bounds_test_enabled())
{
//Update depth bounds min/max
vkCmdSetDepthBounds(*m_current_command_buffer, rsx::method_registers.depth_bounds_min(), rsx::method_registers.depth_bounds_max());
}
set_viewport();
//TODO: Set up other render-state parameters into the program pipeline //TODO: Set up other render-state parameters into the program pipeline
std::chrono::time_point<steady_clock> stop = steady_clock::now(); std::chrono::time_point<steady_clock> stop = steady_clock::now();
m_setup_time += std::chrono::duration_cast<std::chrono::microseconds>(stop - start).count(); m_setup_time += std::chrono::duration_cast<std::chrono::microseconds>(stop - start).count();
} }
void VKGSRender::begin_render_pass() void VKGSRender::begin_render_pass()
{ {
if (render_pass_open) if (render_pass_open)
@ -1314,7 +1348,7 @@ void VKGSRender::end()
//Only textures are synchronized tightly with the GPU and they have been read back above //Only textures are synchronized tightly with the GPU and they have been read back above
vk::enter_uninterruptible(); vk::enter_uninterruptible();
set_viewport(); update_draw_state();
begin_render_pass(); begin_render_pass();
@ -1985,10 +2019,6 @@ void VKGSRender::load_program(u32 vertex_count, u32 vertex_base)
vk::pipeline_props properties = {}; vk::pipeline_props properties = {};
bool emulated_primitive_type; bool emulated_primitive_type;
bool update_blend_constants = false;
bool update_stencil_info_back = false;
bool update_stencil_info_front = false;
bool update_depth_bounds = false;
properties.ia.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; properties.ia.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO;
properties.ia.topology = vk::get_appropriate_topology(rsx::method_registers.current_draw_clause.primitive, emulated_primitive_type); properties.ia.topology = vk::get_appropriate_topology(rsx::method_registers.current_draw_clause.primitive, emulated_primitive_type);
@ -2040,9 +2070,6 @@ void VKGSRender::load_program(u32 vertex_count, u32 vertex_base)
properties.att_state[render_targets[idx]].colorBlendOp = equation_rgb; properties.att_state[render_targets[idx]].colorBlendOp = equation_rgb;
properties.att_state[render_targets[idx]].alphaBlendOp = equation_a; properties.att_state[render_targets[idx]].alphaBlendOp = equation_a;
} }
//Blend constants are dynamic
update_blend_constants = true;
} }
else else
{ {
@ -2068,7 +2095,6 @@ void VKGSRender::load_program(u32 vertex_count, u32 vertex_base)
if (rsx::method_registers.depth_bounds_test_enabled()) if (rsx::method_registers.depth_bounds_test_enabled())
{ {
properties.ds.depthBoundsTestEnable = VK_TRUE; properties.ds.depthBoundsTestEnable = VK_TRUE;
update_depth_bounds = true;
} }
else else
properties.ds.depthBoundsTestEnable = VK_FALSE; properties.ds.depthBoundsTestEnable = VK_FALSE;
@ -2087,12 +2113,9 @@ void VKGSRender::load_program(u32 vertex_count, u32 vertex_base)
properties.ds.back.passOp = vk::get_stencil_op(rsx::method_registers.back_stencil_op_zpass()); properties.ds.back.passOp = vk::get_stencil_op(rsx::method_registers.back_stencil_op_zpass());
properties.ds.back.depthFailOp = vk::get_stencil_op(rsx::method_registers.back_stencil_op_zfail()); properties.ds.back.depthFailOp = vk::get_stencil_op(rsx::method_registers.back_stencil_op_zfail());
properties.ds.back.compareOp = vk::get_compare_func(rsx::method_registers.back_stencil_func()); properties.ds.back.compareOp = vk::get_compare_func(rsx::method_registers.back_stencil_func());
update_stencil_info_back = true;
} }
else else
properties.ds.back = properties.ds.front; properties.ds.back = properties.ds.front;
update_stencil_info_front = true;
} }
else else
properties.ds.stencilTestEnable = VK_FALSE; properties.ds.stencilTestEnable = VK_FALSE;
@ -2142,36 +2165,6 @@ void VKGSRender::load_program(u32 vertex_count, u32 vertex_base)
vk::leave_uninterruptible(); vk::leave_uninterruptible();
//Update dynamic state
if (update_blend_constants)
{
//Update blend constants
auto blend_colors = rsx::get_constant_blend_colors();
vkCmdSetBlendConstants(*m_current_command_buffer, blend_colors.data());
}
if (update_stencil_info_front)
{
VkStencilFaceFlags face_flag = (update_stencil_info_back) ? VK_STENCIL_FACE_FRONT_BIT : VK_STENCIL_FRONT_AND_BACK;
vkCmdSetStencilWriteMask(*m_current_command_buffer, face_flag, rsx::method_registers.stencil_mask());
vkCmdSetStencilCompareMask(*m_current_command_buffer, face_flag, rsx::method_registers.stencil_func_mask());
vkCmdSetStencilReference(*m_current_command_buffer, face_flag, rsx::method_registers.stencil_func_ref());
if (update_stencil_info_back)
{
vkCmdSetStencilWriteMask(*m_current_command_buffer, VK_STENCIL_FACE_BACK_BIT, rsx::method_registers.back_stencil_mask());
vkCmdSetStencilCompareMask(*m_current_command_buffer, VK_STENCIL_FACE_BACK_BIT, rsx::method_registers.back_stencil_func_mask());
vkCmdSetStencilReference(*m_current_command_buffer, VK_STENCIL_FACE_BACK_BIT, rsx::method_registers.back_stencil_func_ref());
}
}
if (update_depth_bounds)
{
//Update depth bounds min/max
vkCmdSetDepthBounds(*m_current_command_buffer, rsx::method_registers.depth_bounds_min(), rsx::method_registers.depth_bounds_max());
}
const size_t fragment_constants_sz = m_prog_buffer->get_fragment_constants_buffer_size(fragment_program); const size_t fragment_constants_sz = m_prog_buffer->get_fragment_constants_buffer_size(fragment_program);
const size_t fragment_buffer_sz = fragment_constants_sz + (18 * 4 * sizeof(float)); const size_t fragment_buffer_sz = fragment_constants_sz + (18 * 4 * sizeof(float));
const size_t required_mem = 512 + 8192 + fragment_buffer_sz; const size_t required_mem = 512 + 8192 + fragment_buffer_sz;

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

@ -306,6 +306,8 @@ private:
void begin_render_pass(); void begin_render_pass();
void close_render_pass(); void close_render_pass();
void update_draw_state();
/// returns primitive topology, index_count, allocated_verts, vertex_base_index, (offset in index buffer, index type) /// returns primitive topology, index_count, allocated_verts, vertex_base_index, (offset in index buffer, index type)
std::tuple<VkPrimitiveTopology, u32, u32, u32, std::optional<std::tuple<VkDeviceSize, VkIndexType> > > upload_vertex_data(); std::tuple<VkPrimitiveTopology, u32, u32, u32, std::optional<std::tuple<VkDeviceSize, VkIndexType> > > upload_vertex_data();
public: public: