ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vk: Clean up some leftovers from shader decompiler rewrites

This commit is contained in:
kd-11 2020-12-14 21:40:16 +03:00 committed by kd-11
parent d3686dbb75
commit 42f4e831a2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1016,7 +1016,7 @@ void VKGSRender::on_init_thread()
if (!m_overlay_manager) if (!m_overlay_manager)
{ {
m_frame->hide(); m_frame->hide();
m_shaders_cache->load(nullptr, *m_device, pipeline_layout); m_shaders_cache->load(nullptr, pipeline_layout);
m_frame->show(); m_frame->show();
} }
else else
@ -1024,7 +1024,7 @@ void VKGSRender::on_init_thread()
rsx::shader_loading_dialog_native dlg(this); rsx::shader_loading_dialog_native dlg(this);
// TODO: Handle window resize messages during loading on GPUs without OUT_OF_DATE_KHR support // TODO: Handle window resize messages during loading on GPUs without OUT_OF_DATE_KHR support
m_shaders_cache->load(&dlg, *m_device, pipeline_layout); m_shaders_cache->load(&dlg, pipeline_layout);
} }
} }
@ -1634,7 +1634,7 @@ bool VKGSRender::load_program()
vertex_program.skip_vertex_input_check = true; vertex_program.skip_vertex_input_check = true;
fragment_program.unnormalized_coords = 0; fragment_program.unnormalized_coords = 0;
m_program = m_prog_buffer->get_graphics_pipeline(vertex_program, fragment_program, properties, m_program = m_prog_buffer->get_graphics_pipeline(vertex_program, fragment_program, properties,
shadermode != shader_mode::recompiler, true, *m_device, pipeline_layout); shadermode != shader_mode::recompiler, true, pipeline_layout);
vk::leave_uninterruptible(); vk::leave_uninterruptible();

2
rpcs3/Emu/RSX/VK/VKProgramBuffer.h
View File

@ -50,7 +50,7 @@ namespace vk
const vk::pipeline_props& pipelineProperties, const vk::pipeline_props& pipelineProperties,
bool compile_async, bool compile_async,
std::function<pipeline_type*(pipeline_storage_type&)> callback, std::function<pipeline_type*(pipeline_storage_type&)> callback,
VkDevice dev, VkPipelineLayout common_pipeline_layout) VkPipelineLayout common_pipeline_layout)
{ {
const auto compiler_flags = compile_async ? vk::pipe_compiler::COMPILE_DEFERRED : vk::pipe_compiler::COMPILE_INLINE; const auto compiler_flags = compile_async ? vk::pipe_compiler::COMPILE_DEFERRED : vk::pipe_compiler::COMPILE_INLINE;
VkShaderModule modules[2] = { vertexProgramData.handle, fragmentProgramData.handle }; VkShaderModule modules[2] = { vertexProgramData.handle, fragmentProgramData.handle };

4
rpcs3/Emu/RSX/VK/VKTextOut.h
View File

@ -66,7 +66,7 @@ namespace vk
CHECK_RESULT(vkCreatePipelineLayout(dev, &layout_info, nullptr, &m_pipeline_layout)); CHECK_RESULT(vkCreatePipelineLayout(dev, &layout_info, nullptr, &m_pipeline_layout));
} }
void init_program(vk::render_device &dev) void init_program()
{ {
std::string vs = std::string vs =
{ {
@ -266,7 +266,7 @@ namespace vk
m_uniform_buffer_size = 983040; m_uniform_buffer_size = 983040;
init_descriptor_set(dev); init_descriptor_set(dev);
init_program(dev); init_program();
GlyphManager glyph_source; GlyphManager glyph_source;
auto points = glyph_source.generate_point_map(); auto points = glyph_source.generate_point_map();