mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-13 07:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
kd-11 2020-04-27 01:12:53 +03:00 committed by Ivan
parent 2ed50ba263
commit 2281c4f662
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Emu/RSX/GL/GLGSRender.cpp
View File

@ -222,7 +222,7 @@ void GLGSRender::on_init_thread()
m_texture_parameters_buffer->create(gl::buffer::target::uniform, 16 * 0x100000); m_texture_parameters_buffer->create(gl::buffer::target::uniform, 16 * 0x100000);
m_vertex_layout_buffer->create(gl::buffer::target::uniform, 16 * 0x100000); m_vertex_layout_buffer->create(gl::buffer::target::uniform, 16 * 0x100000);
if (g_cfg.video.shader_interpreter_mode != shader_interpreter_mode::disabled) if (g_cfg.video.interpreter_mode != shader_interpreter_mode::disabled)
{ {
m_vertex_instructions_buffer->create(gl::buffer::target::ssbo, 16 * 0x100000); m_vertex_instructions_buffer->create(gl::buffer::target::ssbo, 16 * 0x100000);
m_fragment_instructions_buffer->create(gl::buffer::target::ssbo, 16 * 0x100000); m_fragment_instructions_buffer->create(gl::buffer::target::ssbo, 16 * 0x100000);
@ -610,7 +610,7 @@ void GLGSRender::clear_surface(u32 arg)
bool GLGSRender::load_program() bool GLGSRender::load_program()
{ {
const auto interpreter_mode = g_cfg.video.shader_interpreter_mode.get(); const auto interpreter_mode = g_cfg.video.interpreter_mode.get();
if (m_interpreter_state = (m_graphics_state & rsx::pipeline_state::invalidate_pipeline_bits)) if (m_interpreter_state = (m_graphics_state & rsx::pipeline_state::invalidate_pipeline_bits))
{ {
get_current_fragment_program(fs_sampler_state); get_current_fragment_program(fs_sampler_state);

2
rpcs3/Emu/RSX/GL/GLShaderInterpreter.h
View File

@ -27,7 +27,7 @@ namespace gl
return false; return false;
} }
if (allocated.size() == num_used) if (allocated.size() == unsigned(num_used))
{ {
allocated.push_back(value); allocated.push_back(value);
} }

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

@ -465,7 +465,7 @@ VKGSRender::VKGSRender() : GSRender()
m_index_buffer_ring_info.create(VK_BUFFER_USAGE_INDEX_BUFFER_BIT, VK_INDEX_RING_BUFFER_SIZE_M * 0x100000, "index buffer"); m_index_buffer_ring_info.create(VK_BUFFER_USAGE_INDEX_BUFFER_BIT, VK_INDEX_RING_BUFFER_SIZE_M * 0x100000, "index buffer");
m_texture_upload_buffer_ring_info.create(VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_TEXTURE_UPLOAD_RING_BUFFER_SIZE_M * 0x100000, "texture upload buffer", 32 * 0x100000); m_texture_upload_buffer_ring_info.create(VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_TEXTURE_UPLOAD_RING_BUFFER_SIZE_M * 0x100000, "texture upload buffer", 32 * 0x100000);
if (g_cfg.video.shader_interpreter_mode != shader_interpreter_mode::disabled) if (g_cfg.video.interpreter_mode != shader_interpreter_mode::disabled)
{ {
m_vertex_instructions_buffer.create(VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, 64 * 0x100000, "vertex instructions buffer", 512 * 16); m_vertex_instructions_buffer.create(VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, 64 * 0x100000, "vertex instructions buffer", 512 * 16);
m_fragment_instructions_buffer.create(VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, 64 * 0x100000, "fragment instructions buffer", 2048); m_fragment_instructions_buffer.create(VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, 64 * 0x100000, "fragment instructions buffer", 2048);
@ -550,7 +550,7 @@ VKGSRender::VKGSRender() : GSRender()
m_occlusion_query_pool.initialize(*m_current_command_buffer); m_occlusion_query_pool.initialize(*m_current_command_buffer);
if (g_cfg.video.shader_interpreter_mode != shader_interpreter_mode::disabled) if (g_cfg.video.interpreter_mode != shader_interpreter_mode::disabled)
{ {
m_shader_interpreter.init(*m_device); m_shader_interpreter.init(*m_device);
} }
@ -1583,7 +1583,7 @@ bool VKGSRender::load_program()
} }
} }
if (g_cfg.video.shader_interpreter_mode != shader_interpreter_mode::forced) [[likely]] if (g_cfg.video.interpreter_mode != shader_interpreter_mode::forced) [[likely]]
{ {
vk::enter_uninterruptible(); vk::enter_uninterruptible();
@ -1621,7 +1621,7 @@ bool VKGSRender::load_program()
m_program = nullptr; m_program = nullptr;
} }
if (!m_program && g_cfg.video.shader_interpreter_mode != shader_interpreter_mode::disabled) if (!m_program && g_cfg.video.interpreter_mode != shader_interpreter_mode::disabled)
{ {
if (!m_shader_interpreter.is_interpreter(old_program)) if (!m_shader_interpreter.is_interpreter(old_program))
{ {

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

@ -217,7 +217,7 @@ void VKGSRender::frame_context_cleanup(vk::frame_context_t *ctx, bool free_resou
ctx->buffer_views_to_clean.clear(); ctx->buffer_views_to_clean.clear();
if (g_cfg.video.shader_interpreter_mode != shader_interpreter_mode::disabled) if (g_cfg.video.interpreter_mode != shader_interpreter_mode::disabled)
{ {
// TODO: This is jank AF // TODO: This is jank AF
m_vertex_instructions_buffer.reset_allocation_stats(); m_vertex_instructions_buffer.reset_allocation_stats();

3
rpcs3/Emu/system_config.h
View File

@ -101,7 +101,7 @@ struct cfg_root : cfg::node
cfg::_enum<video_aspect> aspect_ratio{ this, "Aspect ratio", video_aspect::_16_9 }; cfg::_enum<video_aspect> aspect_ratio{ this, "Aspect ratio", video_aspect::_16_9 };
cfg::_enum<frame_limit_type> frame_limit{ this, "Frame limit", frame_limit_type::none, true }; cfg::_enum<frame_limit_type> frame_limit{ this, "Frame limit", frame_limit_type::none, true };
cfg::_enum<msaa_level> antialiasing_level{ this, "MSAA", msaa_level::_auto }; cfg::_enum<msaa_level> antialiasing_level{ this, "MSAA", msaa_level::_auto };
cfg::_enum<shader_interpreter_mode> shader_interpreter_mode{ this, "Enable shader interpreter", shader_interpreter_mode::disabled }; cfg::_enum<shader_interpreter_mode> interpreter_mode{ this, "Shader interpreter mode", shader_interpreter_mode::disabled };
cfg::_bool write_color_buffers{ this, "Write Color Buffers" }; cfg::_bool write_color_buffers{ this, "Write Color Buffers" };
cfg::_bool write_depth_buffer{ this, "Write Depth Buffer" }; cfg::_bool write_depth_buffer{ this, "Write Depth Buffer" };
@ -132,7 +132,6 @@ struct cfg_root : cfg::node
cfg::_bool enable_3d{ this, "Enable 3D", false }; cfg::_bool enable_3d{ this, "Enable 3D", false };
cfg::_int<1, 8> consecutive_frames_to_draw{ this, "Consecutive Frames To Draw", 1, true}; cfg::_int<1, 8> consecutive_frames_to_draw{ this, "Consecutive Frames To Draw", 1, true};
cfg::_int<1, 8> consecutive_frames_to_skip{ this, "Consecutive Frames To Skip", 1, true}; cfg::_int<1, 8> consecutive_frames_to_skip{ this, "Consecutive Frames To Skip", 1, true};
cfg::_bool enable_shader_interpreter{ this, "Enable Shader Interpreter", true };
cfg::_int<50, 800> resolution_scale_percent{ this, "Resolution Scale", 100 }; cfg::_int<50, 800> resolution_scale_percent{ this, "Resolution Scale", 100 };
cfg::_int<0, 16> anisotropic_level_override{ this, "Anisotropic Filter Override", 0, true }; cfg::_int<0, 16> anisotropic_level_override{ this, "Anisotropic Filter Override", 0, true };
cfg::_int<1, 1024> min_scalable_dimension{ this, "Minimum Scalable Dimension", 16 }; cfg::_int<1, 1024> min_scalable_dimension{ this, "Minimum Scalable Dimension", 16 };

1
rpcs3/Emu/system_config_types.cpp
View File

@ -388,6 +388,7 @@ void fmt_class_string<ppu_decoder_type>::format(std::string& out, u64 arg)
}); });
} }
template <>
void fmt_class_string<shader_interpreter_mode>::format(std::string& out, u64 arg) void fmt_class_string<shader_interpreter_mode>::format(std::string& out, u64 arg)
{ {
format_enum(out, arg, [](shader_interpreter_mode value) format_enum(out, arg, [](shader_interpreter_mode value)