add avaiable_hw_accel to E_Comp_Wl_Data to inform available hw devices 24/41124/2 accepted/tizen_3.0.2015.q2_common tizen_3.0.2015.q2_common accepted/tizen/3.0.2015.q2/common/20150615.160138 accepted/tizen/common/20150612.071633 accepted/tizen/mobile/20150613.021411 accepted/tizen/tv/20150613.021427 accepted/tizen/wearable/20150613.021441 submit/tizen/20150612.014854 submit/tizen_3.0.2015.q2_common/20150615.075539
authorBoram Park <boram1288.park@samsung.com>
Thu, 11 Jun 2015 07:56:09 +0000 (16:56 +0900)
committerGwanglim Lee <gl77.lee@samsung.com>
Thu, 11 Jun 2015 08:17:52 +0000 (01:17 -0700)
Change-Id: I8bc53681e9eb865ae170f93a973542a402a28635

src/bin/e_comp_wl.h
src/bin/e_pixmap.c
src/modules/wl_screenshot/e_screenshooter_server.c

index 83514fc..865b717 100644 (file)
@@ -242,6 +242,12 @@ struct _E_Comp_Wl_Data
         Evas_GL_Context *ctx;
      } gl;
 
+   struct
+     {
+        Eina_Bool underlay;
+        Eina_Bool scaler;
+     } available_hw_accel;
+
    Eina_List *outputs;
 
    Ecore_Fd_Handler *fd_hdlr;
index a9268ac..4e675e1 100644 (file)
@@ -625,6 +625,8 @@ e_pixmap_resource_set(E_Pixmap *cp, void *resource)
         else if (buffer->type == E_COMP_WL_BUFFER_TYPE_DRM)
           {
              E_Drm_Buffer *drm_buffer = e_drm_buffer_get(buffer->resource);
+             E_Comp_Wl_Data *cdata = e_comp->wl_comp_data;
+
              buffer->shm_buffer = NULL;
              cp->w = buffer->w;
              cp->h = buffer->h;
@@ -639,7 +641,7 @@ e_pixmap_resource_set(E_Pixmap *cp, void *resource)
                }
              cp->data = NULL;
 
-             if (e_config->use_hw_underlay)
+             if (cdata->available_hw_accel.underlay)
                e_comp_object_mask_set(cp->client->frame, EINA_TRUE);
           }
         else
index 03a0c81..e29942a 100644 (file)
@@ -84,6 +84,7 @@ e_screenshooter_server_init(E_Module *m)
 
    if (!e_comp) return EINA_FALSE;
    if (!(cdata = e_comp->wl_comp_data)) return EINA_FALSE;
+   if (cdata->available_hw_accel.scaler) return EINA_FALSE;
    if (!cdata->wl.disp) return EINA_FALSE;
 
    /* try to add screenshooter to wayland globals */