For Evas_GL surface config, prefer to use GL_DEPTH24_STENCIL8

format internally when it's  available instead of using them
separately.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@70686 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/modules/engines/gl_x11/evas_engine.c b/src/modules/engines/gl_x11/evas_engine.c
index 55ec1e6..6445a77 100644 (file)
--- a/src/modules/engines/gl_x11/evas_engine.c
+++ b/src/modules/engines/gl_x11/evas_engine.c
@@ -3004,7 +3004,7 @@ _set_internal_config(Render_Engine *re, Render_Engine_GL_Surface *sfc, Evas_GL_C
          return 0;
      }
 
-   switch(cfg->depth_bits)
+   switch((int)cfg->depth_bits)
      {
       case EVAS_GL_DEPTH_NONE:
          break;
@@ -3042,7 +3042,7 @@ _set_internal_config(Render_Engine *re, Render_Engine_GL_Surface *sfc, Evas_GL_C
          return 0;
      }
 
-   switch(cfg->stencil_bits)
+   switch((int)cfg->stencil_bits)
      {
       case EVAS_GL_STENCIL_NONE:
          break;
@@ -3068,17 +3068,17 @@ _set_internal_config(Render_Engine *re, Render_Engine_GL_Surface *sfc, Evas_GL_C
               break;
            }
       case EVAS_GL_STENCIL_BIT_8:
-         if (re->gl_cap.stencil_8)
+         if ((sfc->rb_depth_fmt == re->gl_cap.depth_24) && (re->gl_cap.depth_24_stencil_8))
            {
+              sfc->rb_depth_stencil_fmt = re->gl_cap.depth_24_stencil_8;
               sfc->rb_stencil_fmt = re->gl_cap.stencil_8;
-              cfg->stencil_bits   = EVAS_GL_STENCIL_BIT_8;
+              cfg->stencil_bits = EVAS_GL_STENCIL_BIT_8;
               break;
            }
-         else if (re->gl_cap.depth_24_stencil_8)
+         else if (re->gl_cap.stencil_8)
            {
-              sfc->rb_depth_stencil_fmt = re->gl_cap.depth_24_stencil_8;
-              cfg->depth_bits   = EVAS_GL_DEPTH_BIT_24;
-              cfg->stencil_bits = EVAS_GL_STENCIL_BIT_8;
+              sfc->rb_stencil_fmt = re->gl_cap.stencil_8;
+              cfg->stencil_bits   = EVAS_GL_STENCIL_BIT_8;
               break;
            }
       case EVAS_GL_STENCIL_BIT_16: