derekf pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=b37acd6e39a8cd730ff114a8cb5550acecccd138
commit b37acd6e39a8cd730ff114a8cb5550acecccd138 Author: Derek Foreman <[email protected]> Date: Tue Jun 6 16:42:01 2017 -0500 Revert "Stop misuing EVAS_NATIVE_SURFACE_VERSION macro" This reverts commit 4a40614f2f885ac33e806a807d0df84cf9e5300e. Apparently this macro is unlike similar macros in other libraries that have more sensible semantics. --- src/bin/e_pixmap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c index ca0f8381e..0d68b6951 100644 --- a/src/bin/e_pixmap.c +++ b/src/bin/e_pixmap.c @@ -17,8 +17,6 @@ # include "e_comp_x.h" #endif -#define E_SUPPORTED_NATIVE_SURFACE_VERSION 4 - #include <sys/mman.h> static Eina_Hash *pixmaps[2] = {NULL}; @@ -706,7 +704,7 @@ e_pixmap_native_surface_init(E_Pixmap *cp, Evas_Native_Surface *ns) EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(ns, EINA_FALSE); - ns->version = E_SUPPORTED_NATIVE_SURFACE_VERSION; + ns->version = EVAS_NATIVE_SURFACE_VERSION; switch (cp->type) { case E_PIXMAP_TYPE_X: @@ -1063,7 +1061,7 @@ e_pixmap_dmabuf_test(struct linux_dmabuf_buffer *dmabuf) { Eina_Bool ret; ns.type = EVAS_NATIVE_SURFACE_WL_DMABUF; - ns.version = E_SUPPORTED_NATIVE_SURFACE_VERSION; + ns.version = EVAS_NATIVE_SURFACE_VERSION; ns.data.wl_dmabuf.attr = &dmabuf->attributes; ns.data.wl_dmabuf.resource = NULL; test = evas_object_image_add(e_comp->evas); --
