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

gsdx-debug: debug stuff

This commit is contained in:
Gregory Hainaut 2015-05-08 15:51:46 +02:00
parent 3c66da4d82
commit 8e1db43431
7 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/GSdx/GSDeviceOGL.cpp
View File

@ -146,6 +146,8 @@ GSDeviceOGL::~GSDeviceOGL()
GSTexture* GSDeviceOGL::CreateSurface(int type, int w, int h, bool msaa, int format)
{
GL_PUSH("Create surface");
// A wrapper to call GSTextureOGL, with the different kind of parameter
GSTextureOGL* t = NULL;
t = new GSTextureOGL(type, w, h, format, m_fbo_read);
@ -161,6 +163,8 @@ GSTexture* GSDeviceOGL::CreateSurface(int type, int w, int h, bool msaa, int for
// No need to clear the stencil now.
break;
}
GL_POP();
return t;
}

10
plugins/GSdx/GSDeviceOGL.h
View File

@ -89,13 +89,13 @@ public:
glDisable(GL_BLEND);
}
if (m_enable) {
#ifdef ENABLE_OGL_DEBUG
if (m_bogus) {
GL_INS("!!! Bogus blending effect !!!");
fprintf(stderr, "Bogus blending effect used : %s\n", (m_bogus == 1) ? "impossible effect" : "clear effect");
}
if (m_bogus) {
GL_INS("!!! Bogus blending effect !!!");
fprintf(stderr, "Bogus blending effect used : %s\n", (m_bogus == 1) ? "impossible effect" : "clear effect");
}
#endif
if (m_enable) {
if (HasConstantFactor()) {
if (GLState::bf != factor) {
GLState::bf = factor;

12
plugins/GSdx/GSDrawingContext.h
View File

@ -138,12 +138,12 @@ public:
fprintf(fp, "TEX0\n"
"\tTBP0:%d\n"
"\tTBW:%d\n"
"\tPSM:%d\n"
"\tPSM:0x%x\n"
"\tTW:%d\n"
"\tTCC:%d\n"
"\tTFX:%d\n"
"\tCBP:%d\n"
"\tCPSM:%d\n"
"\tCPSM:0x%x\n"
"\tCSM:%d\n"
"\tCSA:%d\n"
"\tCLD:%d\n"
@ -159,9 +159,9 @@ public:
"\tK:%d\n\n"
, TEX1.LCM, TEX1.MXL, TEX1.MMAG, TEX1.MMIN, TEX1.MTBA, TEX1.L, TEX1.K);
fprintf(fp, "TEX2\n"
"\tPSM:%d\n"
"\tPSM:0x%x\n"
"\tCBP:%d\n"
"\tCPSM:%d\n"
"\tCPSM:0x%x\n"
"\tCSM:%d\n"
"\tCSA:%d\n"
"\tCLD:%d\n\n"
@ -204,12 +204,12 @@ public:
fprintf(fp, "FRAME\n"
"\tFBP:%d\n"
"\tFBW:%d\n"
"\tPSM:%d\n"
"\tPSM:0x%x\n"
"\tFBMSK:%d\n\n"
, FRAME.FBP, FRAME.FBW, FRAME.PSM, FRAME.FBMSK);
fprintf(fp, "ZBUF\n"
"\tZBP:%d\n"
"\tPSM:%d\n"
"\tPSM:0x%x\n"
"\tZMSK:%d\n\n"
, ZBUF.ZBP, ZBUF.PSM, ZBUF.ZMSK);

10
plugins/GSdx/GSRendererHW.cpp
View File

@ -317,6 +317,10 @@ void GSRendererHW::Draw()
s_n += 3; // Keep it sync with SW renderer
return;
}
#ifdef ENABLE_OGL_DEBUG
std::string help = format("HW Draw %d", s_n);
GL_PUSH(help.c_str());
#endif
GSDrawingEnvironment& env = m_env;
GSDrawingContext* context = m_context;
@ -360,9 +364,7 @@ void GSRendererHW::Draw()
GetTextureMinMax(r, context->TEX0, context->CLAMP, m_vt.IsLinear());
GL_PUSH("Lookup Source");
tex = m_tc->LookupSource(context->TEX0, env.TEXA, r);
GL_POP();
if(!tex) return;
@ -416,7 +418,7 @@ void GSRendererHW::Draw()
if (s_n >= s_saven) {
// Dump Register state
s = format("%05d_context_d%lld.txt", s_n);
s = format("%05d_context.txt", s_n);
m_env.Dump(root_hw+s);
m_context->Dump(root_hw+s);
@ -561,6 +563,8 @@ void GSRendererHW::Draw()
m_tc->Read(rt, r);
#endif
GL_POP();
}
// hacks

2
plugins/GSdx/GSRendererOGL.cpp
View File

@ -190,7 +190,7 @@ bool GSRendererOGL::PrimitiveOverlap()
void GSRendererOGL::DrawPrims(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* tex)
{
#ifdef ENABLE_OGL_DEBUG
std::string help = format("Draw %d", s_n);
std::string help = format("GL Draw in (%d/%d)", static_cast<GSTextureOGL*>(rt)->GetID(), static_cast<GSTextureOGL*>(ds)->GetID());
GL_PUSH(help.c_str());
#endif
GSDrawingEnvironment& env = m_env;

2
plugins/GSdx/GSRendererSW.cpp
View File

@ -543,7 +543,7 @@ void GSRendererSW::Draw()
if (s_n >= s_saven) {
// Dump Register state
s = format("%05d_context_d%lld.txt", s_n);
s = format("%05d_context.txt", s_n);
m_env.Dump(root_sw+s);
m_context->Dump(root_sw+s);

5
plugins/GSdx/GSState.cpp
View File

@ -5500,6 +5500,11 @@ bool GSState::IsBadFrame(int& skip, int UserHacks_SkipDraw)
skip = 1;
}
}
#ifdef ENABLE_OGL_DEBUG
} else if (fi.TME) {
if(fi.TPSM == PSM_PSMZ32 || fi.TPSM == PSM_PSMZ24 || fi.TPSM == PSM_PSMZ16 || fi.TPSM == PSM_PSMZ16S)
GL_INS("!!! Depth Texture !!!");
#endif
}
if(skip > 0)