[Webkit-unassigned] [Bug 147625] [GTK] Accelerated 2D Canvas enabled when cairo-gl is not available

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=147625

Mario Sanchez Prada <mario at webkit.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
 Attachment #258170|                            |review?
              Flags|                            |

--- Comment #1 from Mario Sanchez Prada <mario at webkit.org> ---
Created attachment 258170
  --> https://bugs.webkit.org/attachment.cgi?id=258170&action=review
Patch proposal

This patch works makes sure at ACCELERATED_2D_CANVAS cairo-gl is available only when cairo-gl is available in the system, setting it to OFF otherwise.

Excerpt of the relevant cmake output when cairo-gl IS available:

    [...]
    -- Found OPENGLES2: /usr/include  
    -- checking for module 'cairo-gl'
    --   found cairo-gl, version 1.14.0
    -- checking for module 'cairo-glx'
    --   found cairo-glx, version 1.14.0
    -- checking for module 'cairo-egl'
    --   found cairo-egl, version 1.14.0
    -- Found CairoGL: /usr/include/cairo;/usr/include/glib-2.0;/usr/lib/i386-linux-gnu/glib-2.0/include;/usr/include/pixman-1;/usr/include/freetype2;/usr/include/libpng12;/usr/include/libdrm;CAIRO_GLX_INCLUDE_DIRS;CAIRO_EGL_INCLUDE_DIRS (Required is at least version "1.10.2") 
    -- checking for module 'gtk+-3.0'
    [...]
    -- Enabled features:
    --  ENABLE_ACCELERATED_2D_CANVAS ............ ON
    --  ENABLE_CREDENTIAL_STORAGE                 ON
    [...]

Excerpt of the relevant cmake output when cairo-gl IS NOT available:

    [...]
    -- Found OPENGLES2: /usr/include  
    -- checking for module 'cairo-gl'
    --   package 'cairo-gl' not found
    -- checking for module 'cairo-glx'
    --   package 'cairo-glx' not found
    -- checking for module 'cairo-egl'
    --   package 'cairo-egl' not found
    -- Could NOT find CairoGL (missing:  CAIROGL_INCLUDE_DIRS CAIROGL_LIBRARIES) (Required is at least version "1.10.2")
    -- checking for module 'gtk+-3.0'
    [...]
    -- Enabled features:
    --  ENABLE_ACCELERATED_2D_CANVAS ............ OFF
    --  ENABLE_CREDENTIAL_STORAGE                 ON
    [...]

Please review, thanks!

-- 
You are receiving this mail because:
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.webkit.org/pipermail/webkit-unassigned/attachments/20150804/3204dbbd/attachment-0001.html>