Merge pull request #1344 from LittleWhite-tb/error-output

Output errors in GUI
This commit is contained in:
bunnei 2016-03-08 23:12:04 -05:00
commit 8530a2d7df
12 changed files with 95 additions and 24 deletions

View file

@ -445,7 +445,7 @@ static void DebugHandler(GLenum source, GLenum type, GLuint id, GLenum severity,
}
/// Initialize the renderer
void RendererOpenGL::Init() {
bool RendererOpenGL::Init() {
render_window->MakeCurrent();
// TODO: Make frontends initialize this, so they can use gladLoadGLLoader with their own loaders
@ -462,9 +462,15 @@ void RendererOpenGL::Init() {
LOG_INFO(Render_OpenGL, "GL_VERSION: %s", glGetString(GL_VERSION));
LOG_INFO(Render_OpenGL, "GL_VENDOR: %s", glGetString(GL_VENDOR));
LOG_INFO(Render_OpenGL, "GL_RENDERER: %s", glGetString(GL_RENDERER));
if (!GLAD_GL_VERSION_3_3) {
return false;
}
InitOpenGLObjects();
RefreshRasterizerSetting();
return true;
}
/// Shutdown the renderer

View file

@ -31,7 +31,7 @@ public:
void SetWindow(EmuWindow* window) override;
/// Initialize the renderer
void Init() override;
bool Init() override;
/// Shutdown the renderer
void ShutDown() override;