From 557f0f365b127289548263e5951d60b6c8637da7 Mon Sep 17 00:00:00 2001
From: Andri Yngvason <andri@yngvason.is>
Date: Wed, 25 Mar 2020 21:27:57 +0000
Subject: [PATCH] renderer: Set up texture bindings on render()

---
 include/render.h |  2 ++
 src/render.c     | 23 +++++++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/include/render.h b/include/render.h
index 98bfc6d..bd68007 100644
--- a/include/render.h
+++ b/include/render.h
@@ -48,6 +48,8 @@ struct renderer {
 	GLuint tex[2];
 	int tex_index;
 
+	GLenum tex_target;
+
 	struct {
 		GLuint program;
 		GLint u_tex0;
diff --git a/src/render.c b/src/render.c
index dc632a1..1b6d236 100644
--- a/src/render.c
+++ b/src/render.c
@@ -355,6 +355,13 @@ GLuint renderer_next_tex(struct renderer* self)
 	return tex;
 }
 
+GLuint renderer_current_tex(const struct renderer* self)
+{
+	size_t len = ARRAY_LEN(self->tex);
+	size_t index = (len + self->tex_index - 1) % len;
+	return self->tex[index];
+}
+
 GLuint renderer_last_tex(const struct renderer* self)
 {
 	size_t len = ARRAY_LEN(self->tex);
@@ -370,6 +377,11 @@ void gl_clear(void)
 
 void render(struct renderer* self)
 {
+	glActiveTexture(GL_TEXTURE0);
+	glBindTexture(self->tex_target, renderer_current_tex(self));
+	glActiveTexture(GL_TEXTURE1);
+	glBindTexture(self->tex_target, renderer_last_tex(self));
+
 	glUseProgram(self->shader.program);
 
 	glUniform1i(self->shader.u_tex0, 0);
@@ -519,12 +531,16 @@ int renderer_init(struct renderer* self, const struct output* output,
 
 	switch (input_type) {
 	case RENDERER_INPUT_DMABUF:
+		self->tex_target = GL_TEXTURE_EXTERNAL_OES;
+
 		if (gl_compile_shader_program(&self->shader.program,
 					      "dmabuf-vertex.glsl",
 					      "dmabuf-fragment.glsl") < 0)
 			goto shader_failure;
 		break;
 	case RENDERER_INPUT_FB:
+		self->tex_target = GL_TEXTURE_2D;
+
 		if (gl_compile_shader_program(&self->shader.program,
 					      "texture-vertex.glsl",
 					      "texture-fragment.glsl") < 0)
@@ -608,11 +624,11 @@ int renderer_import_dmabuf_frame(struct renderer* self, GLuint tex,
 
 	glActiveTexture(GL_TEXTURE0);
 	glBindTexture(GL_TEXTURE_EXTERNAL_OES, tex);
+
 	glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES, image);
 	eglDestroyImageKHR(self->display, image);
 
-	glActiveTexture(GL_TEXTURE1);
-	glBindTexture(GL_TEXTURE_2D, renderer_last_tex(self));
+	glBindTexture(GL_TEXTURE_EXTERNAL_OES, 0);
 
 	return 0;
 }
@@ -635,8 +651,7 @@ int renderer_import_framebuffer(struct renderer* self, GLuint tex,
 	glGenerateMipmap(GL_TEXTURE_2D);
 	glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, 0);
 
-	glActiveTexture(GL_TEXTURE1);
-	glBindTexture(GL_TEXTURE_2D, renderer_last_tex(self));
+	glBindTexture(GL_TEXTURE_2D, 0);
 
 	return 0;
 }