From c9372a674ac56af8dfa2d19f99456b87ed18c3c5 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sun, 13 Sep 2020 12:40:32 +1000 Subject: [PATCH] More build fixes... --- dep/vulkan-loader/include/vulkan_loader.h | 3 +++ src/frontend-common/d3d11_host_display.cpp | 4 ++-- src/frontend-common/opengl_host_display.cpp | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dep/vulkan-loader/include/vulkan_loader.h b/dep/vulkan-loader/include/vulkan_loader.h index 8c29f5f08..999039d80 100644 --- a/dep/vulkan-loader/include/vulkan_loader.h +++ b/dep/vulkan-loader/include/vulkan_loader.h @@ -82,6 +82,9 @@ #ifdef Unsorted #undef Unsorted #endif +#ifdef Bool +#undef Bool +#endif #endif diff --git a/src/frontend-common/d3d11_host_display.cpp b/src/frontend-common/d3d11_host_display.cpp index 25319044f..b178b8380 100644 --- a/src/frontend-common/d3d11_host_display.cpp +++ b/src/frontend-common/d3d11_host_display.cpp @@ -604,12 +604,12 @@ void D3D11HostDisplay::RenderImGui() void D3D11HostDisplay::RenderDisplay() { -#ifndef LIBRETRO if (!HasDisplayTexture()) return; const auto [left, top, width, height] = CalculateDrawRect(GetWindowWidth(), GetWindowHeight(), m_display_top_margin); +#ifndef LIBRETRO if (!m_post_processing_chain.IsEmpty()) { ApplyPostProcessingChain(m_swap_chain_rtv.Get(), left, top, width, height, m_display_texture_handle, @@ -617,11 +617,11 @@ void D3D11HostDisplay::RenderDisplay() m_display_texture_view_y, m_display_texture_view_width, m_display_texture_view_height); return; } +#endif RenderDisplay(left, top, width, height, m_display_texture_handle, m_display_texture_width, m_display_texture_height, m_display_texture_view_x, m_display_texture_view_y, m_display_texture_view_width, m_display_texture_view_height, m_display_linear_filtering); -#endif } void D3D11HostDisplay::RenderDisplay(s32 left, s32 top, s32 width, s32 height, void* texture_handle, u32 texture_width, diff --git a/src/frontend-common/opengl_host_display.cpp b/src/frontend-common/opengl_host_display.cpp index 4f2b76791..be2ab77a8 100644 --- a/src/frontend-common/opengl_host_display.cpp +++ b/src/frontend-common/opengl_host_display.cpp @@ -483,6 +483,7 @@ void OpenGLHostDisplay::RenderDisplay() const auto [left, top, width, height] = CalculateDrawRect(GetWindowWidth(), GetWindowHeight(), m_display_top_margin); +#ifndef LIBRETRO if (!m_post_processing_chain.IsEmpty()) { ApplyPostProcessingChain(0, left, top, width, height, m_display_texture_handle, m_display_texture_width, @@ -490,6 +491,7 @@ void OpenGLHostDisplay::RenderDisplay() m_display_texture_view_width, m_display_texture_view_height); return; } +#endif RenderDisplay(left, top, width, height, m_display_texture_handle, m_display_texture_width, m_display_texture_height, m_display_texture_view_x, m_display_texture_view_y, m_display_texture_view_width,