Use libpng for saving images.

TODO: Needs threading done similiar to OGL backend.
Fixes issue 6779.

Source/Core/VideoBackends/D3D/D3D.vcxproj

@@ -93,9 +93,15 @@
     <ClInclude Include="Src\XFBEncoder.h" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Externals\libpng\png\png.vcxproj">
+      <Project>{4c9f135b-a85e-430c-bad4-4c67ef5fc12c}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Externals\wxWidgets3\build\msw\wx_base.vcxproj">
       <Project>{1c8436c9-dbaf-42be-83bc-cf3ec9175abe}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Externals\zlib\zlib.vcxproj">
+      <Project>{ff213b23-2c26-4214-9f88-85271e557e87}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Core\VideoCommon\VideoCommon.vcxproj">
       <Project>{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}</Project>
     </ProjectReference>

Source/Core/VideoBackends/D3D/Src/D3DTexture.cpp

@@ -5,9 +5,7 @@
 #include "D3DBase.h"
 #include "D3DTexture.h"
 
-#include <wincodec.h>
+#include "png.h"
-#include <wincodecsdk.h>
-#pragma comment(lib, "WindowsCodecs.lib")
 
 namespace DX11
 {
@@ -15,125 +13,86 @@ namespace DX11
 namespace D3D
 {
 
-HRESULT TextureToPng(D3D11_MAPPED_SUBRESOURCE &map, LPCWSTR wzFilename, int width, int height, bool saveAlpha)
+bool TextureToPng(D3D11_MAPPED_SUBRESOURCE &map, const char* filename, int width, int height, bool saveAlpha)
 {
-	IWICImagingFactory *piFactory = NULL;
+	bool success = false;
-	IWICBitmapEncoder *piEncoder = NULL;
+	if (map.pData != NULL)
-	IWICBitmapFrameEncode *piBitmapFrame = NULL;
-	IPropertyBag2 *pPropertybag = NULL;
-
-	IWICStream *piStream = NULL;
-
-	HRESULT hr = CoCreateInstance(
-		CLSID_WICImagingFactory,
-		NULL,
-		CLSCTX_INPROC_SERVER,
-		IID_IWICImagingFactory,
-		(LPVOID*)&piFactory);
-
-	if (SUCCEEDED(hr))
 	{
-		hr = piFactory->CreateStream(&piStream);
+		FILE *fp = NULL;
-	}
+		png_structp png_ptr = NULL;
+		png_infop info_ptr = NULL;
 
-	if (SUCCEEDED(hr))
+		// Open file for writing (binary mode)
-	{
+		fp = fopen(filename, "wb");
-		hr = piStream->InitializeFromFilename(wzFilename, GENERIC_WRITE);
+		if (fp == NULL) {
-	}
+			PanicAlert("Could not open file %s for writing\n", filename);
-
+			goto finalise;
-	if (SUCCEEDED(hr))
-	{
-		hr = piFactory->CreateEncoder(GUID_ContainerFormatPng, NULL, &piEncoder);
-	}
-
-	if (SUCCEEDED(hr))
-	{
-		hr = piEncoder->Initialize(piStream, WICBitmapEncoderNoCache);
-	}
-
-	if (SUCCEEDED(hr))
-	{
-		hr = piEncoder->CreateNewFrame(&piBitmapFrame, &pPropertybag);
-	}
-
-	if (SUCCEEDED(hr))
-	{
-		if (SUCCEEDED(hr))
-		{
-			hr = piBitmapFrame->Initialize(pPropertybag);
 		}
-	}
 
-	if (SUCCEEDED(hr))
+		// Initialize write structure
-	{
+		png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-		hr = piBitmapFrame->SetSize(width, height);
+		if (png_ptr == NULL) {
-	}
+			PanicAlert("Could not allocate write struct\n");
+			goto finalise;
 			
-	WICPixelFormatGUID formatGUID = GUID_WICPixelFormat32bppBGRA;
+		}
-	if (SUCCEEDED(hr))
-	{
-		hr = piBitmapFrame->SetPixelFormat(&formatGUID);
-	}
 
-	if (SUCCEEDED(hr))
+		// Initialize info structure
-	{
+		info_ptr = png_create_info_struct(png_ptr);
-		// We're expecting to write out 32bppBGRA. Fail if the encoder cannot do it.
+		if (info_ptr == NULL) {
-		hr = IsEqualGUID(formatGUID, GUID_WICPixelFormat32bppBGRA) ? S_OK : E_FAIL;
+			PanicAlert("Could not allocate info struct\n");
-	}
+			goto finalise;
+		}
 
-	if (SUCCEEDED(hr))
+		// Setup Exception handling
-	{
+		if (setjmp(png_jmpbuf(png_ptr))) {
-		if (map.pData != NULL)
+			PanicAlert("Error during png creation\n");
+			goto finalise;
+		}
+
+		png_init_io(png_ptr, fp);
+
+		// Write header (8 bit colour depth)
+		png_set_IHDR(png_ptr, info_ptr, width, height,
+			8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE,
+			PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+
+		char title[] = "Dolphin Screenshot";
+		png_text title_text;
+		title_text.compression = PNG_TEXT_COMPRESSION_NONE;
+		title_text.key = "Title";
+		title_text.text = title;
+		png_set_text(png_ptr, info_ptr, &title_text, 1);
+
+		png_write_info(png_ptr, info_ptr);
+
+		// Write image data
+		for (auto y = 0; y < height; ++y)
 		{
-			for (int y = 0; y < height; ++y)
+			u8* row_ptr = (u8*)map.pData + y * map.RowPitch;
+			u8* ptr = row_ptr;
+			for (UINT x = 0; x < map.RowPitch / 4; ++x)
 			{
-				u8* ptr = (u8*)map.pData + y * map.RowPitch;
+				if (!saveAlpha)
-				for (unsigned int x = 0; x < map.RowPitch/4; ++x)
+					ptr[3] = 0xff;
-				{
+				ptr += 4;
-					u8 r = ptr[0];
-					u8 g = ptr[1];
-					u8 b = ptr[2];
-					ptr[0] = b;
-					ptr[1] = g;
-					ptr[2] = r;
-					if (!saveAlpha)
-						ptr[3] = 0xff;
-
-
-					ptr += 4;
-				}
 			}
-			hr = piBitmapFrame->WritePixels(height, map.RowPitch, height * map.RowPitch, (BYTE*)map.pData);
+			png_write_row(png_ptr, row_ptr);
-		}
-		else
-		{
-			hr = E_OUTOFMEMORY;
 		}
+
+		// End write
+		png_write_end(png_ptr, NULL);
+
+		success = true;
+
+	finalise:
+
+		if (fp != NULL) fclose(fp);
+		if (info_ptr != NULL) png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
+		if (png_ptr != NULL) png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+
 	}
-
+	return false;
-	if (SUCCEEDED(hr))
-	{
-		hr = piBitmapFrame->Commit();
-	}
-
-	if (SUCCEEDED(hr))
-	{
-		hr = piEncoder->Commit();
-	}
-
-	if (piFactory)
-		piFactory->Release();
-
-	if (piBitmapFrame)
-		piBitmapFrame->Release();
-
-	if (piEncoder)
-		piEncoder->Release();
-
-	if (piStream)
-		piStream->Release();
-
-	return hr;
 }
 
 void ReplaceRGBATexture2D(ID3D11Texture2D* pTexture, const u8* buffer, unsigned int width, unsigned int height, unsigned int pitch, unsigned int level, D3D11_USAGE usage)

Source/Core/VideoBackends/D3D/Src/D3DTexture.h

@@ -11,7 +11,7 @@ namespace DX11
 
 namespace D3D
 {
-	HRESULT TextureToPng(D3D11_MAPPED_SUBRESOURCE& map, LPCWSTR wzFilename, int width, int height, bool saveAlpha = true);
+	bool TextureToPng(D3D11_MAPPED_SUBRESOURCE& map, const char* filename, int width, int height, bool saveAlpha = true);
 	void ReplaceRGBATexture2D(ID3D11Texture2D* pTexture, const u8* buffer, unsigned int width, unsigned int height, unsigned int pitch, unsigned int level, D3D11_USAGE usage);
 }
 

Source/Core/VideoBackends/D3D/Src/Render.cpp

@@ -694,7 +694,7 @@ bool Renderer::SaveScreenshot(const std::string &filename, const TargetRectangle
 	D3D::context->Map(s_screenshot_texture, 0, D3D11_MAP_READ_WRITE, 0, &map);
 
 	// ready to be saved
-	HRESULT hr = D3D::TextureToPng(map, UTF8ToUTF16(filename.c_str()).c_str(), rc.GetWidth(), rc.GetHeight(), false);
+	HRESULT hr = D3D::TextureToPng(map, filename.c_str(), rc.GetWidth(), rc.GetHeight(), false);
 	D3D::context->Unmap(s_screenshot_texture, 0);
 
 	if (SUCCEEDED(hr))

Source/Core/VideoBackends/D3D/Src/TextureCache.cpp

@@ -62,7 +62,7 @@ bool TextureCache::TCacheEntry::Save(const char filename[], unsigned int level)
 		HRESULT hr = D3D::context->Map(pNewTexture, 0, D3D11_MAP_READ_WRITE, 0, &map);
 		if (SUCCEEDED(hr))
 		{
-			hr = D3D::TextureToPng(map, UTF8ToUTF16(filename).c_str(), desc.Width, desc.Height);
+			hr = D3D::TextureToPng(map, filename, desc.Width, desc.Height);
 			D3D::context->Unmap(pNewTexture, 0);
 		}
 		SAFE_RELEASE(pNewTexture);

Source/VSProps/Base.props

@@ -44,6 +44,7 @@
       <AdditionalIncludeDirectories>$(ExternalsDir)Bochs_disasm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)GLew\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)libpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)libusbx\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)LZO;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>