mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-26 06:40:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Themaister/SSNES

Browse Source
This commit is contained in:
Themaister 2012-01-28 15:42:20 +01:00
commit bedd5a691b
5 changed files with 705 additions and 690 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "ps3/pkg/USRDIR/shaders"] [submodule "ps3/pkg/USRDIR/shaders"]
path = ps3/pkg/USRDIR/shaders path = ps3/pkg/USRDIR/shaders
url = git@github.com:twinaphex/common-shaders.git url = git://github.com/twinaphex/common-shaders.git

2
Makefile.ps3
View File

@ -73,6 +73,8 @@ $(PPU_TARGET): $(OBJ)
pkg: $(PPU_TARGET) pkg: $(PPU_TARGET)
cp ssnes.cfg ps3/pkg/USRDIR/ cp ssnes.cfg ps3/pkg/USRDIR/
git submodule init
git submodule update
cp ps3/override/border-only.cg ps3/pkg/USRDIR/shaders/Borders/Menu/ cp ps3/override/border-only.cg ps3/pkg/USRDIR/shaders/Borders/Menu/
$(MAKE_FSELF_NPDRM) $(PPU_TARGET) ps3/pkg/USRDIR/EBOOT.BIN $(MAKE_FSELF_NPDRM) $(PPU_TARGET) ps3/pkg/USRDIR/EBOOT.BIN
$(MAKE_PACKAGE_NPDRM) ps3/pkg/package.conf ps3/pkg $(MAKE_PACKAGE_NPDRM) ps3/pkg/package.conf ps3/pkg

10
general.h
View File

@ -173,14 +173,16 @@ struct settings
struct console_settings struct console_settings
{ {
bool block_config_read; bool block_config_read;
bool in_game_menu;
bool return_to_multiman_enable; bool return_to_multiman_enable;
uint32_t *supported_resolutions; bool screenshots_enable;
uint32_t supported_resolutions_count; bool throttle;
bool triple_buffering_enabled;
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;
bool screenshots_enable; uint32_t *supported_resolutions;
bool in_game_menu; uint32_t supported_resolutions_count;
char rom_path[PATH_MAX]; char rom_path[PATH_MAX];
}; };
#endif #endif

26
ps3/menu.c
View File

@ -640,8 +640,28 @@ 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)
{
snprintf(menu_obj->items[currentsetting].setting_text, sizeof(menu_obj->items[currentsetting].setting_text), "ON");
menu_obj->items[currentsetting].text_color = GREEN;
}
else
{
snprintf(menu_obj->items[currentsetting].setting_text, sizeof(menu_obj->items[currentsetting].setting_text), "OFF");
menu_obj->items[currentsetting].text_color = ORANGE;
}
break; break;
case SETTING_TRIPLE_BUFFERING: case SETTING_TRIPLE_BUFFERING:
if(g_console.triple_buffering_enabled)
{
snprintf(menu_obj->items[currentsetting].setting_text, sizeof(menu_obj->items[currentsetting].setting_text), "ON");
menu_obj->items[currentsetting].text_color = GREEN;
}
else
{
snprintf(menu_obj->items[currentsetting].setting_text, sizeof(menu_obj->items[currentsetting].setting_text), "OFF");
menu_obj->items[currentsetting].text_color = ORANGE;
}
break; break;
case SETTING_ENABLE_SCREENSHOTS: case SETTING_ENABLE_SCREENSHOTS:
if(g_console.screenshots_enable) if(g_console.screenshots_enable)
@ -992,6 +1012,12 @@ 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)
ps3_unblock_swap();
else
ps3_block_swap();
g_console.throttle = !g_console.throttle;
set_text_message("", 7);
break; break;
case SETTING_TRIPLE_BUFFERING: case SETTING_TRIPLE_BUFFERING:
break; break;

1355
ps3/ps3_video_psgl.c
View File

File diff suppressed because it is too large Load Diff