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

diff --git a/src/screen.cpp b/src/screen.cpp
index 27675d5..a32b1e2 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -18,7 +18,9 @@ static void opengl_debug_callback(GLenum source, GLenum type, GLuint id, GLenum
 {
 	// Don't print out gl Errors we generated.
 	if (source == GL_DEBUG_SOURCE_APPLICATION) return;
-	Error("OpenGL Error (%d): %s", id, msg);
+	//Error("OpenGL Error (%d): %s", id, msg);
+	// Spams this message on fglrx, disabling for now because it's damn annoying.
+	// ERROR: opengl_debug_callback (screen.cpp:21) - OpenGL Error (1011): glObjectLabel failed because (depending on the operation) a referenced binding point is empty; a referenced name is not the name of an object; or the given name is otherwise not valid to this operation (GL_INVALID_VALUE)
 }
 
 
@@ -90,10 +92,13 @@ Screen::Screen()
 	m_viewport_ubo.SetType(GraphicsBuffer::BufferTypeUniform);
 
 	m_debug_font_atlas = 0;
-
+	m_no_quit_requested = true;
+	m_show_debug_font = true;
 	m_view = NULL;
 	ResizeViewport(800, 600);
-
+	
+	
+	
 	Clear();
 	Present();
 	
@@ -126,13 +131,13 @@ void Screen::ResizeViewport(int width, int height)
 bool Screen::PumpEvents()
 {
 	SDL_Event evt;
-	bool no_quit_requested = true;
+	
 	while (SDL_PollEvent(&evt))
 	{
 		switch (evt.type)
 		{
 		case SDL_QUIT:
-			no_quit_requested = false;
+			m_no_quit_requested = false;
 			break;
 		case SDL_WINDOWEVENT:
 			switch (evt.window.event)
@@ -181,7 +186,7 @@ bool Screen::PumpEvents()
 			break;
 		}
 	}
-	return no_quit_requested;
+	return m_no_quit_requested;
 }
 
 void Screen::SetMouseCursor(Screen::MouseCursors cursor)
@@ -452,7 +457,7 @@ struct fontvertex
 
 void Screen::DebugFontPrint(const char* str)
 {
-	if (!m_debug_font_atlas) return;
+	if (!m_debug_font_atlas || !m_show_debug_font) return;
 
 	glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 41, -1, "Screen::DebugFontPrint()");