About to break everything with a merge

[ipdf/code.git] / src / screen.cpp

diff --git a/src/screen.cpp b/src/screen.cpp
index 0df64a2..628a11a 100644 (file)
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -8,6 +8,8 @@
 #include "bufferbuilder.h"
 #include "shaderprogram.h"
 
+
+
 #define BASICTEX_VERT "shaders/basictex_vert.glsl"
 #define BASICTEX_FRAG "shaders/basictex_frag.glsl"
 
@@ -43,7 +45,7 @@ Screen::Screen(bool visible)
        }
 
        SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
-       SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
+       SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
        SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG);
        SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
 
@@ -52,9 +54,9 @@ Screen::Screen(bool visible)
        ogl_LoadFunctions();
 
        // Why is this so horribly broken?
-       if (ogl_IsVersionGEQ(3,0))
+       if (ogl_IsVersionGEQ(3,2))
        {
-               Error("We require OpenGL 3.1, but you have version %d.%d!",ogl_GetMajorVersion(), ogl_GetMinorVersion());
+               Error("We require OpenGL 3.3, but you have version %d.%d!",ogl_GetMajorVersion(), ogl_GetMinorVersion());
        }
 
        if (!SDL_GL_ExtensionSupported("GL_ARB_shading_language_420pack"))
@@ -70,9 +72,9 @@ Screen::Screen(bool visible)
        m_frame_begin_time = SDL_GetPerformanceCounter();
        m_last_frame_time = 0;
        m_last_frame_gpu_timer = 0;
+
        glGenQueries(1, &m_frame_gpu_timer);
        glBeginQuery(GL_TIME_ELAPSED, m_frame_gpu_timer);
-
        #ifndef __MINGW32__
        glDebugMessageCallback(opengl_debug_callback, 0);
        #endif
@@ -225,8 +227,10 @@ void Screen::Present()
 {
        if (!Valid())
                return;
+
        if (m_debug_font_atlas)
                DebugFontFlush();
+
        m_last_frame_time = SDL_GetPerformanceCounter() - m_frame_begin_time;
        glEndQuery(GL_TIME_ELAPSED);
        SDL_GL_SwapWindow(m_window);
@@ -236,6 +240,8 @@ void Screen::Present()
        m_last_frame_gpu_timer = m_frame_gpu_timer;
        glGenQueries(1, &m_frame_gpu_timer);
        glBeginQuery(GL_TIME_ELAPSED, m_frame_gpu_timer);
+
+
 }
 
 double Screen::GetLastFrameTimeGPU() const