enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

E Comp (wayland): Make E's composite module compile again against 

recent wayland changes.



SVN revision: 70017
This commit is contained in:
Christopher Michael 2012-04-11 17:23:19 +00:00
parent be22edaa3f
commit 1cf089ed8d
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/modules/comp/e_mod_comp_wl_buffer.c
View File

@ -43,26 +43,7 @@ e_mod_comp_wl_buffer_attach(struct wl_buffer *buffer, struct wl_surface *surface
/* glBindTexture(GL_TEXTURE_2D, ws->texture); */
if (wl_buffer_is_shm(buffer))
{
struct wl_list *attached;
ws->pitch = wl_shm_buffer_get_stride(buffer) / 4;
glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, ws->pitch, buffer->height,
0, GL_BGRA_EXT, GL_UNSIGNED_BYTE,
wl_shm_buffer_get_data(buffer));
switch (wl_shm_buffer_get_format(buffer))
{
case WL_SHM_FORMAT_ARGB8888:
ws->visual = WAYLAND_ARGB_VISUAL;
break;
case WL_SHM_FORMAT_XRGB8888:
ws->visual = WAYLAND_RGB_VISUAL;
break;
}
attached = buffer->user_data;
wl_list_remove(&ws->buffer_link);
wl_list_insert(attached, &ws->buffer_link);
}
ws->pitch = wl_shm_buffer_get_stride(buffer) / 4;
else
{
Wayland_Compositor *comp;