From 4ed151fb35c2d954562e1377f641996b59f3db0e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 10 Oct 2018 05:30:50 +0200 Subject: [PATCH] Cleanups - don't set core profile bit immediately --- dynamic.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dynamic.c b/dynamic.c index 73e593298d..99030368ca 100644 --- a/dynamic.c +++ b/dynamic.c @@ -955,16 +955,8 @@ static bool dynamic_request_hw_context(enum retro_hw_context_type type, break; case RETRO_HW_CONTEXT_OPENGL_CORE: - { - gfx_ctx_flags_t flags; - flags.flags = 0; - BIT32_SET(flags.flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT); - - video_context_driver_set_flags(&flags); - - RARCH_LOG("Requesting core OpenGL context (%u.%u).\n", - major, minor); - } + RARCH_LOG("Requesting core OpenGL context (%u.%u).\n", + major, minor); break; #endif @@ -1374,6 +1366,15 @@ bool rarch_environment_cb(unsigned cmd, void *data) if (!dynamic_verify_hw_context(cb->context_type, cb->version_minor, cb->version_major)) return false; + if (cb->context_type == RETRO_HW_CONTEXT_OPENGL_CORE) + { + gfx_ctx_flags_t flags; + flags.flags = 0; + BIT32_SET(flags.flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT); + + video_context_driver_set_flags(&flags); + } + cb->get_current_framebuffer = video_driver_get_current_framebuffer; cb->get_proc_address = video_driver_get_proc_address;