ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(PS3) Bug fix - menu now starts up properly if 'Custom Scaling/Dual 

Shaders' is set to 'OFF'
This commit is contained in:
Twinaphex 2012-08-22 00:01:59 +02:00
parent bc30bca7d5
commit 9a0d6a0c33
3 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
console/rmenu/rmenu.c
View File

@ -58,7 +58,6 @@
#include "rmenu.h"
#define INPUT_SCALE 2
#define MENU_ITEM_SELECTED(index) (menuitem_colors[index])
static bool set_libretro_core_as_launch;
@ -622,29 +621,6 @@ static void browser_render(filebrowser_t * b)
}
}
#ifdef __CELLOS_LV2__
static void apply_scaling (unsigned init_mode)
{
DEVICE_CAST device_ptr = (DEVICE_CAST)driver.video_data;
switch(init_mode)
{
case FBO_DEINIT:
gl_deinit_fbo(device_ptr);
break;
case FBO_INIT:
gl_init_fbo(device_ptr, RARCH_SCALE_BASE * INPUT_SCALE,
RARCH_SCALE_BASE * INPUT_SCALE);
break;
case FBO_REINIT:
gl_deinit_fbo(device_ptr);
gl_init_fbo(device_ptr, RARCH_SCALE_BASE * INPUT_SCALE,
RARCH_SCALE_BASE * INPUT_SCALE);
break;
}
}
#endif
static void select_file(menu *current_menu, uint64_t input)
{
char extensions[256], comment[256], path[PATH_MAX];
@ -705,11 +681,11 @@ static void select_file(menu *current_menu, uint64_t input)
break;
case PRESET_CHOICE:
strlcpy(g_console.cgp_path, path, sizeof(g_console.cgp_path));
apply_scaling(FBO_DEINIT);
gfx_ctx_apply_fbo_state_changes(FBO_DEINIT);
#ifdef HAVE_OPENGL
gl_cg_reinit(path);
#endif
apply_scaling(FBO_INIT);
gfx_ctx_apply_fbo_state_changes(FBO_INIT);
break;
#endif
case INPUT_PRESET_CHOICE:
@ -1078,8 +1054,8 @@ static void producesettingentry(menu *current_menu, unsigned switchvalue, uint64
if(input & (1 << RMENU_DEVICE_NAV_START))
{
rarch_settings_default(S_DEF_SCALE_ENABLED);
apply_scaling(FBO_DEINIT);
apply_scaling(FBO_INIT);
gfx_ctx_apply_fbo_state_changes(FBO_DEINIT);
gfx_ctx_apply_fbo_state_changes(FBO_INIT);
}
break;
case SETTING_SCALE_FACTOR:
@ -1092,7 +1068,7 @@ static void producesettingentry(menu *current_menu, unsigned switchvalue, uint64
if(should_decrement)
{
rarch_settings_change(S_SCALE_FACTOR_DECREMENT);
apply_scaling(FBO_REINIT);
gfx_ctx_apply_fbo_state_changes(FBO_REINIT);
}
}
}
@ -1104,15 +1080,15 @@ static void producesettingentry(menu *current_menu, unsigned switchvalue, uint64
if(should_increment)
{
rarch_settings_change(S_SCALE_FACTOR_INCREMENT);
apply_scaling(FBO_REINIT);
gfx_ctx_apply_fbo_state_changes(FBO_REINIT);
}
}
}
if(input & (1 << RMENU_DEVICE_NAV_START))
{
rarch_settings_default(S_DEF_SCALE_FACTOR);
apply_scaling(FBO_DEINIT);
apply_scaling(FBO_INIT);
gfx_ctx_apply_fbo_state_changes(FBO_DEINIT);
gfx_ctx_apply_fbo_state_changes(FBO_INIT);
}
break;
#endif

23
gfx/context/ps3_ctx.c
View File

@ -331,6 +331,29 @@ void gfx_ctx_set_fbo(bool enable)
gl->render_to_tex = enable;
}
#define INPUT_SCALE 2
void gfx_ctx_apply_fbo_state_changes(unsigned mode)
{
gl_t *gl = driver.video_data;
switch(mode)
{
case FBO_DEINIT:
gl_deinit_fbo(gl);
break;
case FBO_INIT:
gl_init_fbo(gl, RARCH_SCALE_BASE * INPUT_SCALE,
RARCH_SCALE_BASE * INPUT_SCALE);
break;
case FBO_REINIT:
gl_deinit_fbo(gl);
gl_init_fbo(gl, RARCH_SCALE_BASE * INPUT_SCALE,
RARCH_SCALE_BASE * INPUT_SCALE);
break;
}
}
void gfx_ctx_set_projection(gl_t *gl, const struct gl_ortho *ortho, bool allow_rotate)
{
// Calculate projection.

9
gfx/gl.c
View File

@ -1293,6 +1293,15 @@ static void gl_start(void)
#ifdef HAVE_CG_MENU
gfx_ctx_menu_init();
#endif
// FBO mode has to be enabled once even if FBO mode has to be
// turned off
if (!g_console.fbo_enabled)
{
gfx_ctx_apply_fbo_state_changes(FBO_DEINIT);
gfx_ctx_apply_fbo_state_changes(FBO_INIT);
gfx_ctx_apply_fbo_state_changes(FBO_DEINIT);
}
}
static void gl_stop(void)