summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/D3D/Render.cpp
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-06-15 14:16:53 +0200
committerPierre Bourdon <delroth@gmail.com>2014-06-15 14:16:53 +0200
commit020b4fde1e433240f6d1f2fd2af0b56aaab8f122 (patch)
tree9f919c0972d806d3b7d256feb122bc4c1d8bd5d2 /Source/Core/VideoBackends/D3D/Render.cpp
parenta6395ae5b3ae4406b22c81ef9f3c4d6dd3f96f38 (diff)
parentf2759ffe65b00b1e49486e7ab050a1ac079921c1 (diff)
Merge pull request #492 from Armada651/master
Remove EmuWindow
Diffstat (limited to 'Source/Core/VideoBackends/D3D/Render.cpp')
-rw-r--r--Source/Core/VideoBackends/D3D/Render.cpp22
1 files changed, 4 insertions, 18 deletions
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp
index f7c493577c..0db11ec1c2 100644
--- a/Source/Core/VideoBackends/D3D/Render.cpp
+++ b/Source/Core/VideoBackends/D3D/Render.cpp
@@ -26,7 +26,6 @@
#include "VideoCommon/AVIDump.h"
#include "VideoCommon/BPFunctions.h"
-#include "VideoCommon/EmuWindow.h"
#include "VideoCommon/Fifo.h"
#include "VideoCommon/FPSCounter.h"
#include "VideoCommon/ImageWrite.h"
@@ -178,7 +177,7 @@ void CreateScreenshotTexture(const TargetRectangle& rc)
D3D::SetDebugObjectName((ID3D11DeviceChild*)s_screenshot_texture, "staging screenshot texture");
}
-Renderer::Renderer()
+Renderer::Renderer(void *&window_handle)
{
int x, y, w_temp, h_temp;
@@ -186,7 +185,7 @@ Renderer::Renderer()
Host_GetRenderWindowSize(x, y, w_temp, h_temp);
- D3D::Create(EmuWindow::GetWnd());
+ D3D::Create((HWND)window_handle);
s_backbuffer_width = D3D::GetBackBufferWidth();
s_backbuffer_height = D3D::GetBackBufferHeight();
@@ -275,21 +274,8 @@ TargetRectangle Renderer::ConvertEFBRectangle(const EFBRectangle& rc)
// size.
bool Renderer::CheckForResize()
{
- while (EmuWindow::IsSizing())
- Sleep(10);
-
- if (EmuWindow::GetParentWnd())
- {
- // Re-stretch window to parent window size again, if it has a parent window.
- RECT rcParentWindow;
- GetWindowRect(EmuWindow::GetParentWnd(), &rcParentWindow);
- int width = rcParentWindow.right - rcParentWindow.left;
- int height = rcParentWindow.bottom - rcParentWindow.top;
- if (width != Renderer::GetBackbufferWidth() || height != Renderer::GetBackbufferHeight())
- MoveWindow(EmuWindow::GetWnd(), 0, 0, width, height, FALSE);
- }
RECT rcWindow;
- GetClientRect(EmuWindow::GetWnd(), &rcWindow);
+ GetClientRect(D3D::hWnd, &rcWindow);
int client_width = rcWindow.right - rcWindow.left;
int client_height = rcWindow.bottom - rcWindow.top;
@@ -866,7 +852,7 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangl
{
s_recordWidth = GetTargetRectangle().GetWidth();
s_recordHeight = GetTargetRectangle().GetHeight();
- bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), s_recordWidth, s_recordHeight);
+ bAVIDumping = AVIDump::Start(D3D::hWnd, s_recordWidth, s_recordHeight);
if (!bAVIDumping)
{
PanicAlert("Error dumping frames to AVI.");