From: Seunghun Lee <shiin.lee@samsung.com>
Date: Wed, 20 May 2015 10:52:32 +0000 (+0900)
Subject: ecore-buffer: Use tbm API lower version.
X-Git-Tag: accepted/tizen/common/20150521.125548~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c9f878f94a3d0694f4082bc345007f5d8db1c49;p=platform%2Fupstream%2Fefl.git

ecore-buffer: Use tbm API lower version.

tbm backend used libtbm's latest version API set.
but, libtbm is not updated yet, so we should use lower version.

Change-Id: Iddcbafdd74bd2abcb7b68c33f55ba146b09ab7ea
---

diff --git a/src/modules/ecore_buffer/x11_dri2/ecore_buffer_x11_dri2.c b/src/modules/ecore_buffer/x11_dri2/ecore_buffer_x11_dri2.c
index e53a6ee..3c5e099 100644
--- a/src/modules/ecore_buffer/x11_dri2/ecore_buffer_x11_dri2.c
+++ b/src/modules/ecore_buffer/x11_dri2/ecore_buffer_x11_dri2.c
@@ -303,8 +303,6 @@ _ecore_buffer_x11_dri2_buffer_alloc(Ecore_Buffer_Module_Data bmdata, int width,
    int num_plane;
    int rw, rh, rcount;
    unsigned int attachment = DRI2BufferFrontLeft;
-   tbm_surface_info_s info;
-   int i;
 
    bpp = _buf_get_bpp(format);
    if (bpp != 32)
@@ -345,19 +343,8 @@ _ecore_buffer_x11_dri2_buffer_alloc(Ecore_Buffer_Module_Data bmdata, int width,
    if (!bo)
      goto on_error;
 
-   info.width = width;
-   info.height =  height;
-   info.format = format;
-   info.bpp = bpp;
-   info.size = width * bufs->pitch;
-   for ( i = 0 ; i < num_plane ; i++)
-   {
-      info.planes[i].size = width * bufs->pitch;
-      info.planes[i].stride = bufs->pitch;
-      info.planes[i].offset = 0;
-   }
-
-   buf->tbm.surface = tbm_surface_internal_create_with_bos(&info, &bo, 1);
+   buf->tbm.surface =
+      tbm_surface_internal_create_with_bos(buf->w, buf->h, format, &bo, 1);
    if (!buf->tbm.surface)
      goto on_error;
 
@@ -446,8 +433,6 @@ _ecore_buffer_x11_dri2_buffer_import(Ecore_Buffer_Module_Data bmdata EINA_UNUSED
    tbm_bo bo = NULL;
    int rcount;
    unsigned int attachment = DRI2BufferFrontLeft;
-   tbm_surface_info_s info;
-   int num_plane,i;
 
    if (type != EXPORT_TYPE_ID)
      return NULL;
@@ -482,20 +467,8 @@ _ecore_buffer_x11_dri2_buffer_import(Ecore_Buffer_Module_Data bmdata EINA_UNUSED
    if (!bo)
      goto on_error;
 
-   num_plane = _buf_get_num_planes(format);
-   info.width = w;
-   info.height = h;
-   info.format = format;
-   info.bpp = _buf_get_bpp(format);
-   info.size = w * bufs->pitch;
-   for ( i = 0 ; i < num_plane ; i++)
-   {
-      info.planes[i].size = w * bufs->pitch;
-      info.planes[i].stride = bufs->pitch;
-      info.planes[i].offset = 0;
-   }
-
-   buf->tbm.surface = tbm_surface_internal_create_with_bos(&info, &bo, 1);
+   buf->tbm.surface =
+      tbm_surface_internal_create_with_bos(buf->w, buf->h, format, &bo, 1);
    if (!buf->tbm.surface)
      goto on_error;
 
diff --git a/src/modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c b/src/modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c
index 3d97454..3118bda 100644
--- a/src/modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c
+++ b/src/modules/ecore_buffer/x11_dri3/ecore_buffer_x11_dri3.c
@@ -491,8 +491,6 @@ _ecore_buffer_x11_dri3_buffer_import(Ecore_Buffer_Module_Data bmdata, int w, int
    Ecore_Buffer_Module_X11_Dri3_Data *bm = bmdata;
    Ecore_Buffer_X11_Dri3_Data *buf;
    tbm_bo bo;
-   tbm_surface_info_s info;
-   int i, num_plane;
 
    if (!bm)
      return NULL;
@@ -521,20 +519,8 @@ _ecore_buffer_x11_dri3_buffer_import(Ecore_Buffer_Module_Data bmdata, int w, int
         return NULL;
      }
 
-   num_plane = _buf_get_num_planes(format);
-   info.width = w;
-   info.height = h;
-   info.format = format;
-   info.bpp = _buf_get_bpp(format);
-   info.size = w * h * info.bpp;
-   for ( i = 0 ; i < num_plane ; i++)
-   {
-      info.planes[i].size = w * h * info.bpp;
-      info.planes[i].stride = w * info.bpp;
-      info.planes[i].offset = 0;
-   }
-
-   buf->tbm_surface = tbm_surface_internal_create_with_bos(&info, &bo, 1);
+   buf->tbm_surface =
+      tbm_surface_internal_create_with_bos(buf->w, buf->h, format, &bo, 1);
    if (!buf->tbm_surface)
      {
         tbm_bo_unref(bo);