From 8cc00dd5ebc41293cb7417f79e984374da5f4478 Mon Sep 17 00:00:00 2001
From: Andri Yngvason <andri.yngvason@marel.com>
Date: Wed, 9 Oct 2019 22:00:01 +0000
Subject: [PATCH] render: rename shader_program -> dmabuf_shader_program

---
 include/render.h |  2 +-
 src/render.c     | 46 +++++++++++++++++++++++++---------------------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/include/render.h b/include/render.h
index b8bac3c..f4ce814 100644
--- a/include/render.h
+++ b/include/render.h
@@ -25,7 +25,7 @@ struct renderer {
 	EGLDisplay display;
 	EGLSurface surface;
 	EGLContext context;
-	GLuint shader_program;
+	GLuint dmabuf_shader_program;
 	uint32_t width;
 	uint32_t height;
 	GLint read_format;
diff --git a/src/render.c b/src/render.c
index 92faf72..bf41901 100644
--- a/src/render.c
+++ b/src/render.c
@@ -148,25 +148,27 @@ static int gl_load_shader(GLuint* dst, const char* source, GLenum type)
 	return 0;
 }
 
-static int gl_compile_shader_program(GLuint* dst)
-{
-	static const char vertex_src[] =
-	"attribute vec2 pos;\n"
-	"attribute vec2 texture;\n"
-	"varying vec2 v_texture;\n"
-	"void main() {\n"
-	"    v_texture = vec2(texture.s, 1.0 - texture.t);\n"
-	"    gl_Position = vec4(pos, 0, 1);\n"
-	"}\n";
+static const char dmabuf_vertex_src[] =
+"attribute vec2 pos;\n"
+"attribute vec2 texture;\n"
+"varying vec2 v_texture;\n"
+"void main() {\n"
+"    v_texture = vec2(texture.s, 1.0 - texture.t);\n"
+"    gl_Position = vec4(pos, 0, 1);\n"
+"}\n";
 
-	static const char fragment_src[] =
-	"#extension GL_OES_EGL_image_external: require\n\n"
-	"precision mediump float;\n"
-	"uniform samplerExternalOES u_tex;\n"
-	"varying vec2 v_texture;\n"
-	"void main() {\n"
-	"    gl_FragColor = texture2D(u_tex, v_texture);\n"
-	"}\n";
+static const char dmabuf_fragment_src[] =
+"#extension GL_OES_EGL_image_external: require\n\n"
+"precision mediump float;\n"
+"uniform samplerExternalOES u_tex;\n"
+"varying vec2 v_texture;\n"
+"void main() {\n"
+"    gl_FragColor = texture2D(u_tex, v_texture);\n"
+"}\n";
+
+static int gl_compile_shader_program(GLuint* dst, const char* vertex_src,
+				     const char* fragment_src)
+{
 
 	int rc = -1;
 	GLuint vertex, fragment;
@@ -244,7 +246,7 @@ void renderer_destroy(struct renderer* self)
 {
 	eglDestroySurface(self->display, self->surface);
 	eglDestroyContext(self->display, self->context);
-	glDeleteProgram(self->shader_program);
+	glDeleteProgram(self->dmabuf_shader_program);
 }
 
 int renderer_init(struct renderer* self, uint32_t width, uint32_t height)
@@ -310,10 +312,12 @@ int renderer_init(struct renderer* self, uint32_t width, uint32_t height)
 	if (gl_load_late_extensions() < 0)
 		goto late_extension_failure;
 
-	if (gl_compile_shader_program(&self->shader_program) < 0)
+	if (gl_compile_shader_program(&self->dmabuf_shader_program,
+				      dmabuf_vertex_src,
+				      dmabuf_fragment_src) < 0)
 		goto shader_failure;
 
-	glUseProgram(self->shader_program);
+	glUseProgram(self->dmabuf_shader_program);
 
 	self->width = width;
 	self->height = height;