From 3acd73e1bdcd5493f254fb73bc63a49ab2047af1 Mon Sep 17 00:00:00 2001 From: Autechre Date: Mon, 25 May 2020 21:29:07 +0200 Subject: [PATCH] Revert "sanitize gl context requests" --- rsx/rsx_intf.cpp | 13 ++----------- rsx/rsx_lib_gl.cpp | 31 ------------------------------- rsx/rsx_lib_gl.h | 1 - 3 files changed, 2 insertions(+), 43 deletions(-) diff --git a/rsx/rsx_intf.cpp b/rsx/rsx_intf.cpp index 6f352a7c..4f953ae2 100644 --- a/rsx/rsx_intf.cpp +++ b/rsx/rsx_intf.cpp @@ -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; diff --git a/rsx/rsx_lib_gl.cpp b/rsx/rsx_lib_gl.cpp index 2c450eec..33c626ab 100644 --- a/rsx/rsx_lib_gl.cpp +++ b/rsx/rsx_lib_gl.cpp @@ -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, ¶ms)) - 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; diff --git a/rsx/rsx_lib_gl.h b/rsx/rsx_lib_gl.h index ca0bb36c..5d1485db 100644 --- a/rsx/rsx_lib_gl.h +++ b/rsx/rsx_lib_gl.h @@ -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);