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

diff --git a/src/screen.cpp b/src/screen.cpp
index 08e4a26..628a11a 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -8,32 +8,44 @@
 #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)
 {
-	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)
 }
+#endif
 
-
-Screen::Screen()
+Screen::Screen(bool visible)
 {
 
 	SDL_Init(SDL_INIT_VIDEO);
+	uint32_t flags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE;
+	if (!visible)
+		flags |= SDL_WINDOW_HIDDEN;
+	
 	m_window = SDL_CreateWindow("IPDF", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
-			800, 600, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE);
+			800, 600, flags);
 
 	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);
 
@@ -42,28 +54,30 @@ Screen::Screen()
 	ogl_LoadFunctions();
 
 	// Why is this so horribly broken?
-	if (ogl_IsVersionGEQ(3,0))
+	if (ogl_IsVersionGEQ(3,2))
 	{
-		Fatal("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"))
 	{
-		Fatal("Your system does not support the ARB_shading_language_420pack extension, which is required.");
+		Error("Your system does not support the ARB_shading_language_420pack extension, which is required.");
 	}
 
 	if (!SDL_GL_ExtensionSupported("GL_ARB_explicit_attrib_location"))
 	{
-		Fatal("Your system does not support the ARB_explicit_attrib_location extension, which is required.");
+		Error("Your system does not support the ARB_explicit_attrib_location extension, which is required.");
 	}
 
 	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);
@@ -76,15 +90,25 @@ Screen::Screen()
 	GLint texture_uniform_location = m_texture_prog.GetUniformLocation("tex");
 	glUniform1i(texture_uniform_location, 0);
 
-	m_colour_uniform_location = m_texture_prog.GetUniformLocation("colour");
+	m_font_prog.InitialiseShaders(BASICTEX_VERT, "shaders/fonttex_frag.glsl");
+	m_font_prog.Use();
+
+	// We always want to use the texture bound to texture unit 0.
+	GLint font_texture_uniform_location = m_font_prog.GetUniformLocation("tex");
+	glUniform1i(font_texture_uniform_location, 0);
+	m_colour_uniform_location = m_font_prog.GetUniformLocation("colour");
 
 	m_viewport_ubo.SetUsage(GraphicsBuffer::BufferUsageDynamicDraw);
 	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();
 	
@@ -93,6 +117,8 @@ Screen::Screen()
 
 Screen::~Screen()
 {
+	if (!Valid())
+		return;
 	SDL_GL_DeleteContext(m_gl_context);
 	SDL_DestroyWindow(m_window);
 	SDL_Quit();
@@ -100,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();
@@ -116,14 +144,17 @@ void Screen::ResizeViewport(int width, int height)
 
 bool Screen::PumpEvents()
 {
+	if (!Valid())
+		return true;
+
 	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)
@@ -139,7 +170,7 @@ bool Screen::PumpEvents()
 			m_last_mouse_y = evt.motion.y;
 			if (m_mouse_handler)
 			{
-				m_mouse_handler(evt.motion.x, evt.motion.y,evt.motion.state, 0);
+				m_mouse_handler(evt.motion.x, evt.motion.y,evt.motion.state, 0, this, m_view);
 			}
 			break;
 		case SDL_MOUSEBUTTONDOWN:
@@ -148,13 +179,13 @@ bool Screen::PumpEvents()
 			m_last_mouse_y = evt.button.y;
 			if (m_mouse_handler)
 			{
-				m_mouse_handler(evt.button.x, evt.button.y, evt.button.state?evt.button.button:0, 0);
+				m_mouse_handler(evt.button.x, evt.button.y, evt.button.state?evt.button.button:0, 0, this, m_view);
 			}
 			break;
 		case SDL_MOUSEWHEEL:
 			if (m_mouse_handler)
 			{
-				m_mouse_handler(m_last_mouse_x, m_last_mouse_y, 0, evt.wheel.y);
+				m_mouse_handler(m_last_mouse_x, m_last_mouse_y, 0, evt.wheel.y, this, m_view);
 			}
 			break;
 		case SDL_KEYDOWN:
@@ -172,7 +203,7 @@ bool Screen::PumpEvents()
 			break;
 		}
 	}
-	return no_quit_requested;
+	return m_no_quit_requested;
 }
 
 void Screen::SetMouseCursor(Screen::MouseCursors cursor)
@@ -194,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);
@@ -205,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);
@@ -228,8 +265,8 @@ void Screen::RenderPixels(int x, int y, int w, int h, uint8_t *pixels) const
 	GLfloat quad[] = { 
 		0, 0, (float)x, (float)y,
 		1, 0, (float)(x+w), (float)y,
-		1, 1, (float)(x+w), (float)(y+h),
-		0, 1, (float)x, (float)(y+h)
+		0, 1, (float)x, (float)(y+h),
+		1, 1, (float)(x+w), (float)(y+h)
 	};
 	quad_vertex_buffer.Upload(sizeof(GLfloat) * 16, quad);
 	quad_vertex_buffer.Bind();
@@ -246,20 +283,21 @@ void Screen::RenderPixels(int x, int y, int w, int h, uint8_t *pixels) const
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 
-	glTexImage2D(GL_TEXTURE_2D, 0, 4, w, h, 0, texture_format, GL_UNSIGNED_BYTE, pixels);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, texture_format, GL_UNSIGNED_BYTE, pixels);
 
 	glEnableVertexAttribArray(0);
 	glEnableVertexAttribArray(1);
 	glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4*sizeof(float), (void*)(2*sizeof(float)));
 	glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4*sizeof(float), 0);
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 	glDisableVertexAttribArray(1);
 	glDisableVertexAttribArray(0);
-	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 
 }
 
 void Screen::ScreenShot(const char * filename) const
 {
+	if (!Valid()) return;
 	Debug("Attempting to save BMP to file %s", filename);
 
 	int w = ViewportWidth();
@@ -298,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);
@@ -366,13 +405,15 @@ 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);
 	size_t font_file_size = ftell(font_file);
 	fseek(font_file, 0, SEEK_SET);
 	unsigned char *font_file_data = (unsigned char*)malloc(font_file_size);
-	fread(font_file_data, 1, font_file_size, font_file);
+	SDL_assert(fread(font_file_data, 1, font_file_size, font_file) == font_file_size);
 	fclose(font_file);
 	stbtt_BakeFontBitmap(font_file_data,0, font_size, font_atlas_data,1024,1024, 32,96, m_debug_font_rects);
 	free(font_file_data);
@@ -384,17 +425,20 @@ void Screen::DebugFontInit(const char *name, float font_size)
 
 	m_debug_font_vertices.SetUsage(GraphicsBuffer::BufferUsageStreamDraw);
 	m_debug_font_vertices.SetType(GraphicsBuffer::BufferTypeVertex);
-	m_debug_font_vertices.Upload(8192, nullptr);
+	m_debug_font_vertices.SetName("m_debug_font_vertices");
+	m_debug_font_vertices.Upload(8192,NULL);
 	m_debug_font_vertex_head = 0;
 
 	m_debug_font_indices.SetUsage(GraphicsBuffer::BufferUsageStreamDraw);
 	m_debug_font_indices.SetType(GraphicsBuffer::BufferTypeIndex);
+	m_debug_font_indices.SetName("m_debug_font_indices");
 	m_debug_font_indices.Resize(500);
 	m_debug_font_index_head = 0;
 }
 
 void Screen::DebugFontClear()
 {
+	if (!Valid()) return;
 	m_debug_font_x = m_debug_font_y = 0;
 	if (!m_debug_font_atlas) return;
 	DebugFontPrint("\n");
@@ -402,13 +446,14 @@ void Screen::DebugFontClear()
 
 void Screen::DebugFontFlush()
 {
-	
+	if (!Valid()) return;
+	glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 40, -1, "Screen::DebugFontFlush()");	
 		
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	glBindTexture(GL_TEXTURE_2D, m_debug_font_atlas);
 
-	m_texture_prog.Use();
+	m_font_prog.Use();
 	m_viewport_ubo.Bind();
 	m_debug_font_vertices.Bind();
 	m_debug_font_indices.Bind();
@@ -430,16 +475,21 @@ void Screen::DebugFontFlush()
 	m_debug_font_indices.Invalidate();
 	m_debug_font_vertex_head = 0;
 	m_debug_font_index_head = 0;
+
+	glPopDebugGroup();
 }
 
+struct fontvertex
+{
+	float x, y, s, t;
+};
+
 void Screen::DebugFontPrint(const char* str)
 {
-	if (!m_debug_font_atlas) return;
+	if (!Valid()) return;
+	if (!m_debug_font_atlas || !m_show_debug_font) return;
 
-	struct fontvertex
-	{
-		float x, y, s, t;
-	};
+	glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 41, -1, "Screen::DebugFontPrint()");
 
 	BufferBuilder<fontvertex> vertexData(m_debug_font_vertices.MapRange(m_debug_font_vertex_head*sizeof(float), m_debug_font_vertices.GetSize() - m_debug_font_vertex_head*sizeof(float), false, true, true), m_debug_font_vertices.GetSize() - m_debug_font_vertex_head*sizeof(float));
 	BufferBuilder<uint16_t> indexData(m_debug_font_indices.MapRange(m_debug_font_index_head*sizeof(uint16_t), m_debug_font_indices.GetSize() - m_debug_font_index_head*sizeof(uint16_t), false, true, true), m_debug_font_indices.GetSize() - m_debug_font_index_head*sizeof(uint16_t));
@@ -452,6 +502,7 @@ void Screen::DebugFontPrint(const char* str)
 			m_debug_font_vertices.UnMap();
 			DebugFontFlush();
 			DebugFontPrint(str);
+			glPopDebugGroup();
 			return;
 		}
 		if (*str >= 32 && (unsigned char)(*str) < 128) {
@@ -484,6 +535,7 @@ void Screen::DebugFontPrint(const char* str)
 	}
 	m_debug_font_indices.UnMap();
 	m_debug_font_vertices.UnMap();
+	glPopDebugGroup();
 	//DebugFontFlush();
 }