From c98a8eb70aea20e90076d06240c34b77d115b81f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Tue, 21 Apr 2015 19:45:19 +0900 Subject: [PATCH] Evas 3d: Fix clang warnings --- src/modules/evas/engines/gl_common/evas_gl_3d.c | 4 ++-- src/modules/evas/engines/gl_common/evas_gl_3d_renderer.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/evas/engines/gl_common/evas_gl_3d.c b/src/modules/evas/engines/gl_common/evas_gl_3d.c index ec9768cda3..7b82859cde 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_3d.c +++ b/src/modules/evas/engines/gl_common/evas_gl_3d.c @@ -1313,7 +1313,7 @@ void _shadowmap_render(E3D_Drawable *drawable, E3D_Renderer *renderer, Evas_3D_S Evas_3D_Node *n; Evas_3D_Shade_Mode shade_mode; Eina_Bool blend_enabled; - Evas_Color c = {1.0, 1.0, 1.0}; + Evas_Color c = {1.0, 1.0, 1.0, 1.0}; Evas_Mat4 matrix_vp; glEnable(GL_POLYGON_OFFSET_FILL); @@ -1442,7 +1442,7 @@ e3d_drawable_scene_render_to_texture(E3D_Drawable *drawable, E3D_Renderer *rende Eina_Iterator *itmn; void *ptrmn; Eina_List *repeat_node = NULL; - Evas_Color c = {0, 0, 0}, *unic_color = NULL; + Evas_Color c = {0, 0, 0, 0}, *unic_color = NULL; glBindFramebuffer(GL_FRAMEBUFFER, drawable->color_pick_fb_id); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, diff --git a/src/modules/evas/engines/gl_common/evas_gl_3d_renderer.c b/src/modules/evas/engines/gl_common/evas_gl_3d_renderer.c index a5b4e34013..5e4124147d 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_3d_renderer.c +++ b/src/modules/evas/engines/gl_common/evas_gl_3d_renderer.c @@ -82,6 +82,7 @@ _gl_blend_func_get(Evas_3D_Blend_Func blend_func) } } +#ifndef GL_GLES static inline GLenum _gl_comparison_func_get(Evas_3D_Comparison comparison_func) { @@ -107,6 +108,7 @@ _gl_comparison_func_get(Evas_3D_Comparison comparison_func) return GL_ALWAYS; } } +#endif static inline void _renderer_vertex_attrib_array_enable(E3D_Renderer *renderer, int index)