From 15e16728f2e519be782a0a8cf487174c3b0b3c79 Mon Sep 17 00:00:00 2001
From: Twinaphex <autechre1024@hotmail.com>
Date: Sun, 27 May 2012 22:45:00 +0200
Subject: [PATCH] PC fix build
---
gfx/context/sdl_ctx.c | 2 +-
gfx/fonts/freetype.c | 3 ++-
gfx/gl.c | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/gfx/context/sdl_ctx.c b/gfx/context/sdl_ctx.c
index 12f8b576d5..4666397a61 100644
--- a/gfx/context/sdl_ctx.c
+++ b/gfx/context/sdl_ctx.c
@@ -398,7 +398,7 @@ void gfx_ctx_input_driver(const input_driver_t **input, void **input_data)
}
#ifdef HAVE_OPENGL
-void gfx_ctx_set_projection(gl_t *gl, bool allow_rotate)
+void gfx_ctx_set_projection(gl_t *gl, ortho_t *ortho, bool allow_rotate)
{
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
diff --git a/gfx/fonts/freetype.c b/gfx/fonts/freetype.c
index 545e9126bf..e4ca7c6a85 100644
--- a/gfx/fonts/freetype.c
+++ b/gfx/fonts/freetype.c
@@ -227,6 +227,7 @@ extern const GLfloat white_color[];
void gl_render_msg_post(gl_t *gl)
{
+ ortho_t ortho = {0}; //dummy - no overscan on PC
#ifdef HAVE_FREETYPE
// Go back to old rendering path.
glTexCoordPointer(2, GL_FLOAT, 0, gl->tex_coords);
@@ -235,7 +236,7 @@ void gl_render_msg_post(gl_t *gl)
glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]);
glDisable(GL_BLEND);
- gl_set_projection(gl, true);
+ gl_set_projection(gl, &ortho, true);
#else
(void)gl;
#endif
diff --git a/gfx/gl.c b/gfx/gl.c
index 01a7dfb4fe..5507156695 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -438,7 +438,7 @@ void gl_set_projection(gl_t *gl, ortho_t *ortho, bool allow_rotate)
gl_shader_set_proj_matrix();
}
-static void gl_set_viewport(gl_t *gl, unsigned width, unsigned height, bool force_full, bool allow_rotate)
+void gl_set_viewport(gl_t *gl, unsigned width, unsigned height, bool force_full, bool allow_rotate)
{
unsigned vp_x_temp, vp_y_temp, vp_width_temp, vp_height_temp;
ortho_t ortho;