RPJosh
/
wayvnc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

render: Move shader_program into shader struct

pull/20/head
Andri Yngvason 2020-03-05 18:14:50 +00:00
parent 1e6c89d9a9
commit 6b3b448405
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/render.h
View File

@ -30,11 +30,16 @@ struct renderer {
EGLDisplay display; EGLDisplay display;
EGLSurface surface; EGLSurface surface;
EGLContext context; EGLContext context;
GLuint shader_program;
uint32_t width; uint32_t width;
uint32_t height; uint32_t height;
GLint read_format; GLint read_format;
GLint read_type; GLint read_type;
struct {
GLuint program;
} shader;
}; };
int renderer_init(struct renderer* self, uint32_t width, uint32_t height, int renderer_init(struct renderer* self, uint32_t width, uint32_t height,

14
src/render.c
View File

@ -324,7 +324,7 @@ void gl_render(void)
void renderer_destroy(struct renderer* self) void renderer_destroy(struct renderer* self)
{ {
glDeleteProgram(self->shader_program); glDeleteProgram(self->shader.program);
eglMakeCurrent(self->display, EGL_NO_SURFACE, EGL_NO_SURFACE, eglMakeCurrent(self->display, EGL_NO_SURFACE, EGL_NO_SURFACE,
EGL_NO_CONTEXT); EGL_NO_CONTEXT);
eglDestroySurface(self->display, self->surface); eglDestroySurface(self->display, self->surface);
@ -398,13 +398,13 @@ int renderer_init(struct renderer* self, uint32_t width, uint32_t height,
switch (input_type) { switch (input_type) {
case RENDERER_INPUT_DMABUF: case RENDERER_INPUT_DMABUF:
if (gl_compile_shader_program(&self->shader_program, if (gl_compile_shader_program(&self->shader.program,
"dmabuf-vertex.glsl", "dmabuf-vertex.glsl",
"dmabuf-fragment.glsl") < 0) "dmabuf-fragment.glsl") < 0)
goto shader_failure; goto shader_failure;
break; break;
case RENDERER_INPUT_FB: case RENDERER_INPUT_FB:
if (gl_compile_shader_program(&self->shader_program, if (gl_compile_shader_program(&self->shader.program,
"texture-vertex.glsl", "texture-vertex.glsl",
"texture-fragment.glsl") < 0) "texture-fragment.glsl") < 0)
goto shader_failure; goto shader_failure;
@ -484,8 +484,8 @@ int render_dmabuf_frame(struct renderer* self, struct dmabuf_frame* frame)
glBindTexture(GL_TEXTURE_EXTERNAL_OES, tex); glBindTexture(GL_TEXTURE_EXTERNAL_OES, tex);
glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES, image); glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES, image);
glUseProgram(self->shader_program); glUseProgram(self->shader.program);
glUniform1i(glGetUniformLocation(self->shader_program, "u_tex"), 0); glUniform1i(glGetUniformLocation(self->shader.program, "u_tex"), 0);
gl_render(); gl_render();
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
@ -513,8 +513,8 @@ int render_framebuffer(struct renderer* self, const void* addr, uint32_t format,
glGenerateMipmap(GL_TEXTURE_2D); glGenerateMipmap(GL_TEXTURE_2D);
glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, 0); glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, 0);
glUseProgram(self->shader_program); glUseProgram(self->shader.program);
glUniform1i(glGetUniformLocation(self->shader_program, "u_tex"), 0); glUniform1i(glGetUniformLocation(self->shader.program, "u_tex"), 0);
gl_render(); gl_render();
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);