Implement frame dumping in D3D11.

Fixes issue 4831.

Source/Core/VideoCommon/Src/RenderBase.cpp

@@ -52,7 +52,7 @@ int OSDChoice, OSDTime;
 
 Renderer *g_renderer = NULL;
 
-bool s_bLastFrameDumped = false;
+bool bLastFrameDumped = false;
 std::mutex Renderer::s_criticalScreenshot;
 std::string Renderer::s_sScreenshotName;
 

Source/Core/VideoCommon/Src/RenderBase.h

@@ -41,7 +41,7 @@
 extern int frameCount;
 extern int OSDChoice, OSDTime;
 
-extern bool s_bLastFrameDumped;
+extern bool bLastFrameDumped;
 
 // Renderer really isn't a very good name for this class - it's more like "Misc".
 // The long term goal is to get rid of this class and replace it with others that make

Source/Plugins/Plugin_VideoDX11/Src/Render.cpp

@@ -43,6 +43,7 @@
 #include "Television.h"
 #include "Host.h"
 #include "BPFunctions.h"
+#include "AVIDump.h"
 
 namespace DX11
 {
@@ -62,6 +63,10 @@ ID3D11BlendState* resetblendstate = NULL;
 ID3D11DepthStencilState* resetdepthstate = NULL;
 ID3D11RasterizerState* resetraststate = NULL;
 
+static ID3D11Texture2D* s_screenshot_texture = NULL;
+static bool s_bAVIDumping;
+static char *s_frame_data = NULL;
+
 // GX pipeline state
 struct
 {
@@ -296,9 +301,14 @@ void SetupDeviceObjects()
 	hr = D3D::device->CreateRasterizerState(&rastdesc, &resetraststate);
 	CHECK(hr==S_OK, "Create rasterizer state for Renderer::ResetAPIState");
 	D3D::SetDebugObjectName((ID3D11DeviceChild*)resetraststate, "rasterizer state for Renderer::ResetAPIState");
+
+	D3D11_TEXTURE2D_DESC scrtex_desc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, D3D::GetBackBufferWidth(), D3D::GetBackBufferHeight(), 1, 1, 0, D3D11_USAGE_STAGING, D3D11_CPU_ACCESS_READ|D3D11_CPU_ACCESS_WRITE);
+	hr = D3D::device->CreateTexture2D(&scrtex_desc, NULL, &s_screenshot_texture);
+	CHECK(hr==S_OK, "Create screenshot staging texture");
+	D3D::SetDebugObjectName((ID3D11DeviceChild*)s_screenshot_texture, "staging screenshot texture");
 }
 
-// Kill off all POOL_DEFAULT device objects.
+// Kill off all device objects
 void TeardownDeviceObjects()
 {
 	delete g_framebuffer_manager;
@@ -314,6 +324,7 @@ void TeardownDeviceObjects()
 	SAFE_RELEASE(resetblendstate);
 	SAFE_RELEASE(resetdepthstate);
 	SAFE_RELEASE(resetraststate);
+	SAFE_RELEASE(s_screenshot_texture);
 
 	s_television.Shutdown();
 }
@@ -344,6 +355,10 @@ Renderer::Renderer()
 
 	SetupDeviceObjects();
 
+	bLastFrameDumped = false;
+	s_bAVIDumping = false;
+
+
 	// Setup GX pipeline state
 	memset(&gx_state.blenddc, 0, sizeof(gx_state.blenddc));
 	gx_state.blenddc.AlphaToCoverageEnable = FALSE;
@@ -391,6 +406,15 @@ Renderer::Renderer()
 
 Renderer::~Renderer()
 {
+	if (g_ActiveConfig.bDumpFrames && bLastFrameDumped && s_bAVIDumping)
+	{
+		SAFE_DELETE_ARRAY(s_frame_data);
+
+		AVIDump::Stop();
+		s_bAVIDumping = false;
+		bLastFrameDumped = false;
+	}
+
 	TeardownDeviceObjects();
 	D3D::EndFrame();
 	D3D::Present();
@@ -835,15 +859,11 @@ void Renderer::SetBlendMode(bool forceUpdate)
 bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle &rc)
 {
 	// copy back buffer to system memory
-	ID3D11Texture2D* buftex;
+	D3D::context->CopyResource(s_screenshot_texture, (ID3D11Resource*)D3D::GetBackBuffer()->GetTex());
-	D3D11_TEXTURE2D_DESC tex_desc = CD3D11_TEXTURE2D_DESC(DXGI_FORMAT_R8G8B8A8_UNORM, D3D::GetBackBufferWidth(), D3D::GetBackBufferHeight(), 1, 1, 0, D3D11_USAGE_STAGING, D3D11_CPU_ACCESS_READ|D3D11_CPU_ACCESS_WRITE);
-	HRESULT hr = D3D::device->CreateTexture2D(&tex_desc, NULL, &buftex);
-	if (FAILED(hr)) PanicAlert("Failed to create screenshot buffer texture");
-	D3D::context->CopyResource(buftex, (ID3D11Resource*)D3D::GetBackBuffer()->GetTex());
 
 	// D3DX11SaveTextureToFileA doesn't allow us to ignore the alpha channel, so we need to strip it out ourselves
 	D3D11_MAPPED_SUBRESOURCE map;
-	D3D::context->Map(buftex, 0, D3D11_MAP_READ_WRITE, 0, &map);
+	D3D::context->Map(s_screenshot_texture, 0, D3D11_MAP_READ_WRITE, 0, &map);
 	for (unsigned int y = 0; y < D3D::GetBackBufferHeight(); ++y)
 	{
 		u8* ptr = (u8*)map.pData + y * map.RowPitch + 3;
@@ -853,21 +873,36 @@ bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle
 			ptr += 4;
 		}
 	}
-	D3D::context->Unmap(buftex, 0);
+	D3D::context->Unmap(s_screenshot_texture, 0);
 
 	// ready to be saved
-	hr = PD3DX11SaveTextureToFileA(D3D::context, buftex, D3DX11_IFF_PNG, filename.c_str());
+	HRESULT hr = PD3DX11SaveTextureToFileA(D3D::context, s_screenshot_texture, D3DX11_IFF_PNG, filename.c_str());
-	buftex->Release();
 
 	return SUCCEEDED(hr);
 }
 
+void formatBufferDump(const char *in, char *out, int w, int h, int p)
+{
+	for (int y = 0; y < h; ++y)
+	{
+		const u32 *line = (u32*)(in + (h - y - 1) * p);
+		for (int x = 0; x < w; ++x)
+		{
+			memcpy(out, line, 3);
+			out += 3;
+			line += 4;
+		}			
+	}
+}
 
 // This function has the final picture. We adjust the aspect ratio here.
 void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,const EFBRectangle& rc,float Gamma)
 {
 	if (g_bSkipCurrentFrame || (!XFBWrited && (!g_ActiveConfig.bUseXFB || !g_ActiveConfig.bUseRealXFB)) || !fbWidth || !fbHeight)
 	{
+		if (g_ActiveConfig.bDumpFrames)
+			AVIDump::AddFrame(s_frame_data);
+
 		Core::Callback_VideoCopiedToXFB(false);
 		return;
 	}
@@ -879,6 +914,9 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 	const XFBSourceBase* const* xfbSourceList = FramebufferManager::GetXFBSource(xfbAddr, fbWidth, fbHeight, xfbCount);
 	if ((!xfbSourceList || xfbCount == 0) && g_ActiveConfig.bUseXFB && !g_ActiveConfig.bUseRealXFB)
 	{
+		if (g_ActiveConfig.bDumpFrames)
+			AVIDump::AddFrame(s_frame_data);
+
 		Core::Callback_VideoCopiedToXFB(false);
 		return;
 	}
@@ -984,6 +1022,63 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 		s_bScreenshot = false;
 	}
 
+	// Dump frames
+	static int w = 0, h = 0;
+	if (g_ActiveConfig.bDumpFrames)
+	{
+		static int s_recordWidth;
+		static int s_recordHeight;
+
+		D3D::context->CopyResource(s_screenshot_texture, (ID3D11Resource*)D3D::GetBackBuffer()->GetTex());
+		if (!bLastFrameDumped)
+		{
+			s_recordWidth = dst_rect.GetWidth();
+			s_recordHeight = dst_rect.GetHeight();
+			s_bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), s_recordWidth, s_recordHeight);
+			if (!s_bAVIDumping)
+			{
+				PanicAlert("Error dumping frames to AVI.");
+			}
+			else
+			{
+				char msg [255];
+				sprintf_s(msg,255, "Dumping Frames to \"%sframedump0.avi\" (%dx%d RGB24)",
+						File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), s_recordWidth, s_recordHeight);
+				OSD::AddMessage(msg, 2000);
+			}
+		}
+		if (s_bAVIDumping)
+		{
+			D3D11_MAPPED_SUBRESOURCE map;
+			D3D::context->Map(s_screenshot_texture, 0, D3D11_MAP_READ, 0, &map);
+
+			if (!s_frame_data || w != s_recordWidth || h != s_recordHeight)
+			{
+				delete[] s_frame_data;
+				s_frame_data = new char[3 * s_recordWidth * s_recordHeight];
+				w = s_recordWidth;
+				h = s_recordHeight;
+			}
+			formatBufferDump((char*)map.pData, s_frame_data, s_recordWidth, s_recordHeight, map.RowPitch);
+			AVIDump::AddFrame(s_frame_data);
+			D3D::context->Unmap(s_screenshot_texture, 0);
+		}
+		bLastFrameDumped = true;
+	}
+	else
+	{
+		if (bLastFrameDumped && s_bAVIDumping)
+		{
+			SAFE_DELETE_ARRAY(s_frame_data);
+			w = h = 0;
+
+			AVIDump::Stop();
+			s_bAVIDumping = false;
+			OSD::AddMessage("Stop dumping frames to AVI", 2000);
+		}
+		bLastFrameDumped = false;
+	}
+
 	// Finish up the current frame, print some stats
 	if (g_ActiveConfig.bShowFPS)
 	{

Source/Plugins/Plugin_VideoDX9/Src/Render.cpp

@@ -60,12 +60,6 @@ namespace DX9
 
 static int s_fps = 0;
 
-static int s_recordWidth;
-static int s_recordHeight;
-
-static bool s_bLastFrameDumped;
-static bool s_bAVIDumping;
-
 static u32 s_blendMode;
 static u32 s_LastAA;
 static bool IS_AMD;
@@ -73,6 +67,7 @@ static bool IS_AMD;
 static char *st;
 
 static LPDIRECT3DSURFACE9 ScreenShootMEMSurface = NULL;
+static bool s_bAVIDumping;
 
 
 // State translation lookup tables
@@ -297,7 +292,7 @@ Renderer::Renderer()
 	// Make sure to use valid texture sizes
 	D3D::FixTextureSize(s_target_width, s_target_height);
 
-	s_bLastFrameDumped = false;
+	bLastFrameDumped = false;
 	s_bAVIDumping = false;
 
 	// We're not using fixed function.
@@ -845,11 +840,11 @@ bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle
 void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,const EFBRectangle& rc,float Gamma)
 {
 	static char* data = 0;
-	static int w = 0, h = 0;
 	if (g_bSkipCurrentFrame || (!XFBWrited && (!g_ActiveConfig.bUseXFB || !g_ActiveConfig.bUseRealXFB)) || !fbWidth || !fbHeight)
 	{
 		if (g_ActiveConfig.bDumpFrames && data)
 			AVIDump::AddFrame(data);
+
 		Core::Callback_VideoCopiedToXFB(false);
 		return;
 	}
@@ -862,6 +857,9 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 	const XFBSourceBase* const* xfbSourceList = FramebufferManager::GetXFBSource(xfbAddr, fbWidth, fbHeight, xfbCount);
 	if ((!xfbSourceList || xfbCount == 0) && g_ActiveConfig.bUseXFB && !g_ActiveConfig.bUseRealXFB)
 	{
+		if (g_ActiveConfig.bDumpFrames && data)
+			AVIDump::AddFrame(data);
+
 		Core::Callback_VideoCopiedToXFB(false);
 		return;
 	}
@@ -1027,10 +1025,16 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 		SaveScreenshot(s_sScreenshotName, dst_rect);
 		s_bScreenshot = false;
 	}
+
+	// Dump frames
+	static int w = 0, h = 0;
 	if (g_ActiveConfig.bDumpFrames)
 	{
+		static int s_recordWidth;
+		static int s_recordHeight;
+
 		HRESULT hr = D3D::dev->GetRenderTargetData(D3D::GetBackBufferSurface(),ScreenShootMEMSurface);
-		if (!s_bLastFrameDumped)
+		if (!bLastFrameDumped)
 		{
 			s_recordWidth = dst_rect.GetWidth();
 			s_recordHeight = dst_rect.GetHeight();
@@ -1064,11 +1068,11 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 				ScreenShootMEMSurface->UnlockRect();
 			}
 		}
-		s_bLastFrameDumped = true;
+		bLastFrameDumped = true;
 	}
 	else
 	{
-		if (s_bLastFrameDumped && s_bAVIDumping)
+		if (bLastFrameDumped && s_bAVIDumping)
 		{
 			if (data)
 			{
@@ -1080,7 +1084,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 			s_bAVIDumping = false;
 			OSD::AddMessage("Stop dumping frames to AVI", 2000);
 		}
-		s_bLastFrameDumped = false;
+		bLastFrameDumped = false;
 	}
 
 	// Finish up the current frame, print some stats

Source/Plugins/Plugin_VideoOGL/Src/Render.cpp

@@ -521,7 +521,7 @@ Renderer::~Renderer()
 	if(s_bAVIDumping)
 	{
 		AVIDump::Stop();
-		s_bLastFrameDumped = false;
+		bLastFrameDumped = false;
 		s_bAVIDumping = false;
 	}
 #else
@@ -970,11 +970,13 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 	if ((!xfbSourceList || xfbCount == 0) && g_ActiveConfig.bUseXFB && !g_ActiveConfig.bUseRealXFB)
 	{
 		if (g_ActiveConfig.bDumpFrames && data)
-		#ifdef _WIN32
+		{
+#ifdef _WIN32
 			AVIDump::AddFrame((char *) data);
-		#elif defined HAVE_LIBAV
+#elif defined HAVE_LIBAV
 			AVIDump::AddFrame(data, w, h);
-		#endif
+#endif
+		}
 		Core::Callback_VideoCopiedToXFB(false);
 		return;
 	}
@@ -1145,7 +1147,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 		glReadPixels(dst_rect.left, dst_rect.bottom, w, h, GL_BGR, GL_UNSIGNED_BYTE, data);
 		if (GL_REPORT_ERROR() == GL_NO_ERROR && w > 0 && h > 0)
 		{
-			if (!s_bLastFrameDumped)
+			if (!bLastFrameDumped)
 			{
 				#ifdef _WIN32
 					s_bAVIDumping = AVIDump::Start(EmuWindow::GetParentWnd(), w, h);
@@ -1171,14 +1173,14 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 				#endif
 			}
 
-			s_bLastFrameDumped = true;
+			bLastFrameDumped = true;
 		}
 		else
 			NOTICE_LOG(VIDEO, "Error reading framebuffer");
 	}
 	else
 	{
-		if (s_bLastFrameDumped && s_bAVIDumping)
+		if (bLastFrameDumped && s_bAVIDumping)
 		{
 			if (data)
 			{
@@ -1190,7 +1192,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 			s_bAVIDumping = false;
 			OSD::AddMessage("Stop dumping frames", 2000);
 		}
-		s_bLastFrameDumped = false;
+		bLastFrameDumped = false;
 	}
 #else
 	if (g_ActiveConfig.bDumpFrames)