From e1b734fd12326e8c23b9f9835a2399e982b8e396 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sun, 15 Dec 2019 13:38:42 +0300 Subject: [PATCH] rsx: Fix linux build --- rpcs3/Emu/RSX/GL/GLGSRender.cpp | 2 +- rpcs3/Emu/RSX/GL/GLOverlays.h | 2 +- rpcs3/Emu/RSX/VK/VKCompute.h | 4 ++-- rpcs3/Emu/RSX/VK/VKHelpers.h | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp index 51ea91c676..0a4073d16d 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp +++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp @@ -1110,7 +1110,7 @@ void GLGSRender::clear_surface(u32 arg) if (arg & 0xF0) ctx |= rsx::framebuffer_creation_context::context_clear_color; if (arg & 0x3) ctx |= rsx::framebuffer_creation_context::context_clear_depth; - init_buffers((rsx::framebuffer_creation_context)ctx, true); + init_buffers(static_cast(ctx), true); if (!framebuffer_status_valid) return; diff --git a/rpcs3/Emu/RSX/GL/GLOverlays.h b/rpcs3/Emu/RSX/GL/GLOverlays.h index e8fd19217b..7d9aec3ea2 100644 --- a/rpcs3/Emu/RSX/GL/GLOverlays.h +++ b/rpcs3/Emu/RSX/GL/GLOverlays.h @@ -132,7 +132,7 @@ namespace gl glBindVertexArray(old_vao); } - virtual void run(const areau& region, GLuint target_texture, bool depth_target, bool use_blending = false) + void run(const areau& region, GLuint target_texture, bool depth_target, bool use_blending = false) { if (!compiled) { diff --git a/rpcs3/Emu/RSX/VK/VKCompute.h b/rpcs3/Emu/RSX/VK/VKCompute.h index 39d6415f8c..0607750dc1 100644 --- a/rpcs3/Emu/RSX/VK/VKCompute.h +++ b/rpcs3/Emu/RSX/VK/VKCompute.h @@ -199,13 +199,13 @@ namespace vk vkCmdBindDescriptorSets(cmd, VK_PIPELINE_BIND_POINT_COMPUTE, m_pipeline_layout, 0, 1, &m_descriptor_set, 0, nullptr); } - virtual void run(VkCommandBuffer cmd, u32 invocations_x, u32 invocations_y, u32 invocations_z) + void run(VkCommandBuffer cmd, u32 invocations_x, u32 invocations_y, u32 invocations_z) { load_program(cmd); vkCmdDispatch(cmd, invocations_x, invocations_y, invocations_z); } - virtual void run(VkCommandBuffer cmd, u32 num_invocations) + void run(VkCommandBuffer cmd, u32 num_invocations) { u32 invocations_x, invocations_y; if (num_invocations > max_invocations_x) diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h index f11e072453..d73de01417 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.h +++ b/rpcs3/Emu/RSX/VK/VKHelpers.h @@ -906,13 +906,13 @@ private: // Import optional function endpoints if (pgpu->conditional_render_support) { - cmdBeginConditionalRenderingEXT = (PFN_vkCmdBeginConditionalRenderingEXT)vkGetDeviceProcAddr(dev, "vkCmdBeginConditionalRenderingEXT"); - cmdEndConditionalRenderingEXT = (PFN_vkCmdEndConditionalRenderingEXT)vkGetDeviceProcAddr(dev, "vkCmdEndConditionalRenderingEXT"); + cmdBeginConditionalRenderingEXT = reinterpret_cast(vkGetDeviceProcAddr(dev, "vkCmdBeginConditionalRenderingEXT")); + cmdEndConditionalRenderingEXT = reinterpret_cast(vkGetDeviceProcAddr(dev, "vkCmdEndConditionalRenderingEXT")); } if (pgpu->host_query_reset_support) { - resetQueryPoolEXT = (PFN_vkResetQueryPoolEXT)vkGetDeviceProcAddr(dev, "vkResetQueryPoolEXT"); + resetQueryPoolEXT = reinterpret_cast(vkGetDeviceProcAddr(dev, "vkResetQueryPoolEXT")); } memory_map = vk::get_memory_mapping(pdev);