From 840e772b16f280ea7b8b219c910b65a729f02076 Mon Sep 17 00:00:00 2001 From: radius Date: Wed, 11 Oct 2017 22:47:45 -0500 Subject: [PATCH] move scissor test to nuklear driver exclusively --- menu/drivers/nuklear/nk_common.c | 3 +++ menu/drivers_display/menu_display_gl.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/menu/drivers/nuklear/nk_common.c b/menu/drivers/nuklear/nk_common.c index 7b9ed9815c..777589ba22 100644 --- a/menu/drivers/nuklear/nk_common.c +++ b/menu/drivers/nuklear/nk_common.c @@ -196,10 +196,12 @@ void nk_common_device_draw(struct nk_device *dev, glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &last_vao); glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, &last_ebo); glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &last_vbo); + glEnable(GL_SCISSOR_TEST); #endif menu_display_blend_begin(); + #if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) glActiveTexture(GL_TEXTURE0); #endif @@ -288,6 +290,7 @@ void nk_common_device_draw(struct nk_device *dev, glBindBuffer(GL_ARRAY_BUFFER, (GLuint)last_vbo); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, (GLuint)last_ebo); glBindVertexArray((GLuint)last_vao); + glDisable(GL_SCISSOR_TEST); #endif menu_display_blend_end(); diff --git a/menu/drivers_display/menu_display_gl.c b/menu/drivers_display/menu_display_gl.c index 3f8fd83166..b877b94d96 100644 --- a/menu/drivers_display/menu_display_gl.c +++ b/menu/drivers_display/menu_display_gl.c @@ -83,7 +83,6 @@ static void menu_display_gl_blend_begin(void) glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glEnable(GL_SCISSOR_TEST); shader_info.data = NULL; shader_info.idx = VIDEO_SHADER_STOCK_BLEND; @@ -95,7 +94,6 @@ static void menu_display_gl_blend_begin(void) static void menu_display_gl_blend_end(void) { glDisable(GL_BLEND); - glDisable(GL_SCISSOR_TEST); } static void menu_display_gl_viewport(void *data)