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

Use new format codes

Browse Source
This commit is contained in:
Kristian Høgsberg
2012-01-11 14:24:46 -05:00
parent 62444800e1
commit 8e81df4503
7 changed files with 23 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor.c
+4 -12
View File
@@ -417,13 +417,10 @@ weston_buffer_attach(struct wl_buffer *buffer, struct wl_surface *surface)
wl_shm_buffer_get_data(buffer));
switch (wl_shm_buffer_get_format(buffer)) {
case WL_SHM_FORMAT_ARGB32:
case WL_SHM_FORMAT_ARGB8888:
es->visual = WESTON_ARGB_VISUAL;
break;
case WL_SHM_FORMAT_PREMULTIPLIED_ARGB32:
es->visual = WESTON_PREMUL_ARGB_VISUAL;
break;
case WL_SHM_FORMAT_XRGB32:
case WL_SHM_FORMAT_XRGB8888:
es->visual = WESTON_RGB_VISUAL;
break;
}
@@ -441,8 +438,7 @@ weston_buffer_attach(struct wl_buffer *buffer, struct wl_surface *surface)
ec->image_target_texture_2d(GL_TEXTURE_2D, es->image);
/* FIXME: we need to get the visual from the wl_buffer */
es->visual = WESTON_PREMUL_ARGB_VISUAL;
es->visual = WESTON_ARGB_VISUAL;
es->pitch = es->width;
}
}
@@ -557,10 +553,6 @@ weston_surface_draw(struct weston_surface *es,
switch (es->visual) {
case WESTON_ARGB_VISUAL:
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_BLEND);
break;
case WESTON_PREMUL_ARGB_VISUAL:
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_BLEND);
break;
@@ -690,7 +682,7 @@ fade_output(struct weston_output *output,
surface.alpha = compositor->current_alpha;
if (tint <= 1.0)
surface.visual = WESTON_PREMUL_ARGB_VISUAL;
surface.visual = WESTON_ARGB_VISUAL;
else
surface.visual = WESTON_RGB_VISUAL;
src/compositor.h
-1
View File
@@ -114,7 +114,6 @@ struct weston_input_device {
enum weston_visual {
WESTON_NONE_VISUAL,
WESTON_ARGB_VISUAL,
WESTON_PREMUL_ARGB_VISUAL,
WESTON_RGB_VISUAL
};