mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-25 09:02:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PS3) Fix build - GL side is totally screwed up now though -

Browse Source 
investigate
This commit is contained in:
Twinaphex 2012-09-13 06:52:47 +02:00
parent c09fa1c7af
commit 455f74ea46
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
general.h
View File

@ -266,7 +266,7 @@ struct console_settings
char launch_app_on_exit[PATH_MAX]; char launch_app_on_exit[PATH_MAX];
float menu_font_size; float menu_font_size;
#ifdef HAVE_OSKUTIL #ifdef HAVE_OSKUTIL
void *oskutil_handle; oskutil_params oskutil_handle;
#endif #endif
}; };
#endif #endif

8
gfx/context/ps3_ctx.c
View File

@ -17,6 +17,10 @@
#include "../../driver.h" #include "../../driver.h"
#include "../../ps3/sdk_defines.h" #include "../../ps3/sdk_defines.h"
#ifndef __PSL1GHT__
#include <sys/spu_initialize.h>
#endif
#include <stdint.h> #include <stdint.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
@ -143,9 +147,9 @@ void gfx_ctx_set_swap_interval(unsigned interval, bool inited)
if (gl_context) if (gl_context)
{ {
if (interval) if (interval)
glEnable(GL_VSYNC); glEnable(GL_VSYNC_SCE);
else else
glDisable(GL_VSYNC); glDisable(GL_VSYNC_SCE);
} }
#endif #endif
} }

9
ps3/frontend/main.c
View File

@ -90,7 +90,7 @@ static void callback_sysutil_exit(uint64_t status, uint64_t param, void *userdat
(void) param; (void) param;
(void) userdata; (void) userdata;
#ifdef HAVE_OSKUTIL #ifdef HAVE_OSKUTIL
oskutil_params *osk = g_console.oskutil_handle; oskutil_params *osk = &g_console.oskutil_handle;
#endif #endif
gl_t *gl = driver.video_data; gl_t *gl = driver.video_data;
@ -314,7 +314,7 @@ int main(int argc, char *argv[])
driver.video = &video_gl; driver.video = &video_gl;
#ifdef HAVE_OSKUTIL #ifdef HAVE_OSKUTIL
oskutil_params *osk = g_console.oskutil_handle; oskutil_params *osk = &g_console.oskutil_handle;
oskutil_init(osk, 0); oskutil_init(osk, 0);
#endif #endif
@ -373,11 +373,8 @@ begin_shutdown:
menu_free(); menu_free();
#ifdef HAVE_OSKUTIL #ifdef HAVE_OSKUTIL
if(g_console.oskutil_handle) if(osk)
{
oskutil_params *osk = g_console.oskutil_handle;
oskutil_unload(osk); oskutil_unload(osk);
}
#endif #endif
#ifdef HAVE_LOGGER #ifdef HAVE_LOGGER