styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Stop misuing EVAS_NATIVE_SURFACE_VERSION macro" 

This reverts commit 4a40614f2f.

Apparently this macro is unlike similar macros in other libraries
that have more sensible semantics.
This commit is contained in:
Derek Foreman 2017-06-06 16:42:01 -05:00
parent 4a40614f2f
commit b37acd6e39
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/e_pixmap.c
View File

@ -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);