ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #118 from lioncash/zgs 

Minor changes to ZeroGS
This commit is contained in:
sudonim1 2014-07-16 18:08:12 +01:00
parent c8c4ff39de ba0d3d1a6a
commit 06dfc4e6ef
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/zerogs/dx/ZeroGSShaders/zerogsshaders.h
View File

@ -70,7 +70,7 @@ static HRESULT LoadShaderFromType(const char* srcfile, int type, int texfilter,
if( FAILED(hr) ) 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<const char*>(pError->GetBufferPointer()));
SAFE_RELEASE(pShader); SAFE_RELEASE(pShader);
SAFE_RELEASE(pError); SAFE_RELEASE(pError);
return hr; return hr;

6
plugins/zerogs/dx/zerogs.cpp
View File

@ -1428,7 +1428,7 @@ public:
V(D3DXCompileShaderFromFile(EFFECT_NAME"ps2hw.fx", pmacros, pInclude, name, shaderver, ShaderFlagsVS, &pShader, &pError, NULL)); \ V(D3DXCompileShaderFromFile(EFFECT_NAME"ps2hw.fx", pmacros, pInclude, name, shaderver, ShaderFlagsVS, &pShader, &pError, NULL)); \
if( FAILED(hr) ) \ 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<const char*>(pError->GetBufferPointer())); \
SAFE_RELEASE(pShader); \ SAFE_RELEASE(pShader); \
SAFE_RELEASE(pError); \ SAFE_RELEASE(pError); \
return hr; \ return hr; \
@ -1444,7 +1444,7 @@ public:
V(D3DXCompileShaderFromFile(EFFECT_NAME"ps2hw.fx", pmacros, pInclude, name, shmodel, ShaderFlagsPS, &pShader, &pError, NULL)); \ V(D3DXCompileShaderFromFile(EFFECT_NAME"ps2hw.fx", pmacros, pInclude, name, shmodel, ShaderFlagsPS, &pShader, &pError, NULL)); \
if( FAILED(hr) ) \ 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<const char*>(pError->GetBufferPointer())); \
SAFE_RELEASE(pShader); \ SAFE_RELEASE(pShader); \
SAFE_RELEASE(pError); \ SAFE_RELEASE(pError); \
return hr; \ return hr; \
@ -2070,7 +2070,7 @@ void ZeroGS::Flush(int context)
#ifdef PCSX2_DEBUG #ifdef PCSX2_DEBUG
if( g_bSaveFlushedFrame & 0x80000000 ) { if( g_bSaveFlushedFrame & 0x80000000 ) {
char str[255]; 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); D3DXSaveSurfaceToFile(str, D3DXIFF_TGA, curvb.prndr->psurf, NULL, NULL);
} }
#endif #endif

2
plugins/zerogs/opengl/zerogs.cpp
View File

@ -2529,7 +2529,7 @@ void ZeroGS::Flush(int context)
#ifdef _DEBUG #ifdef _DEBUG
if( g_bSaveFlushedFrame & 0x80000000 ) { if( g_bSaveFlushedFrame & 0x80000000 ) {
char str[255]; 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); SaveRenderTarget(str, curvb.prndr->fbw, curvb.prndr->fbh, 0);
} }
#endif #endif