From 310b66d519e7d1da6052aaa437a65eb56c349886 Mon Sep 17 00:00:00 2001 From: Rytis Karpuska Date: Wed, 6 Nov 2019 00:20:14 +0200 Subject: [PATCH] remove dual_texture from gl_compose as it is just unconditionally set to false. --- src/backend/gl/gl_common.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/backend/gl/gl_common.c b/src/backend/gl/gl_common.c index cfb0465..5ed422f 100644 --- a/src/backend/gl/gl_common.c +++ b/src/backend/gl/gl_common.c @@ -202,8 +202,6 @@ static void _gl_compose(backend_t *base, struct gl_image *img, GLuint target, return; } - bool dual_texture = false; - assert(gd->win_shader.prog); glUseProgram(gd->win_shader.prog); if (gd->win_shader.unifm_opacity >= 0) { @@ -224,11 +222,6 @@ static void _gl_compose(backend_t *base, struct gl_image *img, GLuint target, // Bind texture glBindTexture(GL_TEXTURE_2D, img->inner->texture); - if (dual_texture) { - glActiveTexture(GL_TEXTURE1); - glBindTexture(GL_TEXTURE_2D, img->inner->texture); - glActiveTexture(GL_TEXTURE0); - } GLuint vao; glGenVertexArrays(1, &vao); @@ -259,12 +252,6 @@ static void _gl_compose(backend_t *base, struct gl_image *img, GLuint target, glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); glDrawBuffer(GL_BACK); - if (dual_texture) { - glActiveTexture(GL_TEXTURE1); - glBindTexture(GL_TEXTURE_2D, 0); - glActiveTexture(GL_TEXTURE0); - } - glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); glDeleteBuffers(2, bo);