Changeset 184954 in webkit


Ignore:
Timestamp:
May 28, 2015, 4:30:52 AM (10 years ago)
Author:
clopez@igalia.com
Message:

[CMake] Improve detection and usage of GL/GLES/EGL libraries.
​https://bugs.webkit.org/show_bug.cgi?id=145408

Reviewed by Carlos Garcia Campos.

.:

  • Source/cmake/FindEGL.cmake: Improve detection of EGL libraries.
  • Source/cmake/FindGLES.cmake: Removed. It was used by the EGL port.

Remove it and make the EGL port use the improved FindOpenGLES2.cmake
instead.

  • Source/cmake/FindOpenGL.cmake: Added. Add module to detect OpenGL

libraries. Detect also GLX libraries.

  • Source/cmake/FindOpenGLES2.cmake: Improve detection of OpenGLES-v2

libraries. Use find_path() to get the include path.

  • Source/cmake/OptionsEfl.cmake: Use now the improved FindOpenGLES2

module.

  • Source/cmake/OptionsGTK.cmake: Set default value for ENABLE_GLES2

depending on the libraries found on the system.
Move the detection of GLX (and the include of CMakePushCheckState)
to FindOpenGL.cmake.
Ensure that we only define USE_GLX when we build with OpenGL
(but not with GLESv2).

Source/WebCore:

No new tests, no behavior changes.

  • CMakeLists.txt: Ensure that we include the libraries and includes

for the GL/GLESv2/EGL libraries before including the ANGLE directories.
Define also any CFLAG that the system GL/GLESv2/EGL libraries may need.

  • PlatformEfl.cmake: Remove some includes that are now unneeded,

because we are including now the EGL libraries on CMakeLists.txt

  • PlatformGTK.cmake: Remove unneeded include (We are including the EGL

libraries now on CMakeLists.txt)

Location:
trunk
Files:
1 deleted
9 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r184928 r184954  
     12015-05-28  Carlos Alberto Lopez Perez  <clopez@igalia.com>
     2
     3        [CMake] Improve detection and usage of GL/GLES/EGL libraries.
     4        https://bugs.webkit.org/show_bug.cgi?id=145408
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        * Source/cmake/FindEGL.cmake: Improve detection of EGL libraries.
     9        * Source/cmake/FindGLES.cmake: Removed. It was used by the EGL port.
     10        Remove it and make the EGL port use the improved FindOpenGLES2.cmake
     11        instead.
     12        * Source/cmake/FindOpenGL.cmake: Added. Add module to detect OpenGL
     13        libraries. Detect also GLX libraries.
     14        * Source/cmake/FindOpenGLES2.cmake: Improve detection of OpenGLES-v2
     15        libraries. Use find_path() to get the include path.
     16        * Source/cmake/OptionsEfl.cmake: Use now the improved FindOpenGLES2
     17        module.
     18        * Source/cmake/OptionsGTK.cmake: Set default value for ENABLE_GLES2
     19        depending on the libraries found on the system.
     20        Move the detection of GLX (and the include of CMakePushCheckState)
     21        to FindOpenGL.cmake.
     22        Ensure that we only define USE_GLX when we build with OpenGL
     23        (but not with GLESv2).
     24
    1252015-05-27  Dean Jackson  <dino@apple.com>
    226

  • trunk/Source/WebCore/CMakeLists.txt

    r184895 r184954  
    30013001
    30023002if (ENABLE_GRAPHICS_CONTEXT_3D)
    3003     # For platforms that want to use system-provided OpenGL (ES) headers,
    3004     # these include directories need to be added before the ANGLE directories.
    3005     if (OPENGL_FOUND)
     3003    # For platforms that want to use system-provided OpenGL (ES) / EGL headers,
     3004    # these include directories, libraries or definitions need to be
     3005    # added before the ANGLE directories.
     3006    if (USE_OPENGL)
    30063007        list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
    3007             ${OPENGL_INCLUDE_DIR}
     3008            ${OPENGL_INCLUDE_DIRS}
    30083009        )
    30093010        list(APPEND WebCore_LIBRARIES
    3010             ${OPENGL_gl_LIBRARY}
     3011            ${OPENGL_LIBRARIES}
    30113012        )
    3012     elseif (OPENGLES2_FOUND)
     3013        add_definitions(${OPENGL_DEFINITIONS})
     3014    elseif (USE_OPENGL_ES_2)
    30133015        list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
    3014             ${OPENGLES2_INCLUDE_DIR}
     3016            ${OPENGLES2_INCLUDE_DIRS}
    30153017        )
    30163018        list(APPEND WebCore_LIBRARIES
    30173019            ${OPENGLES2_LIBRARIES}
    30183020        )
     3021        add_definitions(${OPENGLES2_DEFINITIONS})
     3022    endif ()
     3023
     3024    if (USE_EGL)
     3025        list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
     3026            ${EGL_INCLUDE_DIRS}
     3027        )
     3028        list(APPEND WebCore_LIBRARIES
     3029            ${EGL_LIBRARIES}
     3030        )
     3031        add_definitions(${EGL_DEFINITIONS})
    30193032    endif ()
    30203033

  • trunk/Source/WebCore/ChangeLog

    r184953 r184954  
     12015-05-28  Carlos Alberto Lopez Perez  <clopez@igalia.com>
     2
     3        [CMake] Improve detection and usage of GL/GLES/EGL libraries.
     4        https://bugs.webkit.org/show_bug.cgi?id=145408
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        No new tests, no behavior changes.
     9
     10        * CMakeLists.txt: Ensure that we include the libraries and includes
     11        for the GL/GLESv2/EGL libraries before including the ANGLE directories.
     12        Define also any CFLAG that the system GL/GLESv2/EGL libraries may need.
     13        * PlatformEfl.cmake: Remove some includes that are now unneeded,
     14        because we are including now the EGL libraries on CMakeLists.txt
     15        * PlatformGTK.cmake: Remove unneeded include (We are including the EGL
     16        libraries now on CMakeLists.txt)
     17
    1182015-05-28  Youenn Fablet  <youenn.fablet@crf.canon.fr>
    219

  • trunk/Source/WebCore/PlatformEfl.cmake

    r184610 r184954  
    394394if (USE_EGL)
    395395    list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
    396         ${EGL_INCLUDE_DIR}
    397396        "${WEBCORE_DIR}/platform/graphics/surfaces/egl"
    398397    )
    … …  
    428427endif ()
    429428
    430 if (USE_EGL)
    431     list(APPEND WebCore_LIBRARIES
    432         ${EGL_LIBRARY}
    433     )
    434 elseif (X11_Xcomposite_FOUND AND X11_Xrender_FOUND)
     429if (NOT USE_EGL AND X11_Xcomposite_FOUND AND X11_Xrender_FOUND)
    435430    list(APPEND WebCore_LIBRARIES
    436431        ${X11_Xcomposite_LIB}

  • trunk/Source/WebCore/PlatformGTK.cmake

    r184536 r184954  
    420420endif ()
    421421
    422 if (USE_EGL)
    423     list(APPEND WebCore_LIBRARIES
    424         ${EGL_LIBRARY}
    425     )
    426 endif ()
    427422
    428423if (USE_OPENGL_ES_2)

  • trunk/Source/cmake/FindEGL.cmake

    r166635 r184954  
    33#
    44#  EGL_FOUND - system has EGL installed.
    5 #  EGL_INCLUDE_DIR - directories which contain the EGL headers.
    6 #  EGL_LIBRARY - libraries required to link against EGL.
     5#  EGL_INCLUDE_DIRS - directories which contain the EGL headers.
     6#  EGL_LIBRARIES - libraries required to link against EGL.
     7#  EGL_DEFINITIONS - Compiler switches required for using EGL.
    78#
    89# Copyright (C) 2012 Intel Corporation. All rights reserved.
    … …  
    2930# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    3031
    31 find_path(EGL_INCLUDE_DIR NAMES EGL/egl.h)
     32
     33find_package(PkgConfig)
     34
     35pkg_check_modules(PC_EGL egl)
     36
     37if (PC_EGL_FOUND)
     38    set(EGL_DEFINITIONS ${PC_EGL_CFLAGS_OTHER})
     39endif ()
     40
     41find_path(EGL_INCLUDE_DIRS NAMES EGL/egl.h
     42    HINTS ${PC_EGL_INCLUDEDIR} ${PC_EGL_INCLUDE_DIRS}
     43)
    3244
    3345set(EGL_NAMES ${EGL_NAMES} egl EGL)
    34 find_library(EGL_LIBRARY NAMES ${EGL_NAMES})
     46find_library(EGL_LIBRARIES NAMES ${EGL_NAMES}
     47    HINTS ${PC_EGL_LIBDIR} ${PC_EGL_LIBRARY_DIRS}
     48)
    3549
    3650include(FindPackageHandleStandardArgs)
    37 FIND_PACKAGE_HANDLE_STANDARD_ARGS(EGL DEFAULT_MSG EGL_INCLUDE_DIR EGL_LIBRARY)
     51FIND_PACKAGE_HANDLE_STANDARD_ARGS(EGL DEFAULT_MSG EGL_INCLUDE_DIRS EGL_LIBRARIES)
    3852
    39 mark_as_advanced(EGL_INCLUDE_DIR EGL_LIBRARY)
     53mark_as_advanced(EGL_INCLUDE_DIRS EGL_LIBRARIES)

  • trunk/Source/cmake/FindOpenGL.cmake

    r184953 r184954  
    1 # - Try to Find EGL
     1# - Try to Find OpenGL
    22# Once done, this will define
    33#
    4 #  EGL_FOUND - system has EGL installed.
    5 #  EGL_INCLUDE_DIR - directories which contain the EGL headers.
    6 #  EGL_LIBRARY - libraries required to link against EGL.
     4#  OPENGL_FOUND - system has OpenGL installed.
     5#  OPENGL_INCLUDE_DIRS - directories which contain the OpenGL headers.
     6#  OPENGL_LIBRARIES - libraries required to link against OpenGL.
     7#  OPENGL_DEFINITIONS - Compiler switches required for using OpenGL.
    78#
    8 # Copyright (C) 2012 Intel Corporation. All rights reserved.
     9# Copyright (C) 2015 Igalia S.L.
    910#
    1011# Redistribution and use in source and binary forms, with or without
    … …  
    2930# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    3031
    31 find_path(EGL_INCLUDE_DIR NAMES EGL/egl.h)
    3232
    33 set(EGL_NAMES ${EGL_NAMES} egl EGL)
    34 find_library(EGL_LIBRARY NAMES ${EGL_NAMES})
     33find_package(PkgConfig)
     34
     35pkg_check_modules(PC_OPENGL gl)
     36
     37if (PC_OPENGL_FOUND)
     38    set(OPENGL_DEFINITIONS ${PC_OPENGL_CFLAGS_OTHER})
     39endif ()
     40
     41find_path(OPENGL_INCLUDE_DIRS NAMES GL/gl.h
     42    HINTS ${PC_OPENGL_INCLUDEDIR} ${PC_OPENGL_INCLUDE_DIRS}
     43)
     44
     45set(OPENGL_NAMES ${OPENGL_NAMES} gl GL)
     46find_library(OPENGL_LIBRARIES NAMES ${OPENGL_NAMES}
     47    HINTS ${PC_OPENGL_LIBDIR} ${PC_OPENGL_LIBRARY_DIRS}
     48)
    3549
    3650include(FindPackageHandleStandardArgs)
    37 FIND_PACKAGE_HANDLE_STANDARD_ARGS(EGL DEFAULT_MSG EGL_INCLUDE_DIR EGL_LIBRARY)
     51FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENGL DEFAULT_MSG OPENGL_INCLUDE_DIRS OPENGL_LIBRARIES)
    3852
    39 mark_as_advanced(EGL_INCLUDE_DIR EGL_LIBRARY)
     53mark_as_advanced(OPENGL_INCLUDE_DIRS OPENGL_LIBRARIES)
     54
     55if (OPENGL_FOUND)
     56    # We don't use find_package for GLX because it is part of -lGL, unlike EGL. We need to
     57    # have OPENGL_INCLUDE_DIRS as part of the directories check_include_files() looks for in
     58    # case OpenGL is installed into a non-standard location.
     59    include(CMakePushCheckState)
     60    CMAKE_PUSH_CHECK_STATE()
     61    set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENGL_INCLUDE_DIRS})
     62    check_include_files("GL/glx.h" GLX_FOUND)
     63    CMAKE_POP_CHECK_STATE()
     64endif ()

  • trunk/Source/cmake/FindOpenGLES2.cmake

    r159806 r184954  
    1010
    1111if (PC_OPENGLES2_FOUND)
    12     set(OPENGLES2_INCLUDE_DIRS ${PC_OPENGLES2_INCLUDE_DIRS})
    1312    set(OPENGLES2_DEFINITIONS ${PC_OPENGLES2_CFLAGS_OTHER})
    14 else ()
    15     find_path(OPENGLES2_INCLUDE_DIRS NAMES GLES2/gl2.h)
    1613endif ()
    1714
    18 find_library(OPENGLES2_LIBRARIES GLESv2
    19     HINTS ${PC_OPENGLES2_LIBRARY_DIRS} ${PC_OPENGLES2_LIBDIR}
     15find_path(OPENGLES2_INCLUDE_DIRS NAMES GLES2/gl2.h
     16    HINTS ${PC_OPENGLES2_INCLUDEDIR} ${PC_OPENGLES2_INCLUDE_DIRS}
     17)
     18
     19set(OPENGLES2_NAMES ${OPENGLES2_NAMES} glesv2 GLESv2)
     20find_library(OPENGLES2_LIBRARIES NAMES ${OPENGLES2_NAMES}
     21    HINTS ${PC_OPENGLES2_LIBDIR} ${PC_OPENGLES2_LIBRARY_DIRS}
    2022)
    2123
    2224include(FindPackageHandleStandardArgs)
    23 find_package_handle_standard_args(OpenGLES2 DEFAULT_MSG OPENGLES2_LIBRARIES OPENGLES2_INCLUDE_DIRS)
     25FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENGLES2 DEFAULT_MSG OPENGLES2_INCLUDE_DIRS OPENGLES2_LIBRARIES)
    2426
    25 mark_as_advanced(OPENGLES2_INCLUDE_DIRS OPENGLES2_LIBRARY)
     27mark_as_advanced(OPENGLES2_INCLUDE_DIRS OPENGLES2_LIBRARIES)

  • trunk/Source/cmake/OptionsEfl.cmake

    r184928 r184954  
    231231option(ENABLE_GLES2 "Enable GLES Support")
    232232if (ENABLE_GLES2)
    233     find_package(GLES REQUIRED)
     233    find_package(OpenGLES2 REQUIRED)
    234234    set(USE_OPENGL_ES_2 1)
    235235    add_definitions(-DUSE_OPENGL_ES_2=1)

  • trunk/Source/cmake/OptionsGTK.cmake

    r184928 r184954  
    1 include(CMakePushCheckState)
    21include(GNUInstallDirs)
    32
    … …  
    5049find_package(EGL)
    5150find_package(OpenGL)
     51find_package(OpenGLES2)
    5252
    5353WEBKIT_OPTION_BEGIN()
    5454
    55 WEBKIT_OPTION_DEFINE(ENABLE_GLES2 "Whether to enable OpenGL ES 2.0." PUBLIC OFF)
     55# Set the default value for ENABLE_GLES2 automatically.
     56# We are not enabling or disabling automatically a feature here, because
     57# the feature is by default always on (ENABLE_OPENGL=ON).
     58# What we select here automatically is if we use OPENGL (ENABLE_GLES2=OFF)
     59# or OPENGLES2 (ENABLE_GLES2=ON) for building the feature.
     60set(ENABLE_GLES2_DEFAULT OFF)
     61
     62if (NOT OPENGL_FOUND AND OPENGLES2_FOUND)
     63    set(ENABLE_GLES2_DEFAULT ON)
     64endif ()
     65
     66WEBKIT_OPTION_DEFINE(ENABLE_GLES2 "Whether to enable OpenGL ES 2.0." PUBLIC ${ENABLE_GLES2_DEFAULT})
    5667WEBKIT_OPTION_DEFINE(ENABLE_GTKDOC "Whether or not to use generate gtkdoc." PUBLIC OFF)
    5768WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION "Whether to enable GObject introspection." PUBLIC ON)
    … …  
    103114
    104115if (OPENGL_FOUND)
    105     # We don't use find_package for GLX because it is part of -lGL, unlike EGL. We need to
    106     # have OPENGL_INCLUDE_DIR as part of the directories check_include_files() looks for in
    107     # case OpenGL is installed into a non-standard location.
    108     CMAKE_PUSH_CHECK_STATE()
    109     set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENGL_INCLUDE_DIR})
    110     check_include_files("GL/glx.h" GLX_FOUND)
    111     CMAKE_POP_CHECK_STATE()
    112 
    113116    if (GLX_FOUND)
    114117        list(APPEND CAIROGL_COMPONENTS cairo-glx)
    … …  
    324327    SET_AND_EXPOSE_TO_BUILD(USE_EGL ${EGL_FOUND})
    325328
    326     if (ENABLE_X11_TARGET AND GLX_FOUND)
     329    if (ENABLE_X11_TARGET AND GLX_FOUND AND USE_OPENGL)
    327330        SET_AND_EXPOSE_TO_BUILD(USE_GLX TRUE)
    328331    endif ()
Note: See TracChangeset for help on using the changeset viewer.