From 7eb0af45d6050aa5f19070a4141055ac0fa759b8 Mon Sep 17 00:00:00 2001
From: Derek Foreman <derekf@osg.samsung.com>
Date: Wed, 29 Nov 2017 15:50:12 -0600
Subject: [PATCH] wayland_shm: Pass alpha to surface_create

Stop extracting it from other structures, pass it directly.
---
 src/modules/evas/engines/wayland_shm/evas_dmabuf.c | 4 ++--
 src/modules/evas/engines/wayland_shm/evas_engine.h | 2 +-
 src/modules/evas/engines/wayland_shm/evas_outbuf.c | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
index fb9231a40d..0ac182b58b 100644
--- a/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_dmabuf.c
@@ -169,7 +169,7 @@ _evas_dmabuf_surface_destroy(Surface *s)
 }
 
 Surface *
-_evas_surface_create(Ecore_Wl2_Window *win, Evas_Engine_Info_Wayland *info, Outbuf *ob)
+_evas_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha, Evas_Engine_Info_Wayland *info, Outbuf *ob)
 {
    Surface *out = NULL;
    Dmabuf_Surface *surf = NULL;
@@ -192,7 +192,7 @@ _evas_surface_create(Ecore_Wl2_Window *win, Evas_Engine_Info_Wayland *info, Outb
    out->dmabuf = surf;
 
    surf->surface = out;
-   surf->alpha = info->info.destination_alpha;
+   surf->alpha = alpha;
    surf->w = 0;
    surf->h = 0;
 
diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.h b/src/modules/evas/engines/wayland_shm/evas_engine.h
index f3402ff88f..815425914a 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.h
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.h
@@ -125,7 +125,7 @@ struct _Outbuf
    Eina_Bool dirty : 1;
 };
 
-Surface *_evas_surface_create(Ecore_Wl2_Window *win, Evas_Engine_Info_Wayland *info, Outbuf *ob);
+Surface *_evas_surface_create(Ecore_Wl2_Window *win, Eina_Bool alpha, Evas_Engine_Info_Wayland *info, Outbuf *ob);
 
 Outbuf *_evas_outbuf_setup(int w, int h, Evas_Engine_Info_Wayland *info);
 void _evas_outbuf_free(Outbuf *ob);
diff --git a/src/modules/evas/engines/wayland_shm/evas_outbuf.c b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
index 07c4e8d91e..cfb3384dda 100644
--- a/src/modules/evas/engines/wayland_shm/evas_outbuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_outbuf.c
@@ -28,7 +28,8 @@ _evas_outbuf_setup(int w, int h, Evas_Engine_Info_Wayland *info)
    ob->priv.destination_alpha = info->info.destination_alpha;
    ob->ewd = ecore_wl2_window_display_get(info->info.wl2_win);
 
-   ob->surface = _evas_surface_create(info->info.wl2_win, info, ob);
+   ob->surface = _evas_surface_create(info->info.wl2_win,
+                                      ob->priv.destination_alpha, info, ob);
    if (!ob->surface) goto surf_err;
 
    eina_array_step_set(&ob->priv.onebuf_regions, sizeof(Eina_Array), 8);