Merge "change {without x} to {with x}" into tizen

diff --git a/packaging/evas.spec b/packaging/evas.spec
index 8475afd..91f477d 100644 (file)
--- a/packaging/evas.spec
+++ b/packaging/evas.spec
@@ -4,10 +4,10 @@
 Name:           evas
 Version:        1.7.8
 Release:        1
-License:        BSD 2-clause
+License:        BSD-2-Clause
 Summary:        Multi-platform Canvas Library
 Url:            http://www.enlightenment.org/
-Group:          Graphics/EFL
+Group:          Graphics & UI Framework/Libraries
 Source0:        evas-%{version}.tar.bz2
 Source1001:    evas.manifest
 BuildRequires:  doxygen
@@ -45,7 +45,7 @@ images, alpha-blend objects much and more.
 
 %package devel
 Summary:        Development components for the evas package
-Group:          Development/Libraries
+Group:          Graphics & UI Framework/Development
 Requires:       %{name} = %{version}
 
 %description devel
@@ -53,7 +53,7 @@ Development files for evas
 
 %package examples
 Summary:        Examples for the evas package
-Group:          Development/Libraries
+Group:          Graphics & UI Framework/Development
 Requires:       %{name}-devel = %{version}
 
 %description examples

diff --git a/src/modules/engines/wayland_egl/evas_engine.c b/src/modules/engines/wayland_egl/evas_engine.c
index c32223e..3bed4ed 100644 (file)
--- a/src/modules/engines/wayland_egl/evas_engine.c
+++ b/src/modules/engines/wayland_egl/evas_engine.c
@@ -2109,7 +2109,7 @@ eng_canvas_alpha_get(void *data, void *info __UNUSED__)
 }
 
 static int
-_set_internal_config(Render_Engine_GL_Surface *sfc, Evas_GL_Config *cfg)
+_set_internal_config(Render_Engine *re, Render_Engine_GL_Surface *sfc, Evas_GL_Config *cfg)
 {
    // Also initialize pixel format here as well...
    switch(cfg->color_format)
@@ -2151,7 +2151,17 @@ _set_internal_config(Render_Engine_GL_Surface *sfc, Evas_GL_Config *cfg)
       case EVAS_GL_STENCIL_BIT_2:
       case EVAS_GL_STENCIL_BIT_4:
       case EVAS_GL_STENCIL_BIT_8:
-         sfc->rb_stencil_fmt = GL_STENCIL_INDEX8;
+         if ((cfg->depth_bits != EVAS_GL_DEPTH_NONE) &&
+             re->gl_cap.depth_24_stencil_8[0])
+           {
+               sfc->rb_depth_stencil_fmt = re->gl_cap.depth_24_stencil_8[0];
+               sfc->rb_depth_fmt = re->gl_cap.depth_24_stencil_8[0];
+               sfc->rb_stencil_fmt = re->gl_cap.depth_24_stencil_8[0];
+           }
+         else
+           {
+               sfc->rb_stencil_fmt = GL_STENCIL_INDEX8;
+           }
          break;
       case EVAS_GL_STENCIL_BIT_16:
       default:
@@ -2159,8 +2169,6 @@ _set_internal_config(Render_Engine_GL_Surface *sfc, Evas_GL_Config *cfg)
          return 0;
      }
 
-   // Do Packed Depth24_Stencil8 Later...
-
    return 1;
 }
 
@@ -2595,7 +2603,7 @@ eng_gl_surface_create(void *data, void *config, int w, int h)
      }
 
    // Set the internal format based on the config
-   if (!_set_internal_config(sfc, cfg))
+   if (!_set_internal_config(re, sfc, cfg))
      {
         ERR("Unsupported Format!");
         goto finish;