static void opengl_debug_callback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* msg, const void *data)
{
- Error("OpenGL Error (%d): %s", id, msg);
+ // Don't print out gl Errors we generated.
+ if (source == GL_DEBUG_SOURCE_APPLICATION) return;
+ //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)
}
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();
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)
break;
}
}
- return no_quit_requested;
+ return m_no_quit_requested;
}
void Screen::SetMouseCursor(Screen::MouseCursors cursor)
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()");