mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move compositor-wayland border drawing into gles2-renderer.

Browse Source
dev
John Kåre Alsaker 12 years ago committed by Kristian Høgsberg
parent 1b7ad160a3
commit 4415450ef1
3 changed files with 180 additions and 152 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 160
      src/compositor-wayland.c
  2. 3
      src/compositor.h
  3. 169
      src/gles2-renderer.c

160
src/compositor-wayland.c
Unescape View File

@ -36,8 +36,6 @@
#include <wayland-client.h>
#include <wayland-egl.h>
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#include <EGL/egl.h>
#include <EGL/eglext.h>
@ -63,8 +61,6 @@ struct wayland_compositor {
struct {
int32_t top, bottom, left, right;
GLuint texture;
int32_t width, height;
} border;
struct wl_list input_list;
@ -72,7 +68,6 @@ struct wayland_compositor {
struct wayland_output {
struct weston_output base;
struct wl_listener frame_listener;
struct {
struct wl_surface *surface;
struct wl_shell_surface *shell_surface;
@ -95,126 +90,11 @@ struct wayland_input {
struct wayland_output *output;
};
static int
texture_border(struct wayland_output *output)
{
struct wayland_compositor *c =
(struct wayland_compositor *) output->base.compositor;
GLfloat *d;
unsigned int *p;
int i, j, k, n;
GLfloat x[4], y[4], u[4], v[4];
x[0] = -c->border.left;
x[1] = 0;
x[2] = output->base.current->width;
x[3] = output->base.current->width + c->border.right;
y[0] = -c->border.top;
y[1] = 0;
y[2] = output->base.current->height;
y[3] = output->base.current->height + c->border.bottom;
u[0] = 0.0;
u[1] = (GLfloat) c->border.left / c->border.width;
u[2] = (GLfloat) (c->border.width - c->border.right) / c->border.width;
u[3] = 1.0;
v[0] = 0.0;
v[1] = (GLfloat) c->border.top / c->border.height;
v[2] = (GLfloat) (c->border.height - c->border.bottom) / c->border.height;
v[3] = 1.0;
n = 8;
d = wl_array_add(&c->base.vertices, n * 16 * sizeof *d);
p = wl_array_add(&c->base.indices, n * 6 * sizeof *p);
k = 0;
for (i = 0; i < 3; i++)
for (j = 0; j < 3; j++) {
if (i == 1 && j == 1)
continue;
d[ 0] = x[i];
d[ 1] = y[j];
d[ 2] = u[i];
d[ 3] = v[j];
d[ 4] = x[i];
d[ 5] = y[j + 1];
d[ 6] = u[i];
d[ 7] = v[j + 1];
d[ 8] = x[i + 1];
d[ 9] = y[j];
d[10] = u[i + 1];
d[11] = v[j];
d[12] = x[i + 1];
d[13] = y[j + 1];
d[14] = u[i + 1];
d[15] = v[j + 1];
p[0] = k + 0;
p[1] = k + 1;
p[2] = k + 2;
p[3] = k + 2;
p[4] = k + 1;
p[5] = k + 3;
d += 16;
p += 6;
k += 4;
}
return k / 4;
}
static void
draw_border(struct wayland_output *output)
{
struct wayland_compositor *c =
(struct wayland_compositor *) output->base.compositor;
struct weston_shader *shader = &c->base.texture_shader_rgba;
GLfloat *v;
int n;
glDisable(GL_BLEND);
glUseProgram(shader->program);
c->base.current_shader = shader;
glUniformMatrix4fv(shader->proj_uniform,
1, GL_FALSE, output->base.matrix.d);
glUniform1i(shader->tex_uniforms[0], 0);
glUniform1f(shader->alpha_uniform, 1);
n = texture_border(output);
glBindTexture(GL_TEXTURE_2D, c->border.texture);
v = c->base.vertices.data;
glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof *v, &v[0]);
glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4 * sizeof *v, &v[2]);
glEnableVertexAttribArray(0);
glEnableVertexAttribArray(1);
glDrawElements(GL_TRIANGLES, n * 6,
GL_UNSIGNED_INT, c->base.indices.data);
glDisableVertexAttribArray(1);
glDisableVertexAttribArray(0);
c->base.vertices.size = 0;
c->base.indices.size = 0;
}
static void
create_border(struct wayland_compositor *c)
{
pixman_image_t *image;
int32_t edges[4];
image = load_image(DATADIR "/weston/border.png");
if (!image) {
@ -222,21 +102,14 @@ create_border(struct wayland_compositor *c)
return;
}
c->border.width = pixman_image_get_width(image);
c->border.height = pixman_image_get_height(image);
glGenTextures(1, &c->border.texture);
glBindTexture(GL_TEXTURE_2D, c->border.texture);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
edges[0] = c->border.left;
edges[1] = c->border.right;
edges[2] = c->border.top;
edges[3] = c->border.bottom;
glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT,
c->border.width,
c->border.height,
0, GL_BGRA_EXT, GL_UNSIGNED_BYTE,
pixman_image_get_data(image));
gles2_renderer_set_border(&c->base, pixman_image_get_width(image),
pixman_image_get_height(image),
pixman_image_get_data(image), edges);
pixman_image_unref(image);
}
@ -254,16 +127,6 @@ static const struct wl_callback_listener frame_listener = {
frame_done
};
static void
wayland_output_frame_notify(struct wl_listener *listener, void *data)
{
struct wayland_output *output =
container_of(listener,
struct wayland_output, frame_listener);
draw_border(output);
}
static void
wayland_output_repaint(struct weston_output *output_base,
pixman_region32_t *damage)
@ -316,10 +179,6 @@ wayland_compositor_create_output(struct wayland_compositor *c,
weston_output_init(&output->base, &c->base, 0, 0, width, height,
WL_OUTPUT_TRANSFORM_NORMAL);
output->base.border.top = c->border.top;
output->base.border.bottom = c->border.bottom;
output->base.border.left = c->border.left;
output->base.border.right = c->border.right;
output->base.make = "waywayland";
output->base.model = "none";
@ -359,9 +218,6 @@ wayland_compositor_create_output(struct wayland_compositor *c,
wl_list_insert(c->base.output_list.prev, &output->base.link);
output->frame_listener.notify = wayland_output_frame_notify;
wl_signal_add(&output->base.frame_signal, &output->frame_listener);
return 0;
cleanup_window:

3
src/compositor.h
Unescape View File

@ -851,6 +851,9 @@ gles2_renderer_output_destroy(struct weston_output *output);
EGLSurface
gles2_renderer_output_surface(struct weston_output *output);
void
gles2_renderer_set_border(struct weston_compositor *ec, int32_t width, int32_t height, void *data,
int32_t *edges);
void
gles2_renderer_destroy(struct weston_compositor *ec);
int

169
src/gles2-renderer.c
Unescape View File

@ -42,6 +42,12 @@ struct gles2_renderer {
EGLDisplay egl_display;
EGLContext egl_context;
EGLConfig egl_config;
struct {
int32_t top, bottom, left, right;
GLuint texture;
int32_t width, height;
} border;
};
static inline struct gles2_output_state *
@ -722,6 +728,123 @@ repaint_surfaces(struct weston_output *output, pixman_region32_t *damage)
draw_surface(surface, output, damage);
}
static int
texture_border(struct weston_output *output)
{
struct weston_compositor *ec = output->compositor;
struct gles2_renderer *gr = get_renderer(ec);
GLfloat *d;
unsigned int *p;
int i, j, k, n;
GLfloat x[4], y[4], u[4], v[4];
x[0] = -gr->border.left;
x[1] = 0;
x[2] = output->current->width;
x[3] = output->current->width + gr->border.right;
y[0] = -gr->border.top;
y[1] = 0;
y[2] = output->current->height;
y[3] = output->current->height + gr->border.bottom;
u[0] = 0.0;
u[1] = (GLfloat) gr->border.left / gr->border.width;
u[2] = (GLfloat) (gr->border.width - gr->border.right) / gr->border.width;
u[3] = 1.0;
v[0] = 0.0;
v[1] = (GLfloat) gr->border.top / gr->border.height;
v[2] = (GLfloat) (gr->border.height - gr->border.bottom) / gr->border.height;
v[3] = 1.0;
n = 8;
d = wl_array_add(&ec->vertices, n * 16 * sizeof *d);
p = wl_array_add(&ec->indices, n * 6 * sizeof *p);
k = 0;
for (i = 0; i < 3; i++)
for (j = 0; j < 3; j++) {
if (i == 1 && j == 1)
continue;
d[ 0] = x[i];
d[ 1] = y[j];
d[ 2] = u[i];
d[ 3] = v[j];
d[ 4] = x[i];
d[ 5] = y[j + 1];
d[ 6] = u[i];
d[ 7] = v[j + 1];
d[ 8] = x[i + 1];
d[ 9] = y[j];
d[10] = u[i + 1];
d[11] = v[j];
d[12] = x[i + 1];
d[13] = y[j + 1];
d[14] = u[i + 1];
d[15] = v[j + 1];
p[0] = k + 0;
p[1] = k + 1;
p[2] = k + 2;
p[3] = k + 2;
p[4] = k + 1;
p[5] = k + 3;
d += 16;
p += 6;
k += 4;
}
return k / 4;
}
static void
draw_border(struct weston_output *output)
{
struct weston_compositor *ec = output->compositor;
struct gles2_renderer *gr = get_renderer(ec);
struct weston_shader *shader = &ec->texture_shader_rgba;
GLfloat *v;
int n;
glDisable(GL_BLEND);
glUseProgram(shader->program);
ec->current_shader = shader;
glUniformMatrix4fv(shader->proj_uniform,
1, GL_FALSE, output->matrix.d);
glUniform1i(shader->tex_uniforms[0], 0);
glUniform1f(shader->alpha_uniform, 1);
n = texture_border(output);
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, gr->border.texture);
v = ec->vertices.data;
glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof *v, &v[0]);
glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4 * sizeof *v, &v[2]);
glEnableVertexAttribArray(0);
glEnableVertexAttribArray(1);
glDrawElements(GL_TRIANGLES, n * 6,
GL_UNSIGNED_INT, ec->indices.data);
glDisableVertexAttribArray(1);
glDisableVertexAttribArray(0);
ec->vertices.size = 0;
ec->indices.size = 0;
}
static void
gles2_renderer_repaint_output(struct weston_output *output,
pixman_region32_t *output_damage)
@ -775,6 +898,9 @@ gles2_renderer_repaint_output(struct weston_output *output,
repaint_surfaces(output, output_damage);
if (gr->border.texture)
draw_border(output);
wl_signal_emit(&output->frame_signal, output);
ret = eglSwapBuffers(gr->egl_display, go->egl_surface);
@ -1237,6 +1363,47 @@ log_egl_config_info(EGLDisplay egldpy, EGLConfig eglconfig)
weston_log_continue(" unknown\n");
}
static void
output_apply_border(struct weston_output *output, struct gles2_renderer *gr)
{
output->border.top = gr->border.top;
output->border.bottom = gr->border.bottom;
output->border.left = gr->border.left;
output->border.right = gr->border.right;
}
WL_EXPORT void
gles2_renderer_set_border(struct weston_compositor *ec, int32_t width, int32_t height, void *data,
int32_t *edges)
{
struct gles2_renderer *gr = get_renderer(ec);
struct weston_output *output;
gr->border.left = edges[0];
gr->border.right = edges[1];
gr->border.top = edges[2];
gr->border.bottom = edges[3];
gr->border.width = width;
gr->border.height = height;
glGenTextures(1, &gr->border.texture);
glBindTexture(GL_TEXTURE_2D, gr->border.texture);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT,
width,
height,
0, GL_BGRA_EXT, GL_UNSIGNED_BYTE,
data);
wl_list_for_each(output, &ec->output_list, link)
output_apply_border(output, gr);
}
static int
gles2_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface);
@ -1270,6 +1437,8 @@ gles2_renderer_output_create(struct weston_output *output,
output->renderer_state = go;
output_apply_border(output, gr);
return 0;
}

Write Preview
Loading…
Cancel
Save