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

gsdx-ogl: remove assertion + debug message 

opengl use a different object to compute the vertex count
This commit is contained in:
Gregory Hainaut 2015-05-25 17:31:27 +02:00
parent b84a462798
commit 3be5a6036b
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GSdx/GSDeviceOGL.cpp
View File

@ -415,7 +415,7 @@ void GSDeviceOGL::DrawIndexedPrimitive()
void GSDeviceOGL::DrawIndexedPrimitive(int offset, int count) void GSDeviceOGL::DrawIndexedPrimitive(int offset, int count)
{ {
ASSERT(offset + count <= (int)m_index.count); //ASSERT(offset + count <= (int)m_index.count);
BeforeDraw(); BeforeDraw();
m_va->DrawIndexedPrimitive(offset, count); m_va->DrawIndexedPrimitive(offset, count);

7
plugins/GSdx/GSRendererOGL.cpp
View File

@ -198,15 +198,20 @@ void GSRendererOGL::SendDraw(bool require_barrier)
ASSERT(m_vt.m_primclass != GS_LINE_CLASS); ASSERT(m_vt.m_primclass != GS_LINE_CLASS);
ASSERT(GLLoader::found_geometry_shader); ASSERT(GLLoader::found_geometry_shader);
// FIXME: Investigate: do a dynamic check to pack as many primitives as possibles // FIXME: Investigate: a dynamic check to pack as many primitives as possibles
// I'm nearly sure GSdx already have this kind of code (maybe we can adapt GSDirtyRect)
size_t nb_vertex = (m_vt.m_primclass == GS_TRIANGLE_CLASS) ? 3 : 2; size_t nb_vertex = (m_vt.m_primclass == GS_TRIANGLE_CLASS) ? 3 : 2;
GL_PUSH("Split the draw");
GL_PERF("Split single draw in %d draw", m_index.tail/nb_vertex); GL_PERF("Split single draw in %d draw", m_index.tail/nb_vertex);
for (size_t p = 0; p < m_index.tail; p += nb_vertex) { for (size_t p = 0; p < m_index.tail; p += nb_vertex) {
gl_TextureBarrier(); gl_TextureBarrier();
dev->DrawIndexedPrimitive(p, nb_vertex); dev->DrawIndexedPrimitive(p, nb_vertex);
} }
GL_POP();
} }
} }

2
plugins/GSdx/GSState.cpp
View File

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