libretro/beetle-psx-libretro
1
0
Fork 0
mirror of https://github.com/libretro/beetle-psx-libretro.git synced 2024-12-03 15:11:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "improve context switching"

Browse Source
This commit is contained in:
barbudreadmon 2020-10-02 13:28:38 +02:00 committed by GitHub
parent e771e62e6a
commit f7fc18ed24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rsx/rsx_intf.cpp
View File

@ -229,17 +229,8 @@ bool rsx_intf_open(bool is_pal, bool force_software)
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
if ((preferred == RETRO_HW_CONTEXT_DUMMY ||
preferred == RETRO_HW_CONTEXT_OPENGL ||
preferred == RETRO_HW_CONTEXT_OPENGL_CORE)
&& rsx_gl_core_open(is_pal))
{
rsx_type = RSX_OPENGL;
gl_initialized = true;
rsx_intf_dump_init();
return true;
}
if ((preferred == RETRO_HW_CONTEXT_DUMMY ||
preferred == RETRO_HW_CONTEXT_OPENGL)
&& rsx_gl_open(is_pal))
{
rsx_type = RSX_OPENGL;

35
rsx/rsx_lib_gl.cpp
View File

@ -373,7 +373,6 @@ extern "C"
}
#endif
extern struct retro_hw_render_callback hw_render;
#ifdef DEBUG
static void get_error(const char *msg)
@ -2318,40 +2317,6 @@ bool rsx_gl_open(bool is_pal)
retro_pixel_format f = RETRO_PIXEL_FORMAT_XRGB8888;
VideoClock clock = is_pal ? VideoClock_Pal : VideoClock_Ntsc;
if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &f))
return false;
/* glsm related setup */
params.context_reset = gl_context_reset;
params.context_destroy = gl_context_destroy;
params.framebuffer_lock = gl_context_framebuffer_lock;
params.environ_cb = environ_cb;
params.stencil = false;
params.imm_vbo_draw = NULL;
params.imm_vbo_disable = NULL;
params.context_type = RETRO_HW_CONTEXT_OPENGL;
// i identified 2 issues with RA's gl context's versioning :
// - any value above 3.0 won't provide a valid context, while the GLSM_CTL_STATE_CONTEXT_INIT call returned true...
// - the only way to overwrite previously set version with zero values is to set them directly in hw_render, otherwise they are ignored (see glsm_state_ctx_init logic)
// so we need a workaround like this
hw_render.version_major = 3;
hw_render.version_minor = 0;
if (!glsm_ctl(GLSM_CTL_STATE_CONTEXT_INIT, &params))
return false;
/* No context until 'context_reset' is called */
static_renderer.video_clock = clock;
return true;
}
bool rsx_gl_core_open(bool is_pal)
{
glsm_ctx_params_t params = {0};
retro_pixel_format f = RETRO_PIXEL_FORMAT_XRGB8888;
VideoClock clock = is_pal ? VideoClock_Pal : VideoClock_Ntsc;
if (!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &f))
return false;

1
rsx/rsx_lib_gl.h
View File

@ -10,7 +10,6 @@ void rsx_gl_set_video_refresh(retro_video_refresh_t cb);
void rsx_gl_get_system_av_info(struct retro_system_av_info *info);
bool rsx_gl_open(bool is_pal);
bool rsx_gl_core_open(bool is_pal);
void rsx_gl_close(void);
void rsx_gl_refresh_variables(void);
void rsx_gl_prepare_frame(void);