From b9ff3b6c81607d871aad4c9acf3b82fc51a95e16 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 14 Jul 2014 17:37:38 -0400 Subject: [PATCH 1/2] ZeroGS: Explicitly convert the LPVOID buffer to a const char* Also make the failure case for one of these log calls a DEBUG_LOG instead of a printf. --- plugins/zerogs/dx/ZeroGSShaders/zerogsshaders.h | 2 +- plugins/zerogs/dx/zerogs.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/zerogs/dx/ZeroGSShaders/zerogsshaders.h b/plugins/zerogs/dx/ZeroGSShaders/zerogsshaders.h index d42191fc52..121c1c8093 100644 --- a/plugins/zerogs/dx/ZeroGSShaders/zerogsshaders.h +++ b/plugins/zerogs/dx/ZeroGSShaders/zerogsshaders.h @@ -70,7 +70,7 @@ static HRESULT LoadShaderFromType(const char* srcfile, int type, int texfilter, if( FAILED(hr) ) { - printf("Failed to load %s\n%s\n", str, pError->GetBufferPointer()); + DEBUG_LOG("Failed to load %s\n%s\n", str, reinterpret_cast(pError->GetBufferPointer())); SAFE_RELEASE(pShader); SAFE_RELEASE(pError); return hr; diff --git a/plugins/zerogs/dx/zerogs.cpp b/plugins/zerogs/dx/zerogs.cpp index dff5173eb6..140bfe1d53 100644 --- a/plugins/zerogs/dx/zerogs.cpp +++ b/plugins/zerogs/dx/zerogs.cpp @@ -1428,7 +1428,7 @@ public: V(D3DXCompileShaderFromFile(EFFECT_NAME"ps2hw.fx", pmacros, pInclude, name, shaderver, ShaderFlagsVS, &pShader, &pError, NULL)); \ if( FAILED(hr) ) \ { \ - DEBUG_LOG("Failed to load vs %s: \n%s\n", name, pError->GetBufferPointer()); \ + DEBUG_LOG("Failed to load vs %s: \n%s\n", name, reinterpret_cast(pError->GetBufferPointer())); \ SAFE_RELEASE(pShader); \ SAFE_RELEASE(pError); \ return hr; \ @@ -1444,7 +1444,7 @@ public: V(D3DXCompileShaderFromFile(EFFECT_NAME"ps2hw.fx", pmacros, pInclude, name, shmodel, ShaderFlagsPS, &pShader, &pError, NULL)); \ if( FAILED(hr) ) \ { \ - DEBUG_LOG("Failed to load ps %s: \n%s\n", name, pError->GetBufferPointer()); \ + DEBUG_LOG("Failed to load ps %s: \n%s\n", name, reinterpret_cast(pError->GetBufferPointer())); \ SAFE_RELEASE(pShader); \ SAFE_RELEASE(pError); \ return hr; \ From ba0d3d1a6a035f1bf497effc8e958340f8e65b71 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 14 Jul 2014 17:46:27 -0400 Subject: [PATCH 2/2] ZeroGS: Add a missing formatter to a sprintf call --- plugins/zerogs/dx/zerogs.cpp | 2 +- plugins/zerogs/opengl/zerogs.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/zerogs/dx/zerogs.cpp b/plugins/zerogs/dx/zerogs.cpp index 140bfe1d53..72a48f55f2 100644 --- a/plugins/zerogs/dx/zerogs.cpp +++ b/plugins/zerogs/dx/zerogs.cpp @@ -2070,7 +2070,7 @@ void ZeroGS::Flush(int context) #ifdef PCSX2_DEBUG if( g_bSaveFlushedFrame & 0x80000000 ) { char str[255]; - sprintf(str, "rndr.tga", g_SaveFrameNum); + sprintf(str, "rndr%u.tga", g_SaveFrameNum); D3DXSaveSurfaceToFile(str, D3DXIFF_TGA, curvb.prndr->psurf, NULL, NULL); } #endif diff --git a/plugins/zerogs/opengl/zerogs.cpp b/plugins/zerogs/opengl/zerogs.cpp index f0465ca6cf..35927b0ef3 100644 --- a/plugins/zerogs/opengl/zerogs.cpp +++ b/plugins/zerogs/opengl/zerogs.cpp @@ -2529,7 +2529,7 @@ void ZeroGS::Flush(int context) #ifdef _DEBUG if( g_bSaveFlushedFrame & 0x80000000 ) { char str[255]; - sprintf(str, "rndr.tga", g_SaveFrameNum); + sprintf(str, "rndr%u.tga", g_SaveFrameNum); SaveRenderTarget(str, curvb.prndr->fbw, curvb.prndr->fbh, 0); } #endif