⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 181629 in webkit


Ignore:
Timestamp:
Mar 17, 2015, 2:45:55 AM (11 years ago)
Author:
zandobersek@gmail.com
Message:

[CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ANGLE's EGL headers
​https://bugs.webkit.org/show_bug.cgi?id=142530

Reviewed by Darin Adler.

Source/ThirdParty/ANGLE:

  • ANGLE/ShaderLang.h: Added. Includes include/GLSLANG/ShaderLang.h. Used in WebCore

so we can avoid using ANGLE's EGL headers and use the system-default headers instead.

Source/WebCore:

Include the ANGLE's ShaderLang.h through the new forwarding header. This allows
us to not list Source/ThirdParty/ANGLE/include in the list of inclusion directories
and thus avoid ANGLE's EGL and GLES2/GLES3 headers, defaulting to the system-provided
headers instead.

Source/ThirdParty/ANGLE/include/KHR is still used because ANGLE's khrplatform.h is
required by the ShaderLang.h header. Source/ThirdParty/ANGLE/src is not used for the
whole WebCore library anymore, only the ANGLESupport library.

  • CMakeLists.txt:
  • platform/graphics/ANGLEWebKitBridge.h:
  • platform/graphics/cairo/GraphicsContext3DCairo.cpp:

Source/WebKit2:

  • CMakeLists.txt: Replace the Source/ThirdParty/ANGLE/include/GLSLANG entry

in the list of inclusion directories for WebKit2 with Source/ThirdParty/ANGLE,
possible due to the new forwarding header for ANGLE's ShaderLang.h.

Location:
trunk/Source
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r181589 r181629  
     12015-03-17  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        [CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ANGLE's EGL headers
     4        https://bugs.webkit.org/show_bug.cgi?id=142530
     5
     6        Reviewed by Darin Adler.
     7
     8        * ANGLE/ShaderLang.h: Added. Includes include/GLSLANG/ShaderLang.h. Used in WebCore
     9        so we can avoid using ANGLE's EGL headers and use the system-default headers instead.
     10
    1112015-03-16  Roger Fong  <roger_fong@apple.com>
    212

  • trunk/Source/WebCore/CMakeLists.txt

    r181601 r181629  
    29922992
    29932993    list(APPEND WebCore_INCLUDE_DIRECTORIES
    2994         "${THIRDPARTY_DIR}/ANGLE/src"
    2995         "${THIRDPARTY_DIR}/ANGLE/include/"
     2994        "${THIRDPARTY_DIR}/ANGLE/"
    29962995        "${THIRDPARTY_DIR}/ANGLE/include/KHR"
    2997         "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG"
    29982996        "${WEBCORE_DIR}/platform/graphics/gpu"
    29992997    )
    … …  
    35233521        PROPERTY INCLUDE_DIRECTORIES
    35243522            "${THIRDPARTY_DIR}/ANGLE/include"
     3523            "${THIRDPARTY_DIR}/ANGLE/src"
    35253524    )
    35263525    list(APPEND WebCore_LIBRARIES ANGLESupport)

  • trunk/Source/WebCore/ChangeLog

    r181625 r181629  
     12015-03-17  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        [CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ANGLE's EGL headers
     4        https://bugs.webkit.org/show_bug.cgi?id=142530
     5
     6        Reviewed by Darin Adler.
     7
     8        Include the ANGLE's ShaderLang.h through the new forwarding header. This allows
     9        us to not list Source/ThirdParty/ANGLE/include in the list of inclusion directories
     10        and thus avoid ANGLE's EGL and GLES2/GLES3 headers, defaulting to the system-provided
     11        headers instead.
     12
     13        Source/ThirdParty/ANGLE/include/KHR is still used because ANGLE's khrplatform.h is
     14        required by the ShaderLang.h header. Source/ThirdParty/ANGLE/src is not used for the
     15        whole WebCore library anymore, only the ANGLESupport library.
     16
     17        * CMakeLists.txt:
     18        * platform/graphics/ANGLEWebKitBridge.h:
     19        * platform/graphics/cairo/GraphicsContext3DCairo.cpp:
     20
    1212015-03-17  Matt Baker  <mattbaker@apple.com>
    222

  • trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h

    r172346 r181629  
    3535#include "GLSLANG/ShaderLang.h"
    3636#else
    37 #include "ShaderLang.h"
     37#include <ANGLE/ShaderLang.h>
    3838#endif
    3939

  • trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp

    r180609 r181629  
    4040#include "PlatformContextCairo.h"
    4141#include "RefPtrCairo.h"
    42 #include <GLSLANG/ShaderLang.h>
     42#include <ANGLE/ShaderLang.h>
    4343#include <cairo.h>
    4444

  • trunk/Source/WebKit2/CMakeLists.txt

    r181318 r181629  
    150150if (WTF_USE_3D_GRAPHICS)
    151151    list(APPEND WebKit2_INCLUDE_DIRECTORIES
     152        "${THIRDPARTY_DIR}/ANGLE"
    152153        "${THIRDPARTY_DIR}/ANGLE/include/KHR"
    153         "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG"
    154154    )
    155155endif ()

  • trunk/Source/WebKit2/ChangeLog

    r181620 r181629  
     12015-03-17  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        [CMake] Use a forwarding header for ANGLE's ShaderLang.h to avoid picking up ANGLE's EGL headers
     4        https://bugs.webkit.org/show_bug.cgi?id=142530
     5
     6        Reviewed by Darin Adler.
     7
     8        * CMakeLists.txt: Replace the Source/ThirdParty/ANGLE/include/GLSLANG entry
     9        in the list of inclusion directories for WebKit2 with Source/ThirdParty/ANGLE,
     10        possible due to the new forwarding header for ANGLE's ShaderLang.h.
     11
    1122015-03-17  Gwang Yoon Hwang  <yoon@igalia.com>
    213
Note: See TracChangeset for help on using the changeset viewer.