mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-18 13:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add rotation to GL driver (PC).

Browse Source
This commit is contained in:
Themaister 2012-04-01 19:20:37 +02:00
parent 2815d5f5cb
commit 34bdea0f1c
4 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
driver.c
View File

@ -560,6 +560,9 @@ void init_video_input(void)
ssnes_fail(1, "init_video_input()");
}
if (driver.video->set_rotation && g_extern.system.rotation)
video_set_rotation_func(g_extern.system.rotation);
// Video driver didn't provide an input driver so we use configured one.
if (driver.input == NULL)
{

2
dynamic.c
View File

@ -424,6 +424,8 @@ static bool environment_cb(unsigned cmd, void *data)
if (!g_settings.video.allow_rotate)
break;
g_extern.system.rotation = rotation;
if (driver.video && driver.video_data && driver.video->set_rotation)
video_set_rotation_func(rotation);
else

2
general.h
View File

@ -307,6 +307,8 @@ struct global
char *environment;
char *environment_split;
unsigned rotation;
} system;
struct

27
gfx/gl.c
View File

@ -163,6 +163,7 @@ typedef struct gl
bool quitting;
bool fullscreen;
bool keep_aspect;
unsigned rotation;
unsigned full_x, full_y;
@ -560,11 +561,18 @@ static inline unsigned get_alignment(unsigned pitch)
return 8;
}
static void set_viewport(gl_t *gl, unsigned width, unsigned height, bool force_full)
static void set_projection(gl_t *gl)
{
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glRotatef(gl->rotation, 0, 0, 1);
glOrtho(0, 1, 0, 1, -1, 1);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
}
static void set_viewport(gl_t *gl, unsigned width, unsigned height, bool force_full)
{
if (gl->keep_aspect && !force_full)
{
float desired_aspect = g_settings.video.aspect_ratio;
@ -573,9 +581,7 @@ static void set_viewport(gl_t *gl, unsigned width, unsigned height, bool force_f
// If the aspect ratios of screen and desired aspect ratio are sufficiently equal (floating point stuff),
// assume they are actually equal.
if (fabs(device_aspect - desired_aspect) < 0.0001)
{
glViewport(0, 0, width, height);
}
else if (device_aspect > desired_aspect)
{
float delta = (desired_aspect / device_aspect - 1.0) / 2.0 + 0.5;
@ -592,9 +598,7 @@ static void set_viewport(gl_t *gl, unsigned width, unsigned height, bool force_f
else
glViewport(0, 0, width, height);
glOrtho(0, 1, 0, 1, -1, 1);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
set_projection(gl);
gl_shader_set_proj_matrix();
@ -611,6 +615,13 @@ static void set_viewport(gl_t *gl, unsigned width, unsigned height, bool force_f
//SSNES_LOG("Setting viewport @ %ux%u\n", width, height);
}
static void gl_set_rotation(void *data, unsigned rotation)
{
gl_t *gl = (gl_t*)data;
gl->rotation = 90 * rotation;
set_projection(gl);
}
#ifdef HAVE_FREETYPE
// Somewhat overwhelming code just to render some damn fonts.
@ -1435,6 +1446,8 @@ const video_driver_t video_gl = {
NULL,
#endif
gl_free,
"gl"
"gl",
gl_set_rotation,
};