From 2168af0d3d181ff0c9e1d5eda0142b0718a64c18 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Mon, 26 Sep 2011 18:25:40 -0500 Subject: [PATCH] partial revert of revision 0eec6f0; restores screenshot functionality on Direct3D (fixes issue 463) --- src/RageDisplay_D3D.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/RageDisplay_D3D.cpp b/src/RageDisplay_D3D.cpp index fd485bee6a..1f387e7c29 100644 --- a/src/RageDisplay_D3D.cpp +++ b/src/RageDisplay_D3D.cpp @@ -13,6 +13,7 @@ #include "DisplayResolutions.h" #include "LocalizedString.h" +#include #include #include @@ -21,7 +22,8 @@ // Static libraries // load Windows D3D8 dynamically #if defined(_MSC_VER) - #pragma comment(lib, "d3d8.lib") + //#pragma comment(lib, "d3d8.lib") + #pragma comment(lib, "d3dx8.lib") #pragma comment(lib, "DxErr8.lib") #endif @@ -639,8 +641,8 @@ RageSurface* RageDisplay_D3D::CreateScreenshot() // Aldo_MX: D3DXLoadSurfaceFromSurface requires d3dx8core.h, I replaced it with CopyRects to // remove this dependency so its possible to compile SM with any DirectX SDK up to Aug 2007 - //D3DXLoadSurfaceFromSurface( pCopy, NULL, NULL, pSurface, NULL, NULL, D3DX_DEFAULT, 0 ); - g_pd3dDevice->CopyRects( pSurface, NULL, 0, pCopy, NULL ); + D3DXLoadSurfaceFromSurface( pCopy, NULL, NULL, pSurface, NULL, NULL, D3DX_DEFAULT, 0 ); + //g_pd3dDevice->CopyRects( pSurface, NULL, 0, pCopy, NULL ); pSurface->Release();