Changeset 128154 in webkit


Ignore:
Timestamp:
Sep 11, 2012 12:48:57 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL][WK2] Add necessary include directory in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=95173

Unreviewed build fix.

revision r126694: Move TextureMapperGL to use
GraphicsContext3D. modify the TextureMapperGL.h to include
GraphicsContext3D.h. And when enable TEXTURE_MAPPER,
file WebKit2/Shared/ShareableSurface.cpp will include
TextureMapperGL.h then depends on GraphicsContext3D.h
thus it need to add ANGLE director. As currently, this
problem only affect EFL platform, according to Gyuyoung Kim's
suggestion, we add this include dir into EFL private file
PlatformEfl.cmake. Otherwise, the build will fail.

To trigger this problem by using the following command:
./Tools/Scripts/build-webkit --efl --3d-rendering --tiled-backing-store

Patch by Zhigang Gong <zhigang.gong@linux.intel.com> on 2012-09-11

  • CMakeLists.txt:
Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r128145 r128154  
     12012-09-11  Zhigang Gong  <zhigang.gong@linux.intel.com>
     2
     3        [EFL][WK2] Add necessary include directory in WebKit2
     4        https://bugs.webkit.org/show_bug.cgi?id=95173
     5
     6        Unreviewed build fix.
     7
     8        revision r126694: Move TextureMapperGL to use
     9        GraphicsContext3D. modify the TextureMapperGL.h to include
     10        GraphicsContext3D.h. And when enable TEXTURE_MAPPER,
     11        file WebKit2/Shared/ShareableSurface.cpp will include
     12        TextureMapperGL.h then depends on GraphicsContext3D.h
     13        thus it need to add ANGLE director. As currently, this
     14        problem only affect EFL platform, according to Gyuyoung Kim's
     15        suggestion, we add this include dir into EFL private file
     16        PlatformEfl.cmake. Otherwise, the build will fail.
     17
     18        To trigger this problem by using the following command:
     19        ./Tools/Scripts/build-webkit --efl --3d-rendering --tiled-backing-store
     20
     21        * CMakeLists.txt:
     22
    1232012-09-10  Byungwoo Lee  <bw80.lee@samsung.com>
    224
  • trunk/Source/WebKit2/PlatformEfl.cmake

    r127713 r128154  
    157157)
    158158
     159IF (WTF_USE_3D_GRAPHICS)
     160    LIST(APPEND WebKit2_INCLUDE_DIRECTORIES
     161        "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG"
     162    )
     163ENDIF ()
     164
    159165LIST(APPEND WebKit2_LIBRARIES
    160166    ${CAIRO_LIBRARIES}
Note: See TracChangeset for help on using the changeset viewer.