diff --git a/ps3/main.c b/ps3/main.c index c747a0269d..5ec9812dcd 100644 --- a/ps3/main.c +++ b/ps3/main.c @@ -224,14 +224,14 @@ int main(int argc, char *argv[]) get_path_settings(return_to_MM); - ps3_graphics_init(); + ps3_video_init(); ps3_input_init(); menu_init(); - //menu_loop(); + menu_loop(); /* FIXME - As long as we don't use a menu */ - snprintf(g_extern.system.fullpath, sizeof(g_extern.system.fullpath), "/dev_hdd0/game/SNES90000/USRDIR/main.sfc"); + //snprintf(g_extern.system.fullpath, sizeof(g_extern.system.fullpath), "/dev_hdd0/game/SNES90000/USRDIR/main.sfc"); char arg1[] = "ssnes"; char arg2[PATH_MAX]; @@ -246,5 +246,5 @@ int main(int argc, char *argv[]) return ssnes_main(sizeof(argv_) / sizeof(argv_[0]) - 1, argv_); ps3_input_deinit(); - ps3_graphics_deinit(); + ps3_video_deinit(); } diff --git a/ps3/pkg/ICON0.PNG b/ps3/pkg/ICON0.PNG index f743ff4f71..7daca7efee 100644 Binary files a/ps3/pkg/ICON0.PNG and b/ps3/pkg/ICON0.PNG differ diff --git a/ps3/ps3_video_psgl.c b/ps3/ps3_video_psgl.c index b8cb60336b..0b21fc0907 100644 --- a/ps3/ps3_video_psgl.c +++ b/ps3/ps3_video_psgl.c @@ -156,7 +156,8 @@ static bool gl_shader_init(void) #ifdef HAVE_CG case SSNES_SHADER_CG: { - return gl_cg_init(g_settings.video.cg_shader_path); + if (strlen(g_settings.video.cg_shader_path) > 0) + return gl_cg_init(g_settings.video.cg_shader_path); break; } #endif @@ -1083,7 +1084,7 @@ void ps3_video_init(void) video_info.force_aspect = true; video_info.smooth = true; video_info.input_scale = 2; - g_gl = gl_init(&video, NULL, NULL); + g_gl = gl_init(&video_info, NULL, NULL); } void ps3_video_deinit(void)