Evas GL: Fix direct rendering with client-side rotation

There was a problem when checking whether the current surface
is compatible with direct rendering. In case of client-side
rotation (it's a flag set on the surface by the app), a surface
can be directly rendered even if the rotation is not 0.

But, before this patch, it was assumed that the surface was
current. Which doesn't make sense because make_current is
called by the pixel callback, from the application, and this
happens *after* we check for direct rendering.

As a consequence, it was not possible to mix directly rendered
surfaces with FBO-based ones, and use client-side rotation.

This patch should solve that issue.

1 files changed, 11 insertions, 9 deletions

diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index fdd716147e..ce03b7158c 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -2759,25 +2759,27 @@ evas_process_dirty_pixels(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj,
                        (ns->data.opengl.texture_id) &&
                        (!ns->data.opengl.framebuffer_id) )
                     {
+                       Eina_Bool direct_renderable = EINA_FALSE;
+
                        // Check if we can do direct rendering...
                        if (ENFN->gl_direct_override_get)
                          ENFN->gl_direct_override_get(output, &direct_override, &direct_force_off);
-                       if ( (((obj->cur->geometry.w == o->cur->image.w) &&
+                       if (ENFN->gl_surface_direct_renderable_get)
+                         direct_renderable = ENFN->gl_surface_direct_renderable_get(output, ns);
+
+                       if ( ((direct_override) ||
+                             ((direct_renderable) &&
+                              (obj->cur->geometry.w == o->cur->image.w) &&
                               (obj->cur->geometry.h == o->cur->image.h) &&
                               (obj->cur->color.r == 255) &&
                               (obj->cur->color.g == 255) &&
                               (obj->cur->color.b == 255) &&
                               (obj->cur->color.a == 255) &&
-                              (!obj->map->cur.map)) ||
-                             (direct_override)) &&
-                            (!direct_force_off) )
+                              (!obj->map->cur.map))
+                             ) && (!direct_force_off) )
                          {
-
                             if (ENFN->gl_get_pixels_set)
-                              {
-                                 ENFN->gl_get_pixels_set(output, o->pixels->func.get_pixels, o->pixels->func.get_pixels_data, eo_obj);
-                              }
-
+                              ENFN->gl_get_pixels_set(output, o->pixels->func.get_pixels, o->pixels->func.get_pixels_data, eo_obj);
                             o->direct_render = EINA_TRUE;
                          }
                        else