derekf pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=892bfe7c98eedcc8f40e952d27ba3f65db6f0fed

commit 892bfe7c98eedcc8f40e952d27ba3f65db6f0fed
Author: Derek Foreman <der...@osg.samsung.com>
Date:   Thu Jun 29 13:51:07 2017 -0500

    dmabuf: Make a define for the version of the dmabuf attribute struct
    
    I should've done this in the first place, and the version checks are
    starting to spread out a bit.
---
 src/modules/evas/engines/gl_drm/evas_engine.c                  | 2 +-
 src/modules/evas/engines/software_generic/evas_native_common.h | 2 ++
 src/modules/evas/engines/software_generic/evas_native_dmabuf.c | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c 
b/src/modules/evas/engines/gl_drm/evas_engine.c
index b1083a18aa..fe69ef0dcc 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
@@ -1320,7 +1320,7 @@ eng_image_native_set(void *engine, void *image, void 
*native)
              struct dmabuf_attributes *a;
 
              a = ns->data.wl_dmabuf.attr;
-             if (a->version != 1)
+             if (a->version != EVAS_DMABUF_ATTRIBUTE_VERSION)
                {
                   glsym_evas_gl_common_image_free(img);
                   return NULL;
diff --git a/src/modules/evas/engines/software_generic/evas_native_common.h 
b/src/modules/evas/engines/software_generic/evas_native_common.h
index a3b721dc39..de3533550d 100644
--- a/src/modules/evas/engines/software_generic/evas_native_common.h
+++ b/src/modules/evas/engines/software_generic/evas_native_common.h
@@ -29,6 +29,8 @@
 
 //#include <Evas_Common.h>
 
+#define EVAS_DMABUF_ATTRIBUTE_VERSION 1
+
 struct dmabuf_attributes
 {
   /* This must exactly match the struct in Enlightenment.
diff --git a/src/modules/evas/engines/software_generic/evas_native_dmabuf.c 
b/src/modules/evas/engines/software_generic/evas_native_dmabuf.c
index f01a6c4751..bd88850ab4 100644
--- a/src/modules/evas/engines/software_generic/evas_native_dmabuf.c
+++ b/src/modules/evas/engines/software_generic/evas_native_dmabuf.c
@@ -107,7 +107,7 @@ _evas_native_dmabuf_surface_image_set(void *image, void 
*native)
         if (!n) return NULL;
 
         a = ns->data.wl_dmabuf.attr;
-        if (a->version != 1)
+        if (a->version != EVAS_DMABUF_ATTRIBUTE_VERSION)
           {
              free(n);
              return NULL;

-- 


Reply via email to