libretro/beetle-psx-libretro
1
0
Fork 0
mirror of https://github.com/libretro/beetle-psx-libretro.git synced 2024-11-27 02:40:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "sanitize gl context requests"

Browse Source
This commit is contained in:
Autechre 2020-05-25 21:29:07 +02:00 committed by GitHub
parent 4f1de91bb2
commit 3acd73e1bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rsx/rsx_intf.cpp
View File

@ -217,18 +217,9 @@ 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)
&& rsx_gl_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 ||
preferred == RETRO_HW_CONTEXT_OPENGL_CORE)
&& rsx_gl_core_open(is_pal))
&& rsx_gl_open(is_pal))
{
rsx_type = RSX_OPENGL;
gl_initialized = true;

31
rsx/rsx_lib_gl.cpp
View File

@ -2314,37 +2314,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;
// no major/minor when requesting OpenGL ?
//params.major = 3;
//params.minor = 3;
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);