mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compositor: Disable blending for WL_SHM_FORMAT_XRGB8888 surface 

Will it blend?  No.
This commit is contained in:
Kristian Høgsberg 2012-05-17 11:11:15 -04:00
parent c0bc844094
commit d6ad122d9a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/compositor.c
View File

@ -228,6 +228,7 @@ weston_surface_create(struct weston_compositor *compositor)
surface->alpha = 255;
surface->brightness = 255;
surface->saturation = 255;
surface->blend = 1;
surface->opaque_rect[0] = 0.0;
surface->opaque_rect[1] = 0.0;
surface->opaque_rect[2] = 0.0;
@ -761,6 +762,10 @@ weston_surface_attach(struct wl_surface *surface, struct wl_buffer *buffer)
glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT,
es->pitch, es->buffer->height, 0,
GL_BGRA_EXT, GL_UNSIGNED_BYTE, NULL);
if (wl_shm_buffer_get_format(buffer) == WL_SHM_FORMAT_XRGB8888)
es->blend = 0;
else
es->blend = 1;
} else {
if (es->image != EGL_NO_IMAGE_KHR)
ec->destroy_image(ec->display, es->image);
@ -849,7 +854,10 @@ weston_surface_draw(struct weston_surface *es, struct weston_output *output,
goto out;
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_BLEND);
if (es->blend)
glEnable(GL_BLEND);
else
glDisable(GL_BLEND);
if (ec->current_shader != es->shader) {
glUseProgram(es->shader->program);

1
src/compositor.h
View File

@ -331,6 +331,7 @@ struct weston_surface {
uint32_t alpha;
uint32_t brightness;
uint32_t saturation;
int blend;
/* Surface geometry state, mutable.
* If you change anything, set dirty = 1.