CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-12 06:51:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Themaister 2012-02-20 16:23:19 +01:00
commit b8382416ee
2 changed files with 57 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ps3/main.c
View File

@ -60,7 +60,6 @@ char SHADERS_DIR_PATH[MAX_PATH_LENGTH];
char DEFAULT_SHADER_FILE[MAX_PATH_LENGTH]; char DEFAULT_SHADER_FILE[MAX_PATH_LENGTH];
char DEFAULT_MENU_SHADER_FILE[MAX_PATH_LENGTH]; char DEFAULT_MENU_SHADER_FILE[MAX_PATH_LENGTH];
char SYS_CONFIG_FILE[MAX_PATH_LENGTH]; char SYS_CONFIG_FILE[MAX_PATH_LENGTH];
char MULTIMAN_GAME_TO_BOOT[MAX_PATH_LENGTH];
const char * MULTIMAN_EXECUTABLE = "/dev_hdd0/game/BLES80608/USRDIR/RELOAD.SELF"; const char * MULTIMAN_EXECUTABLE = "/dev_hdd0/game/BLES80608/USRDIR/RELOAD.SELF";
@ -287,7 +286,7 @@ static void get_environment_settings(int argc)
CellGameContentSize size; CellGameContentSize size;
char dirName[CELL_GAME_DIRNAME_SIZE]; char dirName[CELL_GAME_DIRNAME_SIZE];
SSNES_LOG("Registering Callback\n"); SSNES_LOG("Registering callback...\n");
cellSysutilRegisterCallback(0, callback_sysutil_exit, NULL); cellSysutilRegisterCallback(0, callback_sysutil_exit, NULL);
if(path_file_exists(MULTIMAN_EXECUTABLE)) if(path_file_exists(MULTIMAN_EXECUTABLE))
@ -304,7 +303,7 @@ static void get_environment_settings(int argc)
if(argc > 1) if(argc > 1)
{ {
g_console.autostart_game = true; g_console.autostart_game = true;
SSNES_LOG("Started from multiMAN, will auto-start game\n"); SSNES_LOG("Started from multiMAN, will auto-start game.\n");
} }
else else
g_console.autostart_game = false; g_console.autostart_game = false;
@ -314,13 +313,26 @@ static void get_environment_settings(int argc)
int ret = cellGameBootCheck(&get_type, &get_attributes, &size, dirName); int ret = cellGameBootCheck(&get_type, &get_attributes, &size, dirName);
if(ret < 0) if(ret < 0)
{ {
SSNES_ERR("cellGameBootCheck() Error: 0x%x\n", ret); SSNES_ERR("cellGameBootCheck() Error: 0x%x.\n", ret);
} }
else else
{ {
SSNES_LOG("cellGameBootCheck() OK\n"); SSNES_LOG("cellGameBootCheck() OK.\n");
SSNES_LOG(" get_type = [%d] get_attributes = [0x%08x] dirName = [%s]\n", get_type, get_attributes, dirName); SSNES_LOG("Directory name: [%s].\n", dirName);
SSNES_LOG(" hddFreeSizeKB = [%d] sizeKB = [%d] sysSizeKB = [%d]\n", size.hddFreeSizeKB, size.sizeKB, size.sysSizeKB); SSNES_LOG(" HDD Free Size (in KB) = [%d] Size (in KB) = [%d] System Size (in KB) = [%d].\n", size.hddFreeSizeKB, size.sizeKB, size.sysSizeKB);
switch(get_type)
{
case CELL_GAME_GAMETYPE_DISC:
SSNES_LOG("SSNES was launched on Optical Disc Drive.\n");
break;
case CELL_GAME_GAMETYPE_HDD:
SSNES_LOG("SSNES was launched on HDD.\n");
break;
}
if((get_attributes & CELL_GAME_ATTRIBUTE_APP_HOME) == CELL_GAME_ATTRIBUTE_APP_HOME)
SSNES_LOG("SSNES was launched from host machine (APP_HOME).\n");
ret = cellGameContentPermit(contentInfoPath, usrDirPath); ret = cellGameContentPermit(contentInfoPath, usrDirPath);
@ -336,9 +348,9 @@ static void get_environment_settings(int argc)
} }
else else
{ {
SSNES_LOG("cellGameContentPermit() OK\n"); SSNES_LOG("cellGameContentPermit() OK.\n");
SSNES_LOG("contentInfoPath:[%s]\n", contentInfoPath); SSNES_LOG("contentInfoPath : [%s].\n", contentInfoPath);
SSNES_LOG("usrDirPath:[%s]\n", usrDirPath); SSNES_LOG("usrDirPath : [%s].\n", usrDirPath);
} }
/* now we fill in all the variables */ /* now we fill in all the variables */

76
ps3/ps3_video_psgl.c
View File

@ -908,17 +908,17 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
gl->vsync = video->vsync; gl->vsync = video->vsync;
SSNES_LOG("GL: Using resolution %ux%u\n", gl->win_width, gl->win_height); SSNES_LOG("GL: Using resolution %ux%u.\n", gl->win_width, gl->win_height);
SSNES_LOG("GL: Initializing debug fonts \n"); SSNES_LOG("GL: Initializing debug fonts...\n");
psgl_init_dbgfont(gl); psgl_init_dbgfont(gl);
SSNES_LOG("Initializing menu shader\n"); SSNES_LOG("Initializing menu shader...\n");
gl_cg_set_menu_shader(DEFAULT_MENU_SHADER_FILE); gl_cg_set_menu_shader(DEFAULT_MENU_SHADER_FILE);
if (!gl_shader_init()) if (!gl_shader_init())
{ {
SSNES_ERR("Menu shader init failed.\n"); SSNES_ERR("Menu shader initialization failed.\n");
psgl_deinit(gl); psgl_deinit(gl);
free(gl); free(gl);
return NULL; return NULL;
@ -950,8 +950,6 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
gl->base_size = video->rgb32 ? sizeof(uint32_t) : sizeof(uint16_t); gl->base_size = video->rgb32 ? sizeof(uint32_t) : sizeof(uint16_t);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
glDisable(GL_DEPTH_TEST);
glDisable(GL_DITHER);
glClearColor(0, 0, 0, 1); glClearColor(0, 0, 0, 1);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
@ -1051,11 +1049,6 @@ static void ps3graphics_set_swap_block_swap(void * data, bool toggle)
(void)data; (void)data;
gl_t *gl = g_gl; gl_t *gl = g_gl;
gl->block_swap = toggle; gl->block_swap = toggle;
if(toggle)
SSNES_LOG("Swap is set to blocked\n");
else
SSNES_LOG("Swap is set to non-blocked\n");
} }
static void ps3graphics_swap(void * data) static void ps3graphics_swap(void * data)
@ -1066,16 +1059,17 @@ static void ps3graphics_swap(void * data)
cellSysutilCheckCallback(); cellSysutilCheckCallback();
} }
const video_driver_t video_gl = { const video_driver_t video_gl =
.init = gl_init, {
.frame = gl_frame, .init = gl_init,
.alive = gl_alive, .frame = gl_frame,
.set_nonblock_state = gl_set_nonblock_state, .alive = gl_alive,
.focus = gl_focus, .set_nonblock_state = gl_set_nonblock_state,
.free = gl_free, .focus = gl_focus,
.ident = "gl", .free = gl_free,
.set_swap_block_state = ps3graphics_set_swap_block_swap, .ident = "gl",
.swap = ps3graphics_swap .set_swap_block_state = ps3graphics_set_swap_block_swap,
.swap = ps3graphics_swap
}; };
static void get_all_available_resolutions (void) static void get_all_available_resolutions (void)
@ -1223,29 +1217,29 @@ bool ps3_setup_texture(void)
void ps3_set_filtering(unsigned index, bool set_smooth) void ps3_set_filtering(unsigned index, bool set_smooth)
{ {
gl_t *gl = g_gl; gl_t *gl = g_gl;
if (!gl) if (!gl)
return; return;
if (index == 1) if (index == 1)
{ {
// Apply to all PREV textures. // Apply to all PREV textures.
for (unsigned i = 0; i < TEXTURES; i++) for (unsigned i = 0; i < TEXTURES; i++)
{ {
glBindTexture(GL_TEXTURE_2D, gl->texture[i]); glBindTexture(GL_TEXTURE_2D, gl->texture[i]);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, set_smooth ? GL_LINEAR : GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, set_smooth ? GL_LINEAR : GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, set_smooth ? GL_LINEAR : GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, set_smooth ? GL_LINEAR : GL_NEAREST);
} }
} }
else if (index >= 2 && gl->fbo_inited) else if (index >= 2 && gl->fbo_inited)
{ {
glBindTexture(GL_TEXTURE_2D, gl->fbo_texture[index - 2]); glBindTexture(GL_TEXTURE_2D, gl->fbo_texture[index - 2]);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, set_smooth ? GL_LINEAR : GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, set_smooth ? GL_LINEAR : GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, set_smooth ? GL_LINEAR : GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, set_smooth ? GL_LINEAR : GL_NEAREST);
} }
glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]); glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]);
} }
void ps3graphics_set_overscan(bool overscan_enable, float amount, bool recalculate_viewport) void ps3graphics_set_overscan(bool overscan_enable, float amount, bool recalculate_viewport)