libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 16:39:43 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(GX) add overscan code

Browse Source 
change rotation code to not depend on vertex trickery
This commit is contained in:
Toad King 2012-08-19 23:20:28 -04:00
parent 526558dcb3
commit 6c500b45d5
3 changed files with 71 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
console/rgui/rgui.c
View File

@ -330,6 +330,9 @@ static void render_text(rgui_handle_t *rgui)
case RGUI_SETTINGS_VIDEO_ASPECT_RATIO:
snprintf(type_str, sizeof(type_str), "%s", aspectratio_lut[g_console.aspect_ratio_index].name);
break;
case RGUI_SETTINGS_VIDEO_OVERSCAN:
snprintf(type_str, sizeof(type_str), "%.2f", g_console.overscan_amount);
break;
case RGUI_SETTINGS_VIDEO_ROTATION:
{
char rotate_msg[64];
@ -532,6 +535,29 @@ static void rgui_settings_toggle_setting(rgui_file_type_t setting, rgui_action_t
video_set_rotation_func(g_console.screen_orientation);
}
break;
case RGUI_SETTINGS_VIDEO_OVERSCAN:
if (action == RGUI_ACTION_START)
{
rarch_settings_default(S_DEF_OVERSCAN);
#ifdef GEKKO
gx->should_resize = true;
#endif
}
else if (action == RGUI_ACTION_LEFT)
{
rarch_settings_change(S_OVERSCAN_DECREMENT);
#ifdef GEKKO
gx->should_resize = true;
#endif
}
else if (action == RGUI_ACTION_RIGHT)
{
rarch_settings_change(S_OVERSCAN_INCREMENT);
#ifdef GEKKO
gx->should_resize = true;
#endif
}
break;
case RGUI_SETTINGS_AUDIO_MUTE:
if (action == RGUI_ACTION_START)
rarch_settings_default(S_DEF_AUDIO_MUTE);
@ -624,6 +650,7 @@ static void rgui_settings_populate_entries(rgui_handle_t *rgui)
#endif
RGUI_MENU_ITEM("Gamma", RGUI_SETTINGS_VIDEO_GAMMA);
RGUI_MENU_ITEM("Aspect Ratio", RGUI_SETTINGS_VIDEO_ASPECT_RATIO);
RGUI_MENU_ITEM("Overscan", RGUI_SETTINGS_VIDEO_OVERSCAN);
RGUI_MENU_ITEM("Rotation", RGUI_SETTINGS_VIDEO_ROTATION);
RGUI_MENU_ITEM("Mute Audio", RGUI_SETTINGS_AUDIO_MUTE);
RGUI_MENU_ITEM("Audio Control Rate", RGUI_SETTINGS_AUDIO_CONTROL_RATE);

1
console/rgui/rgui.h
View File

@ -44,6 +44,7 @@ typedef enum
#endif
RGUI_SETTINGS_VIDEO_GAMMA,
RGUI_SETTINGS_VIDEO_ASPECT_RATIO,
RGUI_SETTINGS_VIDEO_OVERSCAN,
RGUI_SETTINGS_VIDEO_ROTATION,
RGUI_SETTINGS_AUDIO_MUTE,
RGUI_SETTINGS_AUDIO_CONTROL_RATE,

86
gx/gx_video.c
View File

@ -31,6 +31,7 @@ unsigned g_current_framebuf;
bool g_vsync;
lwpq_t g_video_cond;
volatile bool g_draw_done;
uint32_t g_orientation;
struct
{
@ -56,36 +57,13 @@ float verts[16] ATTRIBUTE_ALIGN(32) = {
1, 1, -0.5,
};
float tex_coords[8] ATTRIBUTE_ALIGN(32) = {
float vertex_ptr[8] ATTRIBUTE_ALIGN(32) = {
0, 0,
0, 1,
1, 1,
1, 0,
};
float tex_coords_90[8] ATTRIBUTE_ALIGN(32) = {
0, 1,
1, 1,
1, 0,
0, 0
};
float tex_coords_180[8] ATTRIBUTE_ALIGN(32) = {
1, 1,
1, 0,
0, 0,
0, 1
};
float tex_coords_270[8] ATTRIBUTE_ALIGN(32) = {
1, 0,
0, 0,
0, 1,
1, 1
};
float *vertex_ptr = tex_coords;
void gx_set_aspect_ratio(void *data, unsigned aspectratio_idx)
{
gx_video_t *gx = (gx_video_t*)driver.video_data;
@ -119,6 +97,7 @@ static void setup_video_mode(GXRModeObj *mode)
g_current_framebuf = 0;
g_draw_done = true;
g_orientation = ORIENTATION_NORMAL;
LWP_InitQueue(&g_video_cond);
VIDEO_SetNextFramebuffer(g_framebuf[0]);
VIDEO_SetPostRetraceCallback(retrace_callback);
@ -197,6 +176,7 @@ static void build_disp_list(void)
static void gx_stop(void)
{
GX_DrawDone();
GX_AbortFrame();
GX_Flush();
VIDEO_SetBlack(true);
@ -447,7 +427,11 @@ static void gx_resize(gx_video_t *gx)
if (gx->keep_aspect)
{
float desired_aspect = g_settings.video.aspect_ratio;
if (desired_aspect == 0.0)
desired_aspect = 1.0;
float device_aspect = CONF_GetAspectRatio() == CONF_ASPECT_4_3 ? 4.0 / 3.0 : 16.0 / 9.0;
if (g_orientation == ORIENTATION_VERTICAL || g_orientation == ORIENTATION_FLIPPED_ROTATED)
desired_aspect = 1.0 / desired_aspect;
float delta;
#ifdef RARCH_CONSOLE
@ -483,6 +467,38 @@ static void gx_resize(gx_video_t *gx)
}
GX_SetViewport(x, y, width, height, 0, 1);
Mtx44 m1, m2;
float top = 1, bottom = -1, left = -1, right = 1;
if (g_console.overscan_enable)
{
top -= g_console.overscan_amount / 2;
left += g_console.overscan_amount / 2;
right -= g_console.overscan_amount / 2;
bottom += g_console.overscan_amount / 2;
}
guOrtho(m1, top, bottom, left, right, 0, 1);
unsigned degrees;
switch(g_orientation)
{
case ORIENTATION_NORMAL:
degrees = 0;
break;
case ORIENTATION_VERTICAL:
degrees = 90;
break;
case ORIENTATION_FLIPPED:
degrees = 180;
break;
case ORIENTATION_FLIPPED_ROTATED:
degrees = 270;
break;
}
guMtxIdentity(m2);
guMtxRotDeg(m2, 'Z', degrees);
guMtxConcat(m1, m2, m1);
GX_LoadPosMtxImm(m1, GX_PNMTX0);
gx->should_resize = false;
}
@ -566,25 +582,9 @@ static void gx_free(void *data)
static void gx_set_rotation(void * data, uint32_t orientation)
{
(void)data;
(void)orientation;
switch(orientation)
{
case ORIENTATION_NORMAL:
vertex_ptr = tex_coords;
break;
case ORIENTATION_VERTICAL:
vertex_ptr = tex_coords_90;
break;
case ORIENTATION_FLIPPED:
vertex_ptr = tex_coords_180;
break;
case ORIENTATION_FLIPPED_ROTATED:
vertex_ptr = tex_coords_270;
break;
}
GX_SetArray(GX_VA_TEX0, vertex_ptr, 2 * sizeof(float));
gx_video_t *gx = (gx_video_t*)driver.video_data;
g_orientation = orientation;
gx->should_resize = true;
}
const video_driver_t video_gx = {