jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cb11a67595815dc09fa615b3c81ee67e45b08e57
commit cb11a67595815dc09fa615b3c81ee67e45b08e57
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Thu Jun 11 08:39:43 2015 +0900
Evas GL: Fix coverity CID 1304559, 1304560
Summary:
<CID 1304559: Logically dead code>
The dead code is only valid for GLES backend, so move if statement
to be used for GLES backend only.
<CID 1304560: Bad bit shift operation>
When calculating depth bit, bit shifting could be done with negative values.
@fix
Test Plan: Local tests
Reviewers: jpeg
Reviewed By: jpeg
Subscribers: wonsik, cedric
Differential Revision: https://phab.enlightenment.org/D2654
---
src/modules/evas/engines/gl_common/evas_gl_core.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.c
b/src/modules/evas/engines/gl_common/evas_gl_core.c
index f374301..5c1ecf5 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.c
@@ -887,11 +887,6 @@ _context_ext_check(EVGL_Context *ctx)
egl_image_supported = 1;
if (EXTENSION_SUPPORT_EGL(EGL_KHR_gl_texture_2D_image))
texture_image_supported = 1;
-#else
- fbo_supported = 1;
- egl_image_supported = 0;
- texture_image_supported = 0;
-#endif
if (egl_image_supported)
{
@@ -900,6 +895,11 @@ _context_ext_check(EVGL_Context *ctx)
else
ctx->pixmap_image_supported = 1;
}
+#else
+ fbo_supported = 1;
+ egl_image_supported = 0;
+ texture_image_supported = 0;
+#endif
ctx->extension_checked = 1;
@@ -1355,7 +1355,8 @@ try_again:
(native_win_stencil != stencil_bit) ||
(native_win_msaa != msaa_samples)))
{
- depth_bit = (1 << ((native_win_depth / 8) - 1));
+ if (native_win_depth < 8) depth_bit = 0;
+ else depth_bit = (1 << ((native_win_depth / 8) - 1));
depth_size = native_win_depth;
stencil_bit = native_win_stencil;
msaa_samples = native_win_msaa;
--
