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

gsdx-ogl: replaced draw_count by s_n 

This way error message is aligned with everything else :)

It is not perfect (normally it must be done in start of main draw)
This commit is contained in:
Gregory Hainaut 2015-05-16 13:58:36 +02:00
parent 62e0e6a067
commit c567198967
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/GSdx/GSDeviceOGL.cpp
View File

@ -28,7 +28,6 @@
//#define ONLY_LINES //#define ONLY_LINES
static uint32 g_draw_count = 0;
// TODO port those value into PerfMon API // TODO port those value into PerfMon API
#ifdef ENABLE_OGL_DEBUG_MEM_BW #ifdef ENABLE_OGL_DEBUG_MEM_BW
uint64 g_real_texture_upload_byte = 0; uint64 g_real_texture_upload_byte = 0;
@ -42,6 +41,7 @@ static const uint32 g_shadeboost_cb_index = 12;
static const uint32 g_fx_cb_index = 14; static const uint32 g_fx_cb_index = 14;
bool GSDeviceOGL::m_debug_gl_call = false; bool GSDeviceOGL::m_debug_gl_call = false;
int GSDeviceOGL::s_n = 0;
GSDeviceOGL::GSDeviceOGL() GSDeviceOGL::GSDeviceOGL()
: m_free_window(false) : m_free_window(false)
@ -399,9 +399,6 @@ void GSDeviceOGL::BeforeDraw()
void GSDeviceOGL::AfterDraw() void GSDeviceOGL::AfterDraw()
{ {
#if defined(ENABLE_OGL_DEBUG)
g_draw_count++;
#endif
} }
void GSDeviceOGL::DrawPrimitive() void GSDeviceOGL::DrawPrimitive()
@ -1251,7 +1248,7 @@ void GSDeviceOGL::DebugOutputToFile(GLenum gl_source, GLenum gl_type, GLuint id,
#ifdef _DEBUG #ifdef _DEBUG
// Don't spam noisy information on the terminal // Don't spam noisy information on the terminal
if (!(gl_type == GL_DEBUG_TYPE_OTHER_ARB && gl_severity == GL_DEBUG_SEVERITY_NOTIFICATION)) { if (!(gl_type == GL_DEBUG_TYPE_OTHER_ARB && gl_severity == GL_DEBUG_SEVERITY_NOTIFICATION)) {
fprintf(stderr,"Type:%s\tID:%d\tSeverity:%s\tMessage:%s\n", type.c_str(), g_draw_count, severity.c_str(), message.c_str()); fprintf(stderr,"Type:%s\tID:%d\tSeverity:%s\tMessage:%s\n", type.c_str(), s_n, severity.c_str(), message.c_str());
} }
#endif #endif
@ -1259,7 +1256,7 @@ void GSDeviceOGL::DebugOutputToFile(GLenum gl_source, GLenum gl_type, GLuint id,
FILE* f = fopen("GSdx_opengl_debug.txt","a"); FILE* f = fopen("GSdx_opengl_debug.txt","a");
if(f) if(f)
{ {
fprintf(f,"Type:%s\tID:%d\tSeverity:%s\tMessage:%s\n", type.c_str(), g_draw_count, severity.c_str(), message.c_str()); fprintf(f,"Type:%s\tID:%d\tSeverity:%s\tMessage:%s\n", type.c_str(), s_n, severity.c_str(), message.c_str());
fclose(f); fclose(f);
} }
ASSERT(sev_counter < 5); ASSERT(sev_counter < 5);

2
plugins/GSdx/GSDeviceOGL.h
View File

@ -456,6 +456,8 @@ class GSDeviceOGL : public GSDevice
struct D3D9Blend {int bogus, op, src, dst;}; struct D3D9Blend {int bogus, op, src, dst;};
static const D3D9Blend m_blendMapD3D9[3*3*3*3]; static const D3D9Blend m_blendMapD3D9[3*3*3*3];
static int s_n;
private: private:
uint32 m_msaa; // Level of Msaa uint32 m_msaa; // Level of Msaa

1
plugins/GSdx/GSRendererOGL.cpp
View File

@ -231,6 +231,7 @@ void GSRendererOGL::DrawPrims(GSTexture* rt, GSTexture* ds, GSTextureCache::Sour
ASSERT(m_dev != NULL); ASSERT(m_dev != NULL);
GSDeviceOGL* dev = (GSDeviceOGL*)m_dev; GSDeviceOGL* dev = (GSDeviceOGL*)m_dev;
dev->s_n = s_n;
GSDeviceOGL::VSSelector vs_sel; GSDeviceOGL::VSSelector vs_sel;
GSDeviceOGL::VSConstantBuffer vs_cb; GSDeviceOGL::VSConstantBuffer vs_cb;