Stop misuing EVAS_NATIVE_SURFACE_VERSION macro
We should be stating the version the code supports, not the version that the EFL version we compiled against supports.
This commit is contained in:
parent
52c379f4b2
commit
4a40614f2f
|
@ -17,6 +17,8 @@
|
||||||
# include "e_comp_x.h"
|
# include "e_comp_x.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define E_SUPPORTED_NATIVE_SURFACE_VERSION 4
|
||||||
|
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
|
|
||||||
static Eina_Hash *pixmaps[2] = {NULL};
|
static Eina_Hash *pixmaps[2] = {NULL};
|
||||||
|
@ -704,7 +706,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(cp, EINA_FALSE);
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(ns, EINA_FALSE);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(ns, EINA_FALSE);
|
||||||
|
|
||||||
ns->version = EVAS_NATIVE_SURFACE_VERSION;
|
ns->version = E_SUPPORTED_NATIVE_SURFACE_VERSION;
|
||||||
switch (cp->type)
|
switch (cp->type)
|
||||||
{
|
{
|
||||||
case E_PIXMAP_TYPE_X:
|
case E_PIXMAP_TYPE_X:
|
||||||
|
@ -1061,7 +1063,7 @@ e_pixmap_dmabuf_test(struct linux_dmabuf_buffer *dmabuf)
|
||||||
{
|
{
|
||||||
Eina_Bool ret;
|
Eina_Bool ret;
|
||||||
ns.type = EVAS_NATIVE_SURFACE_WL_DMABUF;
|
ns.type = EVAS_NATIVE_SURFACE_WL_DMABUF;
|
||||||
ns.version = EVAS_NATIVE_SURFACE_VERSION;
|
ns.version = E_SUPPORTED_NATIVE_SURFACE_VERSION;
|
||||||
ns.data.wl_dmabuf.attr = &dmabuf->attributes;
|
ns.data.wl_dmabuf.attr = &dmabuf->attributes;
|
||||||
ns.data.wl_dmabuf.resource = NULL;
|
ns.data.wl_dmabuf.resource = NULL;
|
||||||
test = evas_object_image_add(e_comp->evas);
|
test = evas_object_image_add(e_comp->evas);
|
||||||
|
|
Loading…
Reference in New Issue