ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More build fixes...

This commit is contained in:
Connor McLaughlin 2020-09-13 12:40:32 +10:00
parent a1f527eddf
commit c9372a674a
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dep/vulkan-loader/include/vulkan_loader.h
View File

@ -82,6 +82,9 @@
#ifdef Unsorted #ifdef Unsorted
#undef Unsorted #undef Unsorted
#endif #endif
#ifdef Bool
#undef Bool
#endif
#endif #endif

4
src/frontend-common/d3d11_host_display.cpp
View File

@ -604,12 +604,12 @@ void D3D11HostDisplay::RenderImGui()
void D3D11HostDisplay::RenderDisplay() void D3D11HostDisplay::RenderDisplay()
{ {
#ifndef LIBRETRO
if (!HasDisplayTexture()) if (!HasDisplayTexture())
return; return;
const auto [left, top, width, height] = CalculateDrawRect(GetWindowWidth(), GetWindowHeight(), m_display_top_margin); const auto [left, top, width, height] = CalculateDrawRect(GetWindowWidth(), GetWindowHeight(), m_display_top_margin);
#ifndef LIBRETRO
if (!m_post_processing_chain.IsEmpty()) if (!m_post_processing_chain.IsEmpty())
{ {
ApplyPostProcessingChain(m_swap_chain_rtv.Get(), left, top, width, height, m_display_texture_handle, 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); m_display_texture_view_y, m_display_texture_view_width, m_display_texture_view_height);
return; return;
} }
#endif
RenderDisplay(left, top, width, height, m_display_texture_handle, m_display_texture_width, m_display_texture_height, 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_x, m_display_texture_view_y, m_display_texture_view_width,
m_display_texture_view_height, m_display_linear_filtering); 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, void D3D11HostDisplay::RenderDisplay(s32 left, s32 top, s32 width, s32 height, void* texture_handle, u32 texture_width,

2
src/frontend-common/opengl_host_display.cpp
View File

@ -483,6 +483,7 @@ void OpenGLHostDisplay::RenderDisplay()
const auto [left, top, width, height] = CalculateDrawRect(GetWindowWidth(), GetWindowHeight(), m_display_top_margin); const auto [left, top, width, height] = CalculateDrawRect(GetWindowWidth(), GetWindowHeight(), m_display_top_margin);
#ifndef LIBRETRO
if (!m_post_processing_chain.IsEmpty()) if (!m_post_processing_chain.IsEmpty())
{ {
ApplyPostProcessingChain(0, left, top, width, height, m_display_texture_handle, m_display_texture_width, 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); m_display_texture_view_width, m_display_texture_view_height);
return; return;
} }
#endif
RenderDisplay(left, top, width, height, m_display_texture_handle, m_display_texture_width, m_display_texture_height, 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_x, m_display_texture_view_y, m_display_texture_view_width,