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

(PS3) V-sync can be switched on/off now

This commit is contained in:
TwinAphex51224 2012-01-30 09:53:16 +01:00
parent 8deab9ea35
commit bad72987d0
6 changed files with 61 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
general.h
View File

@ -171,11 +171,11 @@ struct settings
struct console_settings struct console_settings
{ {
bool block_config_read; bool block_config_read;
bool in_game_menu; bool ingame_menu_enable;
bool return_to_multiman_enable; bool return_to_multiman_enable;
bool screenshots_enable; bool screenshots_enable;
bool throttle; bool throttle_enable;
bool triple_buffering_enabled; bool triple_buffering_enable;
uint32_t current_resolution_index; uint32_t current_resolution_index;
uint32_t current_resolution_id; uint32_t current_resolution_id;
uint32_t initial_resolution_id; uint32_t initial_resolution_id;

51
ps3/main.c
View File

@ -127,18 +127,27 @@ static void init_settings(void)
config_file_t * currentconfig = config_file_new(SYS_CONFIG_FILE); config_file_t * currentconfig = config_file_new(SYS_CONFIG_FILE);
init_setting_bool("video_smooth", g_settings.video.smooth, 1); // g_settings
init_setting_bool("video_second_pass_smooth", g_settings.video.second_pass_smooth, 1);
init_setting_char("video_cg_shader", g_settings.video.cg_shader_path, DEFAULT_SHADER_FILE);
init_setting_char("video_second_pass_shader", g_settings.video.second_pass_shader, DEFAULT_SHADER_FILE);
init_setting_float("video_fbo_scale_x", g_settings.video.fbo_scale_x, 2.0f);
init_setting_float("video_fbo_scale_y", g_settings.video.fbo_scale_y, 2.0f);
init_setting_bool("video_render_to_texture", g_settings.video.render_to_texture, 1);
init_setting_bool("video_vsync", g_settings.video.vsync, 1);
init_setting_uint("state_slot", g_extern.state_slot, 0);
init_setting_uint("screenshots_enabled", g_console.screenshots_enable, 0);
init_setting_char("cheat_database_path", g_settings.cheat_database, usrDirPath); init_setting_char("cheat_database_path", g_settings.cheat_database, usrDirPath);
init_setting_bool("rewind_enable", g_settings.rewind_enable, false); init_setting_bool("rewind_enable", g_settings.rewind_enable, false);
init_setting_char("video_cg_shader", g_settings.video.cg_shader_path, DEFAULT_SHADER_FILE);
init_setting_float("video_fbo_scale_x", g_settings.video.fbo_scale_x, 2.0f);
init_setting_bool("video_render_to_texture", g_settings.video.render_to_texture, true);
init_setting_char("video_second_pass_shader", g_settings.video.second_pass_shader, DEFAULT_SHADER_FILE);
init_setting_bool("video_second_pass_smooth", g_settings.video.second_pass_smooth, true);
init_setting_bool("video_smooth", g_settings.video.smooth, true);
init_setting_bool("video_vsync", g_settings.video.vsync, true);
// g_console
init_setting_bool("screenshots_enabled", g_console.screenshots_enable, false);
init_setting_bool("throttle_enable", g_console.throttle_enable, true);
init_setting_bool("triple_buffering_enable", g_console.triple_buffering_enable, true);
// g_extern
init_setting_uint("state_slot", g_extern.state_slot, 0);
} }
static void get_path_settings(bool multiman_support) static void get_path_settings(bool multiman_support)
@ -205,7 +214,7 @@ static void callback_sysutil_exit(uint64_t status, uint64_t param, void *userdat
case CELL_SYSUTIL_REQUEST_EXITGAME: case CELL_SYSUTIL_REQUEST_EXITGAME:
menu_is_running = 0; menu_is_running = 0;
g_quitting = true; g_quitting = true;
g_console.in_game_menu = false; g_console.ingame_menu_enable = false;
mode_switch = MODE_EXIT; mode_switch = MODE_EXIT;
if(g_emulator_initialized) if(g_emulator_initialized)
ssnes_main_deinit(); ssnes_main_deinit();
@ -225,7 +234,7 @@ static void ingame_menu(void)
uint32_t menuitem_colors[MENU_ITEM_LAST]; uint32_t menuitem_colors[MENU_ITEM_LAST];
char comment[256], msg_temp[256]; char comment[256], msg_temp[256];
ps3_block_swap(); ps3graphics_block_swap();
do do
{ {
@ -246,7 +255,7 @@ static void ingame_menu(void)
if(CTRL_CIRCLE(state)) if(CTRL_CIRCLE(state))
{ {
ingame_menu_item = 0; ingame_menu_item = 0;
g_console.in_game_menu = false; g_console.ingame_menu_enable = false;
mode_switch = MODE_EMULATION; mode_switch = MODE_EMULATION;
} }
@ -347,7 +356,7 @@ static void ingame_menu(void)
if(CTRL_CROSS(button_was_pressed)) if(CTRL_CROSS(button_was_pressed))
{ {
ingame_menu_item = 0; ingame_menu_item = 0;
g_console.in_game_menu = false; g_console.ingame_menu_enable = false;
mode_switch = MODE_EMULATION; mode_switch = MODE_EMULATION;
} }
ingame_menu_reset_entry_colors (ingame_menu_item); ingame_menu_reset_entry_colors (ingame_menu_item);
@ -357,7 +366,7 @@ static void ingame_menu(void)
if(CTRL_CROSS(button_was_pressed)) if(CTRL_CROSS(button_was_pressed))
{ {
ingame_menu_item = 0; ingame_menu_item = 0;
g_console.in_game_menu = false; g_console.ingame_menu_enable = false;
mode_switch = MODE_EMULATION; mode_switch = MODE_EMULATION;
} }
ingame_menu_reset_entry_colors (ingame_menu_item); ingame_menu_reset_entry_colors (ingame_menu_item);
@ -367,7 +376,7 @@ static void ingame_menu(void)
if(CTRL_CROSS(button_was_pressed)) if(CTRL_CROSS(button_was_pressed))
{ {
ingame_menu_item = 0; ingame_menu_item = 0;
g_console.in_game_menu = false; g_console.ingame_menu_enable = false;
menu_is_running = 0; menu_is_running = 0;
mode_switch = MODE_MENU; mode_switch = MODE_MENU;
} }
@ -379,7 +388,7 @@ static void ingame_menu(void)
case MENU_ITEM_RETURN_TO_MULTIMAN: case MENU_ITEM_RETURN_TO_MULTIMAN:
if(CTRL_CROSS(button_was_pressed)) if(CTRL_CROSS(button_was_pressed))
{ {
g_console.in_game_menu = false; g_console.ingame_menu_enable = false;
mode_switch = MODE_EXIT; mode_switch = MODE_EXIT;
} }
@ -390,7 +399,7 @@ static void ingame_menu(void)
case MENU_ITEM_RETURN_TO_XMB: case MENU_ITEM_RETURN_TO_XMB:
if(CTRL_CROSS(button_was_pressed)) if(CTRL_CROSS(button_was_pressed))
{ {
g_console.in_game_menu = false; g_console.ingame_menu_enable = false;
#ifdef MULTIMAN_SUPPORT #ifdef MULTIMAN_SUPPORT
return_to_MM = false; return_to_MM = false;
#endif #endif
@ -482,9 +491,9 @@ static void ingame_menu(void)
psglSwap(); psglSwap();
old_state = state; old_state = state;
cellSysutilCheckCallback(); cellSysutilCheckCallback();
}while(g_console.in_game_menu); }while(g_console.ingame_menu_enable);
ps3_unblock_swap(); ps3graphics_unblock_swap();
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
@ -547,7 +556,7 @@ begin_loop:
input_ps3.poll(NULL); input_ps3.poll(NULL);
while(ssnes_main_iterate()); while(ssnes_main_iterate());
g_extern.is_paused = true; g_extern.is_paused = true;
if(g_console.in_game_menu) if(g_console.ingame_menu_enable)
ingame_menu(); ingame_menu();
} }
else if(mode_switch == MODE_MENU) else if(mode_switch == MODE_MENU)

22
ps3/menu.c
View File

@ -642,7 +642,7 @@ static void set_setting_label(menu * menu_obj, int currentsetting)
case SETTING_HW_OVERSCAN_AMOUNT: case SETTING_HW_OVERSCAN_AMOUNT:
break; break;
case SETTING_THROTTLE_MODE: case SETTING_THROTTLE_MODE:
if(g_console.throttle) if(g_console.throttle_enable)
{ {
snprintf(menu_obj->items[currentsetting].setting_text, sizeof(menu_obj->items[currentsetting].setting_text), "ON"); snprintf(menu_obj->items[currentsetting].setting_text, sizeof(menu_obj->items[currentsetting].setting_text), "ON");
menu_obj->items[currentsetting].text_color = GREEN; menu_obj->items[currentsetting].text_color = GREEN;
@ -654,7 +654,7 @@ static void set_setting_label(menu * menu_obj, int currentsetting)
} }
break; break;
case SETTING_TRIPLE_BUFFERING: case SETTING_TRIPLE_BUFFERING:
if(g_console.triple_buffering_enabled) if(g_console.triple_buffering_enable)
{ {
snprintf(menu_obj->items[currentsetting].setting_text, sizeof(menu_obj->items[currentsetting].setting_text), "ON"); snprintf(menu_obj->items[currentsetting].setting_text, sizeof(menu_obj->items[currentsetting].setting_text), "ON");
menu_obj->items[currentsetting].text_color = GREEN; menu_obj->items[currentsetting].text_color = GREEN;
@ -1014,12 +1014,18 @@ static void producesettingentry(menu * menu_obj, uint64_t switchvalue)
case SETTING_HW_OVERSCAN_AMOUNT: case SETTING_HW_OVERSCAN_AMOUNT:
break; break;
case SETTING_THROTTLE_MODE: case SETTING_THROTTLE_MODE:
if(g_console.throttle) if(CTRL_LEFT(state) || CTRL_LSTICK_LEFT(state) || CTRL_RIGHT(state) || CTRL_LSTICK_RIGHT(state))
ps3_unblock_swap(); {
else g_console.throttle_enable = !g_console.throttle_enable;
ps3_block_swap(); ps3graphics_set_vsync(g_console.throttle_enable);
g_console.throttle = !g_console.throttle; set_text_message("", 7);
set_text_message("", 7); }
if(CTRL_START(state))
{
g_console.throttle_enable = true;
ps3graphics_set_vsync(g_console.throttle_enable);
set_text_message("", 7);
}
break; break;
case SETTING_TRIPLE_BUFFERING: case SETTING_TRIPLE_BUFFERING:
break; break;

2
ps3/ps3_input.c
View File

@ -145,7 +145,7 @@ static bool ps3_key_pressed(void *data, int key)
case SSNES_REWIND: case SSNES_REWIND:
return CTRL_RSTICK_DOWN(state[0]) && CTRL_R2(~state[0]); return CTRL_RSTICK_DOWN(state[0]) && CTRL_R2(~state[0]);
case SSNES_QUIT_KEY: case SSNES_QUIT_KEY:
g_console.in_game_menu = CTRL_R3(state[0]) && !CTRL_L3(state[0]); g_console.ingame_menu_enable = CTRL_R3(state[0]) && !CTRL_L3(state[0]);
return CTRL_R3(state[0]); return CTRL_R3(state[0]);
default: default:
return false; return false;

12
ps3/ps3_video_psgl.c
View File

@ -1114,20 +1114,28 @@ const char * ps3_get_resolution_label(uint32_t resolution)
} }
} }
void ps3_block_swap (void) void ps3graphics_block_swap (void)
{ {
gl_t *gl = g_gl; gl_t *gl = g_gl;
gl->block_swap = true; gl->block_swap = true;
SSNES_LOG("Swap is set to blocked\n"); SSNES_LOG("Swap is set to blocked\n");
} }
void ps3_unblock_swap (void) void ps3graphics_unblock_swap (void)
{ {
gl_t *gl = g_gl; gl_t *gl = g_gl;
gl->block_swap = false; gl->block_swap = false;
SSNES_LOG("Swap is set to non-blocked\n"); SSNES_LOG("Swap is set to non-blocked\n");
} }
void ps3graphics_set_vsync(uint32_t vsync)
{
if(vsync)
glEnable(GL_VSYNC_SCE);
else
glDisable(GL_VSYNC_SCE);
}
bool ps3_setup_texture(void) bool ps3_setup_texture(void)
{ {
gl_t *gl = g_gl; gl_t *gl = g_gl;

5
ps3/ps3_video_psgl.h
View File

@ -30,8 +30,9 @@ void ps3_next_resolution (void);
void ps3_previous_resolution (void); void ps3_previous_resolution (void);
const char * ps3_get_resolution_label(uint32_t resolution); const char * ps3_get_resolution_label(uint32_t resolution);
int ps3_check_resolution(uint32_t resolution_id); int ps3_check_resolution(uint32_t resolution_id);
void ps3_block_swap (void); void ps3graphics_block_swap (void);
void ps3_unblock_swap (void); void ps3graphics_unblock_swap (void);
void ps3graphics_set_vsync(uint32_t vsync);
void gl_frame_menu(void); void gl_frame_menu(void);
bool ps3_setup_texture(void); bool ps3_setup_texture(void);
void ps3_set_filtering(unsigned index, bool set_smooth); void ps3_set_filtering(unsigned index, bool set_smooth);