From 7d0e94ab0ae31fb0d839ae06d4e82e78ca0ccfb5 Mon Sep 17 00:00:00 2001 From: scribam Date: Wed, 29 Aug 2018 19:34:18 +0200 Subject: [PATCH] Compilation fixes for optional on osx --- rpcs3/Emu/RSX/GL/GLGSRender.cpp | 4 ++-- rpcs3/Emu/RSX/VK/VKGSRender.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp index 5732ed9fe..c114fbaea 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp +++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp @@ -487,8 +487,8 @@ void GLGSRender::end() if (upload_info.index_info) { - const GLenum index_type = std::get<0>(upload_info.index_info.value()); - const u32 index_offset = std::get<1>(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); 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)) diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp index f102664d3..32f860d0e 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp +++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp @@ -1484,7 +1484,7 @@ void VKGSRender::end() const u32 index_count = upload_info.vertex_draw_count; 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); if (single_draw)