From: Enlightenment S. <no-...@en...> - 2012-04-11 17:23:27
|
Log: E Comp (wayland): Make E's composite module compile again against recent wayland changes. Author: devilhorns Date: 2012-04-11 10:23:19 -0700 (Wed, 11 Apr 2012) New Revision: 70017 Trac: http://trac.enlightenment.org/e/changeset/70017 Modified: trunk/e/src/modules/comp/e_mod_comp_wl_buffer.c Modified: trunk/e/src/modules/comp/e_mod_comp_wl_buffer.c =================================================================== --- trunk/e/src/modules/comp/e_mod_comp_wl_buffer.c 2012-04-11 15:08:09 UTC (rev 70016) +++ trunk/e/src/modules/comp/e_mod_comp_wl_buffer.c 2012-04-11 17:23:19 UTC (rev 70017) @@ -43,26 +43,7 @@ /* 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; |