X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fscreen.cpp;h=27675d5731e09b6d4b56ec1b9f698346dab39797;hp=3bbf00822209320d2514fbbb4bdd87ae6d9c1b48;hb=da646c739f87bf28c5a7af2bc180b93b3444321b;hpb=f71f97f4fd251d02882ace4be3ead033ced434c4

diff --git a/src/screen.cpp b/src/screen.cpp
index 3bbf008..27675d5 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -16,6 +16,8 @@ using namespace std;
 
 static void opengl_debug_callback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* msg, const void *data)
 {
+	// Don't print out gl Errors we generated.
+	if (source == GL_DEBUG_SOURCE_APPLICATION) return;
 	Error("OpenGL Error (%d): %s", id, msg);
 }
 
@@ -391,11 +393,13 @@ void Screen::DebugFontInit(const char *name, float font_size)
 
 	m_debug_font_vertices.SetUsage(GraphicsBuffer::BufferUsageStreamDraw);
 	m_debug_font_vertices.SetType(GraphicsBuffer::BufferTypeVertex);
+	m_debug_font_vertices.SetName("m_debug_font_vertices");
 	m_debug_font_vertices.Upload(8192,NULL);
 	m_debug_font_vertex_head = 0;
 
 	m_debug_font_indices.SetUsage(GraphicsBuffer::BufferUsageStreamDraw);
 	m_debug_font_indices.SetType(GraphicsBuffer::BufferTypeIndex);
+	m_debug_font_indices.SetName("m_debug_font_indices");
 	m_debug_font_indices.Resize(500);
 	m_debug_font_index_head = 0;
 }
@@ -409,7 +413,7 @@ void Screen::DebugFontClear()
 
 void Screen::DebugFontFlush()
 {
-	
+	glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 40, -1, "Screen::DebugFontFlush()");	
 		
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -437,6 +441,8 @@ void Screen::DebugFontFlush()
 	m_debug_font_indices.Invalidate();
 	m_debug_font_vertex_head = 0;
 	m_debug_font_index_head = 0;
+
+	glPopDebugGroup();
 }
 
 struct fontvertex
@@ -448,6 +454,7 @@ void Screen::DebugFontPrint(const char* str)
 {
 	if (!m_debug_font_atlas) return;
 
+	glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 41, -1, "Screen::DebugFontPrint()");
 
 	BufferBuilder<fontvertex> vertexData(m_debug_font_vertices.MapRange(m_debug_font_vertex_head*sizeof(float), m_debug_font_vertices.GetSize() - m_debug_font_vertex_head*sizeof(float), false, true, true), m_debug_font_vertices.GetSize() - m_debug_font_vertex_head*sizeof(float));
 	BufferBuilder<uint16_t> indexData(m_debug_font_indices.MapRange(m_debug_font_index_head*sizeof(uint16_t), m_debug_font_indices.GetSize() - m_debug_font_index_head*sizeof(uint16_t), false, true, true), m_debug_font_indices.GetSize() - m_debug_font_index_head*sizeof(uint16_t));
@@ -460,6 +467,7 @@ void Screen::DebugFontPrint(const char* str)
 			m_debug_font_vertices.UnMap();
 			DebugFontFlush();
 			DebugFontPrint(str);
+			glPopDebugGroup();
 			return;
 		}
 		if (*str >= 32 && (unsigned char)(*str) < 128) {
@@ -492,6 +500,7 @@ void Screen::DebugFontPrint(const char* str)
 	}
 	m_debug_font_indices.UnMap();
 	m_debug_font_vertices.UnMap();
+	glPopDebugGroup();
 	//DebugFontFlush();
 }