Merge pull request #48 from nyorain/wlr_texture
Rename wlr_surface -> wlr_texture; attach -> uploadmaster
Drew DeVault
7 years ago
committed by
GitHub
commit
ba87585bbe
@ -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;
|
|
||||||
}
|
|
||||||
@ -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;
|
||||||
|
}
|
||||||
@ -1,10 +1,10 @@
|
|||||||
wlr_files += files(
|
wlr_files += files(
|
||||||
'matrix.c',
|
'matrix.c',
|
||||||
'wlr_renderer.c',
|
'wlr_renderer.c',
|
||||||
'wlr_surface.c',
|
'wlr_texture.c',
|
||||||
'gles2/pixel_format.c',
|
'gles2/pixel_format.c',
|
||||||
'gles2/renderer.c',
|
'gles2/renderer.c',
|
||||||
'gles2/shaders.c',
|
'gles2/shaders.c',
|
||||||
'gles2/surface.c',
|
'gles2/texture.c',
|
||||||
'gles2/util.c',
|
'gles2/util.c',
|
||||||
)
|
)
|
||||||
|
|||||||
@ -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);
|
|
||||||
}
|
|
||||||
@ -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);
|
||||||
|
}
|
||||||
Loading…
Reference in new issue