X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fscreen.cpp;h=628a11adbe6add14b4d97dbad770b8f809c83c0b;hp=e7d5d4b022ce4cde9c01d6b2fadc024cbca0e1e7;hb=6c0dfe752994312ee58d307b383948bfeb2d6e2e;hpb=ae6af9f5e166d675a7139ec6dffee4ccab4347bc

diff --git a/src/screen.cpp b/src/screen.cpp
index e7d5d4b..628a11a 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -8,12 +8,15 @@
 #include "bufferbuilder.h"
 #include "shaderprogram.h"
 
+
+
 #define BASICTEX_VERT "shaders/basictex_vert.glsl"
 #define BASICTEX_FRAG "shaders/basictex_frag.glsl"
 
 using namespace IPDF;
 using namespace std;
 
+#ifndef __MINGW32__
 static void opengl_debug_callback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* msg, const void *data)
 {
 	// Don't print out gl Errors we generated.
@@ -22,7 +25,7 @@ static void opengl_debug_callback(GLenum source, GLenum type, GLuint id, GLenum
 	// 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)
 }
-
+#endif
 
 Screen::Screen(bool visible)
 {
@@ -37,11 +40,12 @@ Screen::Screen(bool visible)
 
 	if (!m_window)
 	{
-		Fatal("Couldn't create window!");
+		Error("Couldn't create window!");
+		return;
 	}
 
 	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);
 
@@ -50,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"))
@@ -68,10 +72,12 @@ 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
 
 	GLuint default_vao;
 	glGenVertexArrays(1, &default_vao);
@@ -111,6 +117,8 @@ Screen::Screen(bool visible)
 
 Screen::~Screen()
 {
+	if (!Valid())
+		return;
 	SDL_GL_DeleteContext(m_gl_context);
 	SDL_DestroyWindow(m_window);
 	SDL_Quit();
@@ -118,6 +126,8 @@ Screen::~Screen()
 
 void Screen::Clear(float r, float g, float b, float a)
 {
+	if (!Valid())
+		return;
 	glClearColor(r,g,b,a);
 	glClear(GL_COLOR_BUFFER_BIT);
 	DebugFontClear();
@@ -134,6 +144,9 @@ void Screen::ResizeViewport(int width, int height)
 
 bool Screen::PumpEvents()
 {
+	if (!Valid())
+		return true;
+
 	SDL_Event evt;
 	
 	while (SDL_PollEvent(&evt))
@@ -212,8 +225,12 @@ void Screen::SetMouseCursor(Screen::MouseCursors cursor)
 
 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);
@@ -223,11 +240,13 @@ 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
 {
-	if (!m_last_frame_gpu_timer)
+	if (!Valid() || !m_last_frame_gpu_timer)
 		return 0;
 	uint64_t frame_time_ns;
 	glGetQueryObjectui64v(m_last_frame_gpu_timer, GL_QUERY_RESULT, &frame_time_ns);
@@ -278,6 +297,7 @@ void Screen::RenderPixels(int x, int y, int w, int h, uint8_t *pixels) const
 
 void Screen::ScreenShot(const char * filename) const
 {
+	if (!Valid()) return;
 	Debug("Attempting to save BMP to file %s", filename);
 
 	int w = ViewportWidth();
@@ -316,6 +336,7 @@ void Screen::ScreenShot(const char * filename) const
  */
 void Screen::RenderBMP(const char * filename) const
 {
+	if (!Valid()) return;
 	if (access(filename, R_OK) == -1)
 	{
 		Error("No such file \"%s\" - Nothing to render - You might have done this deliberately?", filename);
@@ -384,6 +405,8 @@ void Screen::RenderBMP(const char * filename) const
 
 void Screen::DebugFontInit(const char *name, float font_size)
 {
+	if (!Valid()) return;
+
 	unsigned char font_atlas_data[1024*1024];
 	FILE *font_file = fopen(name, "rb");
 	fseek(font_file, 0, SEEK_END);
@@ -415,6 +438,7 @@ void Screen::DebugFontInit(const char *name, float font_size)
 
 void Screen::DebugFontClear()
 {
+	if (!Valid()) return;
 	m_debug_font_x = m_debug_font_y = 0;
 	if (!m_debug_font_atlas) return;
 	DebugFontPrint("\n");
@@ -422,6 +446,7 @@ void Screen::DebugFontClear()
 
 void Screen::DebugFontFlush()
 {
+	if (!Valid()) return;
 	glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 40, -1, "Screen::DebugFontFlush()");	
 		
 	glEnable(GL_BLEND);
@@ -461,6 +486,7 @@ struct fontvertex
 
 void Screen::DebugFontPrint(const char* str)
 {
+	if (!Valid()) return;
 	if (!m_debug_font_atlas || !m_show_debug_font) return;
 
 	glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 41, -1, "Screen::DebugFontPrint()");