Turned the Gl class into a namespace; fixes to the OpenGL renderer

RetroAchievements · Mar 31, 2018 · 5d0f6c4 · 5d0f6c4
1 parent 1193d49
commit 5d0f6c4
Show file tree

Hide file tree

Showing 6 changed files with 378 additions and 355 deletions.
diff --git a/src/Application.cpp b/src/Application.cpp
@@ -78,6 +78,7 @@ bool Application::init(const char* title, int width, int height)
     kAllocatorInited,
     kSdlInited,
     kWindowInited,
+	kGlInited,
     kAudioDeviceInited,
     kFifoInited,
     kAudioInited,
@@ -154,6 +155,15 @@ bool Application::init(const char* title, int width, int height)
 
   inited = kWindowInited;
 
+  Gl::init(&_logger);
+
+  if (!Gl::ok())
+  {
+	goto error;
+  }
+
+  inited = kGlInited;
+
   // Init audio
   SDL_AudioSpec want;
   memset(&want, 0, sizeof(want));
@@ -261,6 +271,7 @@ bool Application::init(const char* title, int width, int height)
   case kAudioInited:       _audio.destroy();
   case kFifoInited:        _fifo.destroy();
   case kAudioDeviceInited: SDL_CloseAudioDevice(_audioDev);
+  case kGlInited:          // nothing to undo
   case kWindowInited:      SDL_DestroyWindow(_window);
   case kSdlInited:         SDL_Quit();
   case kAllocatorInited:   _allocator.destroy();
@@ -349,7 +360,9 @@ void Application::run()
       RA_DoAchievementsFrame();
     }
 
-    _video.draw();
+	Gl::clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  _video.draw();
+	SDL_GL_SwapWindow(_window);
 
     RA_HandleHTTPResults();
 

diff --git a/src/Application.h b/src/Application.h
@@ -36,6 +36,7 @@ along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "Emulator.h"
 #include "KeyBinds.h"
+#include "Gl.h"
 
 class Application
 {