jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=85b0992657bf79735507a42c005b5732bf2b7521
commit 85b0992657bf79735507a42c005b5732bf2b7521 Author: Jean-Philippe ANDRE <[email protected]> Date: Fri Nov 21 00:59:19 2014 +0900 Evas GL: Remove unnecessary check We already checked that re->func.get_pixels wasn't NULL. --- src/modules/evas/engines/gl_generic/evas_engine.c | 64 +++++++++++------------ 1 file changed, 30 insertions(+), 34 deletions(-) diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c index 989f68d..6371fe7 100644 --- a/src/modules/evas/engines/gl_generic/evas_engine.c +++ b/src/modules/evas/engines/gl_generic/evas_engine.c @@ -821,43 +821,39 @@ eng_image_draw(void *data, void *context, void *surface, void *image, int src_x, DBG("Rendering Directly to the window: %p", data); gl_context->dc = context; - - if (re->func.get_pixels) + if ((gl_context->master_clip.enabled) && + (gl_context->master_clip.w > 0) && + (gl_context->master_clip.h > 0)) { - if ((gl_context->master_clip.enabled) && - (gl_context->master_clip.w > 0) && - (gl_context->master_clip.h > 0)) - { - // Pass the preserve flag info the evas_gl - evgl_direct_partial_info_set(gl_context->preserve_bit); - } - - // Set necessary info for direct rendering - evgl_direct_info_set(gl_context->w, - gl_context->h, - gl_context->rot, - dst_x, dst_y, dst_w, dst_h, - gl_context->dc->clip.x, - gl_context->dc->clip.y, - gl_context->dc->clip.w, - gl_context->dc->clip.h); - - // Call pixel get function - re->func.get_pixels(re->func.get_pixels_data, re->func.obj); - - // Call end tile if it's being used - if ((gl_context->master_clip.enabled) && - (gl_context->master_clip.w > 0) && - (gl_context->master_clip.h > 0)) - { - evgl_direct_partial_render_end(); - evgl_direct_partial_info_clear(); - gl_context->preserve_bit = GL_COLOR_BUFFER_BIT0_QCOM; - } + // Pass the preserve flag info the evas_gl + evgl_direct_partial_info_set(gl_context->preserve_bit); + } - // Reset direct rendering info - evgl_direct_info_clear(); + // Set necessary info for direct rendering + evgl_direct_info_set(gl_context->w, + gl_context->h, + gl_context->rot, + dst_x, dst_y, dst_w, dst_h, + gl_context->dc->clip.x, + gl_context->dc->clip.y, + gl_context->dc->clip.w, + gl_context->dc->clip.h); + + // Call pixel get function + re->func.get_pixels(re->func.get_pixels_data, re->func.obj); + + // Call end tile if it's being used + if ((gl_context->master_clip.enabled) && + (gl_context->master_clip.w > 0) && + (gl_context->master_clip.h > 0)) + { + evgl_direct_partial_render_end(); + evgl_direct_partial_info_clear(); + gl_context->preserve_bit = GL_COLOR_BUFFER_BIT0_QCOM; } + + // Reset direct rendering info + evgl_direct_info_clear(); } else { --
