From a3d4189a0bc4e157eb6478cab3c03a4905952486 Mon Sep 17 00:00:00 2001 From: Andri Yngvason Date: Thu, 5 Mar 2020 19:13:41 +0000 Subject: [PATCH] render: Add output transforms --- include/render.h | 4 ++++ src/main.c | 2 +- src/render.c | 47 +++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 44 insertions(+), 9 deletions(-) diff --git a/include/render.h b/include/render.h index 4175cb4..7614b87 100644 --- a/include/render.h +++ b/include/render.h @@ -18,6 +18,8 @@ #include #include +#include +#include struct dmabuf_frame; @@ -33,6 +35,7 @@ struct renderer { uint32_t width; uint32_t height; + enum wl_output_transform transform; GLint read_format; GLint read_type; @@ -45,6 +48,7 @@ struct renderer { }; int renderer_init(struct renderer* self, uint32_t width, uint32_t height, + enum wl_output_transform transform, enum renderer_input_type input_type); void renderer_destroy(struct renderer* self); diff --git a/src/main.c b/src/main.c index b0fae7c..81804c7 100644 --- a/src/main.c +++ b/src/main.c @@ -783,7 +783,7 @@ int main(int argc, char* argv[]) RENDERER_INPUT_DMABUF : RENDERER_INPUT_FB; if (renderer_init(&self.renderer, self.selected_output->width, self.selected_output->height, - renderer_input_type) < 0) { + WL_OUTPUT_TRANSFORM_NORMAL, renderer_input_type) < 0) { log_error("Failed to initialise renderer\n"); goto failure; } diff --git a/src/render.c b/src/render.c index 55cc699..8414745 100644 --- a/src/render.c +++ b/src/render.c @@ -63,6 +63,41 @@ enum { X_GL_EXTENSIONS #undef X +static const float transforms[][4] = { + [WL_OUTPUT_TRANSFORM_NORMAL] = { + 1.0f, 0.0f, + 0.0f, 1.0f, + }, + [WL_OUTPUT_TRANSFORM_90] = { + 0.0f, -1.0f, + 1.0f, 0.0f, + }, + [WL_OUTPUT_TRANSFORM_180] = { + -1.0f, 0.0f, + 0.0f, -1.0f, + }, + [WL_OUTPUT_TRANSFORM_270] = { + 0.0f, 1.0f, + -1.0f, 0.0f, + }, + [WL_OUTPUT_TRANSFORM_FLIPPED] = { // TODO + 1.0f, 0.0f, + 0.0f, 1.0f, + }, + [WL_OUTPUT_TRANSFORM_FLIPPED_90] = { // TODO + 1.0f, 0.0f, + 0.0f, 1.0f, + }, + [WL_OUTPUT_TRANSFORM_FLIPPED_180] = { // TODO + 1.0f, 0.0f, + 0.0f, 1.0f, + }, + [WL_OUTPUT_TRANSFORM_FLIPPED_270] = { // TODO + 1.0f, 0.0f, + 0.0f, 1.0f, + }, +}; + int gl_format_from_fourcc(GLenum* result, uint32_t format) { switch (format) { @@ -333,6 +368,7 @@ void renderer_destroy(struct renderer* self) } int renderer_init(struct renderer* self, uint32_t width, uint32_t height, + enum wl_output_transform transform, enum renderer_input_type input_type) { if (!eglBindAPI(EGL_OPENGL_ES_API)) @@ -416,6 +452,7 @@ int renderer_init(struct renderer* self, uint32_t width, uint32_t height, self->width = width; self->height = height; + self->transform = transform; glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_FORMAT, &self->read_format); glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_TYPE, &self->read_type); @@ -491,10 +528,7 @@ int render_dmabuf_frame(struct renderer* self, struct dmabuf_frame* frame) glUniform1i(self->shader.u_tex, 0); - const float proj[] = { - 1.0f, 0.0f, - 0.0f, 1.0f, - }; + const float* proj = transforms[self->transform]; glUniformMatrix2fv(self->shader.u_proj, 1, GL_FALSE, proj); gl_render(); @@ -528,10 +562,7 @@ int render_framebuffer(struct renderer* self, const void* addr, uint32_t format, glUniform1i(self->shader.u_tex, 0); - const float proj[] = { - 1.0f, 0.0f, - 0.0f, 1.0f, - }; + const float* proj = transforms[self->transform]; glUniformMatrix2fv(self->shader.u_proj, 1, GL_FALSE, proj); gl_render();