mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-09 17:49:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Compilation fixes for optional on osx

Browse source
This commit is contained in:
scribam 2018-08-29 19:34:18 +02:00 • committed by Ivan
commit 7d0e94ab0a
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -487,8 +487,8 @@ void GLGSRender::end()
if (upload_info.index_info) if (upload_info.index_info)
{ {
const GLenum index_type = std::get<0>(upload_info.index_info.value()); const GLenum index_type = std::get<0>(*upload_info.index_info);
const u32 index_offset = std::get<1>(upload_info.index_info.value()); const u32 index_offset = std::get<1>(*upload_info.index_info);
const bool restarts_valid = gl::is_primitive_native(rsx::method_registers.current_draw_clause.primitive) && !rsx::method_registers.current_draw_clause.is_disjoint_primitive; const bool restarts_valid = gl::is_primitive_native(rsx::method_registers.current_draw_clause.primitive) && !rsx::method_registers.current_draw_clause.is_disjoint_primitive;
if (gl_state.enable(restarts_valid && rsx::method_registers.restart_index_enabled(), GL_PRIMITIVE_RESTART)) if (gl_state.enable(restarts_valid && rsx::method_registers.restart_index_enabled(), GL_PRIMITIVE_RESTART))

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

@ -1484,7 +1484,7 @@ void VKGSRender::end()
const u32 index_count = upload_info.vertex_draw_count; const u32 index_count = upload_info.vertex_draw_count;
VkDeviceSize offset; VkDeviceSize offset;
std::tie(offset, index_type) = upload_info.index_info.value(); std::tie(offset, index_type) = *upload_info.index_info;
vkCmdBindIndexBuffer(*m_current_command_buffer, m_index_buffer_ring_info.heap->value, offset, index_type); vkCmdBindIndexBuffer(*m_current_command_buffer, m_index_buffer_ring_info.heap->value, offset, index_type);
if (single_draw) if (single_draw)