archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 09:48:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx: Fix linux build

Browse source
This commit is contained in:
kd-11 2019-12-15 13:38:42 +03:00 • committed by kd-11
parent ed2bdb8e0c
commit e1b734fd12
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1110,7 +1110,7 @@ void GLGSRender::clear_surface(u32 arg)
if (arg & 0xF0) ctx |= rsx::framebuffer_creation_context::context_clear_color; if (arg & 0xF0) ctx |= rsx::framebuffer_creation_context::context_clear_color;
if (arg & 0x3) ctx |= rsx::framebuffer_creation_context::context_clear_depth; if (arg & 0x3) ctx |= rsx::framebuffer_creation_context::context_clear_depth;
init_buffers((rsx::framebuffer_creation_context)ctx, true); init_buffers(static_cast<rsx::framebuffer_creation_context>(ctx), true);
if (!framebuffer_status_valid) return; if (!framebuffer_status_valid) return;

2
rpcs3/Emu/RSX/GL/GLOverlays.h
View file

@ -132,7 +132,7 @@ namespace gl
glBindVertexArray(old_vao); 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) if (!compiled)
{ {

4
rpcs3/Emu/RSX/VK/VKCompute.h
View file

@ -199,13 +199,13 @@ namespace vk
vkCmdBindDescriptorSets(cmd, VK_PIPELINE_BIND_POINT_COMPUTE, m_pipeline_layout, 0, 1, &m_descriptor_set, 0, nullptr); 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); load_program(cmd);
vkCmdDispatch(cmd, invocations_x, invocations_y, invocations_z); 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; u32 invocations_x, invocations_y;
if (num_invocations > max_invocations_x) if (num_invocations > max_invocations_x)

6
rpcs3/Emu/RSX/VK/VKHelpers.h
View file

@ -906,13 +906,13 @@ private:
// Import optional function endpoints // Import optional function endpoints
if (pgpu->conditional_render_support) if (pgpu->conditional_render_support)
{ {
cmdBeginConditionalRenderingEXT = (PFN_vkCmdBeginConditionalRenderingEXT)vkGetDeviceProcAddr(dev, "vkCmdBeginConditionalRenderingEXT"); cmdBeginConditionalRenderingEXT = reinterpret_cast<PFN_vkCmdBeginConditionalRenderingEXT>(vkGetDeviceProcAddr(dev, "vkCmdBeginConditionalRenderingEXT"));
cmdEndConditionalRenderingEXT = (PFN_vkCmdEndConditionalRenderingEXT)vkGetDeviceProcAddr(dev, "vkCmdEndConditionalRenderingEXT"); cmdEndConditionalRenderingEXT = reinterpret_cast<PFN_vkCmdEndConditionalRenderingEXT>(vkGetDeviceProcAddr(dev, "vkCmdEndConditionalRenderingEXT"));
} }
if (pgpu->host_query_reset_support) if (pgpu->host_query_reset_support)
{ {
resetQueryPoolEXT = (PFN_vkResetQueryPoolEXT)vkGetDeviceProcAddr(dev, "vkResetQueryPoolEXT"); resetQueryPoolEXT = reinterpret_cast<PFN_vkResetQueryPoolEXT>(vkGetDeviceProcAddr(dev, "vkResetQueryPoolEXT"));
} }
memory_map = vk::get_memory_mapping(pdev); memory_map = vk::get_memory_mapping(pdev);