aboutsummaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
authornyorain <nyorain@gmail.com>2017-08-08 18:02:14 +0200
committernyorain <nyorain@gmail.com>2017-08-08 18:25:16 +0200
commite167f41fde7532ca453a9a70ad1e3f27d7177071 (patch)
treefb4f62dc4fcd4017db8695fc99a0e7ade8d6d80b /render
parentafd058b754e568728fbc7e2e34651dab9a8a827f (diff)
Rename wlr_surface -> wlr_texture; attach -> upload
Diffstat (limited to 'render')
-rw-r--r--render/gles2/renderer.c18
-rw-r--r--render/gles2/surface.c104
-rw-r--r--render/gles2/texture.c104
-rw-r--r--render/matrix.c2
-rw-r--r--render/meson.build4
-rw-r--r--render/wlr_renderer.c8
-rw-r--r--render/wlr_surface.c36
-rw-r--r--render/wlr_texture.c36
8 files changed, 156 insertions, 156 deletions
diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c
index f2a57a56..7d0db8b3 100644
--- a/render/gles2/renderer.c
+++ b/render/gles2/renderer.c
@@ -91,8 +91,8 @@ static void wlr_gles2_end(struct wlr_renderer_state *state) {
// no-op
}
-static struct wlr_surface *wlr_gles2_surface_init(struct wlr_renderer_state *state) {
- return gles2_surface_init();
+static struct wlr_texture *wlr_gles2_texture_init(struct wlr_renderer_state *state) {
+ return gles2_texture_init();
}
static void draw_quad() {
@@ -121,14 +121,14 @@ static void draw_quad() {
GL_CALL(glDisableVertexAttribArray(1));
}
-static bool wlr_gles2_render_surface(struct wlr_renderer_state *state,
- struct wlr_surface *surface, const float (*matrix)[16]) {
- if(!surface || !surface->valid) {
- wlr_log(L_ERROR, "attempt to render invalid surface");
+static bool wlr_gles2_render_texture(struct wlr_renderer_state *state,
+ struct wlr_texture *texture, const float (*matrix)[16]) {
+ if(!texture || !texture->valid) {
+ wlr_log(L_ERROR, "attempt to render invalid texture");
return false;
}
- wlr_surface_bind(surface);
+ wlr_texture_bind(texture);
GL_CALL(glUniformMatrix4fv(0, 1, GL_FALSE, *matrix));
// TODO: source alpha from somewhere else I guess
GL_CALL(glUniform1f(2, 1.0f));
@@ -171,8 +171,8 @@ static void wlr_gles2_destroy(struct wlr_renderer_state *state) {
static struct wlr_renderer_impl wlr_renderer_impl = {
.begin = wlr_gles2_begin,
.end = wlr_gles2_end,
- .surface_init = wlr_gles2_surface_init,
- .render_with_matrix = wlr_gles2_render_surface,
+ .texture_init = wlr_gles2_texture_init,
+ .render_with_matrix = wlr_gles2_render_texture,
.render_quad = wlr_gles2_render_quad,
.render_ellipse = wlr_gles2_render_ellipse,
.formats = wlr_gles2_formats,
diff --git a/render/gles2/surface.c b/render/gles2/surface.c
deleted file mode 100644
index 8a92907f..00000000
--- a/render/gles2/surface.c
+++ /dev/null
@@ -1,104 +0,0 @@
-#include <stdint.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#include <wayland-util.h>
-#include <wayland-server-protocol.h>
-#include <wlr/render.h>
-#include <wlr/render/interface.h>
-#include <wlr/render/matrix.h>
-#include <wlr/util/log.h>
-#include "render/gles2.h"
-
-static bool gles2_surface_attach_pixels(struct wlr_surface_state *surface,
- enum wl_shm_format format, int stride, int width, int height,
- const unsigned char *pixels) {
- assert(surface);
- const struct pixel_format *fmt = gl_format_for_wl_format(format);
- if (!fmt || !fmt->gl_format) {
- wlr_log(L_ERROR, "No supported pixel format for this surface");
- return false;
- }
- surface->wlr_surface->width = width;
- surface->wlr_surface->height = height;
- surface->wlr_surface->format = format;
- surface->pixel_format = fmt;
- GL_CALL(glGenTextures(1, &surface->tex_id));
- GL_CALL(glBindTexture(GL_TEXTURE_2D, surface->tex_id));
- GL_CALL(glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, stride));
- GL_CALL(glTexImage2D(GL_TEXTURE_2D, 0, fmt->gl_format, width, height, 0,
- fmt->gl_format, fmt->gl_type, pixels));
- GL_CALL(glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, 0));
- surface->wlr_surface->valid = true;
- return true;
-}
-
-static bool gles2_surface_attach_shm(struct wlr_surface_state *surface,
- uint32_t format, struct wl_shm_buffer *buffer) {
- const struct pixel_format *fmt = gl_format_for_wl_format(format);
- if (!fmt || !fmt->gl_format) {
- wlr_log(L_ERROR, "No supported pixel format for this surface");
- return false;
- }
- wl_shm_buffer_begin_access(buffer);
- uint8_t *pixels = wl_shm_buffer_get_data(buffer);
- int width = wl_shm_buffer_get_width(buffer);
- int height = wl_shm_buffer_get_height(buffer);
- int pitch = wl_shm_buffer_get_stride(buffer) / (fmt->bpp / 8);
- surface->wlr_surface->width = width;
- surface->wlr_surface->height = height;
- surface->wlr_surface->format = format;
- surface->pixel_format = fmt;
-
- GL_CALL(glGenTextures(1, &surface->tex_id));
- GL_CALL(glBindTexture(GL_TEXTURE_2D, surface->tex_id));
- GL_CALL(glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, pitch));
- GL_CALL(glTexImage2D(GL_TEXTURE_2D, 0, fmt->gl_format, width, height, 0,
- fmt->gl_format, fmt->gl_type, pixels));
-
- surface->wlr_surface->valid = true;
- wl_shm_buffer_end_access(buffer);
- return true;
-}
-
-static void gles2_surface_get_matrix(struct wlr_surface_state *surface,
- float (*matrix)[16], const float (*projection)[16], int x, int y) {
- struct wlr_surface *_surface = surface->wlr_surface;
- float world[16];
- wlr_matrix_identity(matrix);
- wlr_matrix_translate(&world, x, y, 0);
- wlr_matrix_mul(matrix, &world, matrix);
- wlr_matrix_scale(&world, _surface->width, _surface->height, 1);
- wlr_matrix_mul(matrix, &world, matrix);
- wlr_matrix_mul(projection, matrix, matrix);
-}
-
-static void gles2_surface_bind(struct wlr_surface_state *surface) {
- GL_CALL(glBindTexture(GL_TEXTURE_2D, surface->tex_id));
- GL_CALL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
- GL_CALL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
- GL_CALL(glUseProgram(*surface->pixel_format->shader));
-}
-
-static void gles2_surface_destroy(struct wlr_surface_state *surface) {
- wl_signal_emit(&surface->wlr_surface->destroy_signal, surface->wlr_surface);
- GL_CALL(glDeleteTextures(1, &surface->tex_id));
- free(surface);
-}
-
-static struct wlr_surface_impl wlr_surface_impl = {
- .attach_pixels = gles2_surface_attach_pixels,
- .attach_shm = gles2_surface_attach_shm,
- .get_matrix = gles2_surface_get_matrix,
- .bind = gles2_surface_bind,
- .destroy = gles2_surface_destroy,
-};
-
-struct wlr_surface *gles2_surface_init() {
- struct wlr_surface_state *state = calloc(sizeof(struct wlr_surface_state), 1);
- struct wlr_surface *surface = wlr_surface_init(state, &wlr_surface_impl);
- state->wlr_surface = surface;
- wl_signal_init(&surface->destroy_signal);
- return surface;
-}
diff --git a/render/gles2/texture.c b/render/gles2/texture.c
new file mode 100644
index 00000000..bd588898
--- /dev/null
+++ b/render/gles2/texture.c
@@ -0,0 +1,104 @@
+#include <stdint.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#include <wayland-util.h>
+#include <wayland-server-protocol.h>
+#include <wlr/render.h>
+#include <wlr/render/interface.h>
+#include <wlr/render/matrix.h>
+#include <wlr/util/log.h>
+#include "render/gles2.h"
+
+static bool gles2_texture_upload_pixels(struct wlr_texture_state *texture,
+ enum wl_shm_format format, int stride, int width, int height,
+ const unsigned char *pixels) {
+ assert(texture);
+ const struct pixel_format *fmt = gl_format_for_wl_format(format);
+ if (!fmt || !fmt->gl_format) {
+ wlr_log(L_ERROR, "No supported pixel format for this texture");
+ return false;
+ }
+ texture->wlr_texture->width = width;
+ texture->wlr_texture->height = height;
+ texture->wlr_texture->format = format;
+ texture->pixel_format = fmt;
+ GL_CALL(glGenTextures(1, &texture->tex_id));
+ GL_CALL(glBindTexture(GL_TEXTURE_2D, texture->tex_id));
+ GL_CALL(glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, stride));
+ GL_CALL(glTexImage2D(GL_TEXTURE_2D, 0, fmt->gl_format, width, height, 0,
+ fmt->gl_format, fmt->gl_type, pixels));
+ GL_CALL(glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, 0));
+ texture->wlr_texture->valid = true;
+ return true;
+}
+
+static bool gles2_texture_upload_shm(struct wlr_texture_state *texture,
+ uint32_t format, struct wl_shm_buffer *buffer) {
+ const struct pixel_format *fmt = gl_format_for_wl_format(format);
+ if (!fmt || !fmt->gl_format) {
+ wlr_log(L_ERROR, "No supported pixel format for this texture");
+ return false;
+ }
+ wl_shm_buffer_begin_access(buffer);
+ uint8_t *pixels = wl_shm_buffer_get_data(buffer);
+ int width = wl_shm_buffer_get_width(buffer);
+ int height = wl_shm_buffer_get_height(buffer);
+ int pitch = wl_shm_buffer_get_stride(buffer) / (fmt->bpp / 8);
+ texture->wlr_texture->width = width;
+ texture->wlr_texture->height = height;
+ texture->wlr_texture->format = format;
+ texture->pixel_format = fmt;
+
+ GL_CALL(glGenTextures(1, &texture->tex_id));
+ GL_CALL(glBindTexture(GL_TEXTURE_2D, texture->tex_id));
+ GL_CALL(glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, pitch));
+ GL_CALL(glTexImage2D(GL_TEXTURE_2D, 0, fmt->gl_format, width, height, 0,
+ fmt->gl_format, fmt->gl_type, pixels));
+
+ texture->wlr_texture->valid = true;
+ wl_shm_buffer_end_access(buffer);
+ return true;
+}
+
+static void gles2_texture_get_matrix(struct wlr_texture_state *texture,
+ float (*matrix)[16], const float (*projection)[16], int x, int y) {
+ struct wlr_texture *_texture = texture->wlr_texture;
+ float world[16];
+ wlr_matrix_identity(matrix);
+ wlr_matrix_translate(&world, x, y, 0);
+ wlr_matrix_mul(matrix, &world, matrix);
+ wlr_matrix_scale(&world, _texture->width, _texture->height, 1);
+ wlr_matrix_mul(matrix, &world, matrix);
+ wlr_matrix_mul(projection, matrix, matrix);
+}
+
+static void gles2_texture_bind(struct wlr_texture_state *texture) {
+ GL_CALL(glBindTexture(GL_TEXTURE_2D, texture->tex_id));
+ GL_CALL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
+ GL_CALL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
+ GL_CALL(glUseProgram(*texture->pixel_format->shader));
+}
+
+static void gles2_texture_destroy(struct wlr_texture_state *texture) {
+ wl_signal_emit(&texture->wlr_texture->destroy_signal, texture->wlr_texture);
+ GL_CALL(glDeleteTextures(1, &texture->tex_id));
+ free(texture);
+}
+
+static struct wlr_texture_impl wlr_texture_impl = {
+ .upload_pixels = gles2_texture_upload_pixels,
+ .upload_shm = gles2_texture_upload_shm,
+ .get_matrix = gles2_texture_get_matrix,
+ .bind = gles2_texture_bind,
+ .destroy = gles2_texture_destroy,
+};
+
+struct wlr_texture *gles2_texture_init() {
+ struct wlr_texture_state *state = calloc(sizeof(struct wlr_texture_state), 1);
+ struct wlr_texture *texture = wlr_texture_init(state, &wlr_texture_impl);
+ state->wlr_texture = texture;
+ wl_signal_init(&texture->destroy_signal);
+ return texture;
+}
diff --git a/render/matrix.c b/render/matrix.c
index c7b11efe..a927ed74 100644
--- a/render/matrix.c
+++ b/render/matrix.c
@@ -119,7 +119,7 @@ static const float transforms[][4] = {
};
// Equivilent to glOrtho(0, width, 0, height, 1, -1) with the transform applied
-void wlr_matrix_surface(float mat[static 16], int32_t width, int32_t height,
+void wlr_matrix_texture(float mat[static 16], int32_t width, int32_t height,
enum wl_output_transform transform) {
memset(mat, 0, sizeof(*mat) * 16);
diff --git a/render/meson.build b/render/meson.build
index 2fdba62c..93bf8b4b 100644
--- a/render/meson.build
+++ b/render/meson.build
@@ -1,10 +1,10 @@
wlr_files += files(
'matrix.c',
'wlr_renderer.c',
- 'wlr_surface.c',
+ 'wlr_texture.c',
'gles2/pixel_format.c',
'gles2/renderer.c',
'gles2/shaders.c',
- 'gles2/surface.c',
+ 'gles2/texture.c',
'gles2/util.c',
)
diff --git a/render/wlr_renderer.c b/render/wlr_renderer.c
index 720c5254..8418fd5b 100644
--- a/render/wlr_renderer.c
+++ b/render/wlr_renderer.c
@@ -23,13 +23,13 @@ void wlr_renderer_end(struct wlr_renderer *r) {
r->impl->end(r->state);
}
-struct wlr_surface *wlr_render_surface_init(struct wlr_renderer *r) {
- return r->impl->surface_init(r->state);
+struct wlr_texture *wlr_render_texture_init(struct wlr_renderer *r) {
+ return r->impl->texture_init(r->state);
}
bool wlr_render_with_matrix(struct wlr_renderer *r,
- struct wlr_surface *surface, const float (*matrix)[16]) {
- return r->impl->render_with_matrix(r->state, surface, matrix);
+ struct wlr_texture *texture, const float (*matrix)[16]) {
+ return r->impl->render_with_matrix(r->state, texture, matrix);
}
void wlr_render_colored_quad(struct wlr_renderer *r,
diff --git a/render/wlr_surface.c b/render/wlr_surface.c
deleted file mode 100644
index 4e4f4101..00000000
--- a/render/wlr_surface.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#include <stdlib.h>
-#include <stdbool.h>
-#include <wlr/render/interface.h>
-
-struct wlr_surface *wlr_surface_init(struct wlr_surface_state *state,
- struct wlr_surface_impl *impl) {
- struct wlr_surface *s = calloc(sizeof(struct wlr_surface), 1);
- s->state = state;
- s->impl = impl;
- return s;
-}
-
-void wlr_surface_destroy(struct wlr_surface *surface) {
- surface->impl->destroy(surface->state);
- free(surface);
-}
-
-void wlr_surface_bind(struct wlr_surface *surface) {
- surface->impl->bind(surface->state);
-}
-
-bool wlr_surface_attach_pixels(struct wlr_surface *surface, uint32_t format,
- int stride, int width, int height, const unsigned char *pixels) {
- return surface->impl->attach_pixels(surface->state,
- format, stride, width, height, pixels);
-}
-
-bool wlr_surface_attach_shm(struct wlr_surface *surface, uint32_t format,
- struct wl_shm_buffer *shm) {
- return surface->impl->attach_shm(surface->state, format, shm);
-}
-
-void wlr_surface_get_matrix(struct wlr_surface *surface,
- float (*matrix)[16], const float (*projection)[16], int x, int y) {
- surface->impl->get_matrix(surface->state, matrix, projection, x, y);
-}
diff --git a/render/wlr_texture.c b/render/wlr_texture.c
new file mode 100644
index 00000000..926ee546
--- /dev/null
+++ b/render/wlr_texture.c
@@ -0,0 +1,36 @@
+#include <stdlib.h>
+#include <stdbool.h>
+#include <wlr/render/interface.h>
+
+struct wlr_texture *wlr_texture_init(struct wlr_texture_state *state,
+ struct wlr_texture_impl *impl) {
+ struct wlr_texture *t = calloc(sizeof(struct wlr_texture), 1);
+ t->state = state;
+ t->impl = impl;
+ return t;
+}
+
+void wlr_texture_destroy(struct wlr_texture *texture) {
+ texture->impl->destroy(texture->state);
+ free(texture);
+}
+
+void wlr_texture_bind(struct wlr_texture *texture) {
+ texture->impl->bind(texture->state);
+}
+
+bool wlr_texture_upload_pixels(struct wlr_texture *texture, uint32_t format,
+ int stride, int width, int height, const unsigned char *pixels) {
+ return texture->impl->upload_pixels(texture->state,
+ format, stride, width, height, pixels);
+}
+
+bool wlr_texture_upload_shm(struct wlr_texture *texture, uint32_t format,
+ struct wl_shm_buffer *shm) {
+ return texture->impl->upload_shm(texture->state, format, shm);
+}
+
+void wlr_texture_get_matrix(struct wlr_texture *texture,
+ float (*matrix)[16], const float (*projection)[16], int x, int y) {
+ texture->impl->get_matrix(texture->state, matrix, projection, x, y);
+}