From 2568f1f2e04dab87186a84dc980a34104686991b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 11 Sep 2014 19:28:14 +0200 Subject: [PATCH] (D3D) Build fixes --- gfx/d3d9/d3d.cpp | 7 ------- gfx/d3d9/d3d_shared.h | 9 +++++++++ gfx/d3d9/render_chain.cpp | 3 +++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/gfx/d3d9/d3d.cpp b/gfx/d3d9/d3d.cpp index a9a1ea5ad0..6b02ab1d68 100644 --- a/gfx/d3d9/d3d.cpp +++ b/gfx/d3d9/d3d.cpp @@ -34,13 +34,6 @@ #include "d3d_shared.h" #ifdef HAVE_MONITOR -namespace Monitor -{ - static HMONITOR last_hm; - static HMONITOR all_hms[MAX_MONITORS]; - static unsigned num_mons; -} - static BOOL CALLBACK monitor_enum_proc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData) { diff --git a/gfx/d3d9/d3d_shared.h b/gfx/d3d9/d3d_shared.h index e6fe5ac2a3..dec004c342 100644 --- a/gfx/d3d9/d3d_shared.h +++ b/gfx/d3d9/d3d_shared.h @@ -37,6 +37,15 @@ extern LRESULT CALLBACK WindowProc(HWND hWnd, UINT message, static RECT d3d_monitor_rect(d3d_video_t *d3d); #endif +#ifdef HAVE_MONITOR +namespace Monitor +{ + static HMONITOR last_hm; + static HMONITOR all_hms[MAX_MONITORS]; + static unsigned num_mons; +} +#endif + static void d3d_deinit_shader(void *data) { d3d_video_t *d3d = (d3d_video_t*)data; diff --git a/gfx/d3d9/render_chain.cpp b/gfx/d3d9/render_chain.cpp index 96834a9e16..cecc0bb5e5 100644 --- a/gfx/d3d9/render_chain.cpp +++ b/gfx/d3d9/render_chain.cpp @@ -532,6 +532,9 @@ void renderchain_blit_to_texture(void *data, const void *frame, D3DLOCKED_RECT d3dlr; renderchain_t *chain = (renderchain_t*)data; Pass &first = chain->passes[0]; + + (void)desc; + if (first.last_width != width || first.last_height != height) { D3DTexture_LockRectClear(first, first.tex, 0, d3dlr,