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

Changeset 270477 in webkit


Ignore:
Timestamp:
Dec 5, 2020, 1:28:48 PM (6 years ago)
Author:
Fujii Hironori
Message:

Remove ENABLE_GRAPHICS_CONTEXT_GL by replacing it with ENABLE(WEBGL)
​https://bugs.webkit.org/show_bug.cgi?id=219551

Reviewed by Kenneth Russell.

.:

  • Source/CMakeLists.txt:
  • Source/cmake/GStreamerDependencies.cmake:
  • Source/cmake/OptionsFTW.cmake:
  • Source/cmake/OptionsGTK.cmake:
  • Source/cmake/OptionsMac.cmake:
  • Source/cmake/OptionsPlayStation.cmake:
  • Source/cmake/OptionsWPE.cmake:
  • Source/cmake/OptionsWinCairo.cmake:

Source/WebCore:

GraphicsContextGL is a module only for WebGL. ENABLE_WEBGL should
be removed if all ports enable it.

  • CMakeLists.txt:
  • page/Chrome.cpp:

(WebCore::Chrome::windowScreenDidChange):

  • platform/graphics/ANGLEWebKitBridge.cpp:
  • platform/graphics/ANGLEWebKitBridge.h:
  • platform/graphics/FormatConverter.cpp:
  • platform/graphics/FormatConverter.h:
  • platform/graphics/GLContext.cpp:
  • platform/graphics/GLContext.h:
  • platform/graphics/GraphicsContextGL.cpp:
  • platform/graphics/GraphicsContextGL.h:
  • platform/graphics/GraphicsContextGLAttributes.h:
  • platform/graphics/GraphicsContextGLImageExtractor.cpp:
  • platform/graphics/GraphicsContextGLImageExtractor.h:
  • platform/graphics/OpenGLShims.cpp:
  • platform/graphics/angle/ExtensionsGLANGLE.cpp:
  • platform/graphics/angle/GraphicsContextGLANGLE.cpp:
  • platform/graphics/angle/GraphicsContextGLANGLEUtilities.h:
  • platform/graphics/angle/TemporaryANGLESetting.cpp:
  • platform/graphics/cairo/GraphicsContextGLCairo.cpp:
  • platform/graphics/cg/GraphicsContextGLCG.cpp:
  • platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
  • platform/graphics/cv/GraphicsContextGLCV.h:
  • platform/graphics/cv/GraphicsContextGLCVANGLE.cpp:
  • platform/graphics/cv/GraphicsContextGLCVANGLE.h:
  • platform/graphics/egl/GLContextEGL.cpp:
  • platform/graphics/egl/GLContextEGL.h:
  • platform/graphics/glx/GLContextGLX.cpp:
  • platform/graphics/glx/GLContextGLX.h:
  • platform/graphics/nicosia/texmap/NicosiaGCGLANGLELayer.h:
  • platform/graphics/opengl/ExtensionsGLOpenGL.cpp:
  • platform/graphics/opengl/ExtensionsGLOpenGLCommon.cpp:
  • platform/graphics/opengl/ExtensionsGLOpenGLES.cpp:
  • platform/graphics/opengl/GraphicsContextGLOpenGL.cpp:
  • platform/graphics/opengl/GraphicsContextGLOpenGL.h:
  • platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp:
  • platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp:
  • platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp:
  • platform/graphics/opengl/GraphicsContextGLOpenGLManager.cpp:
  • platform/graphics/opengl/GraphicsContextGLOpenGLPrivate.cpp:
  • platform/graphics/opengl/TemporaryOpenGLSetting.cpp:
  • platform/graphics/opengl/TemporaryOpenGLSetting.h:
  • platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp:
  • platform/graphics/texmap/TextureMapperGCGLPlatformLayer.cpp:
  • platform/graphics/texmap/TextureMapperGCGLPlatformLayer.h:
  • platform/graphics/win/GraphicsContextGLDirect2D.cpp:

Source/WebKit:

  • CMakeLists.txt:
  • UIProcess/API/glib/WebKitProtocolHandler.cpp:

(WebKit::WebKitProtocolHandler::handleGPU):

  • UIProcess/gtk/HardwareAccelerationManager.cpp:

(WebKit::HardwareAccelerationManager::HardwareAccelerationManager):

Source/WTF:

  • wtf/Platform.h:
  • wtf/PlatformEnable.h:
Location:
trunk
Files:
62 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r270178 r270477  
     12020-12-05  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        Remove ENABLE_GRAPHICS_CONTEXT_GL by replacing it with ENABLE(WEBGL)
     4        https://bugs.webkit.org/show_bug.cgi?id=219551
     5
     6        Reviewed by Kenneth Russell.
     7
     8        * Source/CMakeLists.txt:
     9        * Source/cmake/GStreamerDependencies.cmake:
     10        * Source/cmake/OptionsFTW.cmake:
     11        * Source/cmake/OptionsGTK.cmake:
     12        * Source/cmake/OptionsMac.cmake:
     13        * Source/cmake/OptionsPlayStation.cmake:
     14        * Source/cmake/OptionsWPE.cmake:
     15        * Source/cmake/OptionsWinCairo.cmake:
     16
    1172020-11-26  Lauro Moura  <lmoura@igalia.com>
    218

  • trunk/Source/CMakeLists.txt

    r260844 r270477  
    1414add_subdirectory(JavaScriptCore)
    1515
    16 if (ENABLE_GRAPHICS_CONTEXT_GL)
     16if (ENABLE_WEBGL)
    1717    add_subdirectory(ThirdParty/ANGLE)
    1818endif ()

  • trunk/Source/WTF/ChangeLog

    r270449 r270477  
     12020-12-05  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        Remove ENABLE_GRAPHICS_CONTEXT_GL by replacing it with ENABLE(WEBGL)
     4        https://bugs.webkit.org/show_bug.cgi?id=219551
     5
     6        Reviewed by Kenneth Russell.
     7
     8        * wtf/Platform.h:
     9        * wtf/PlatformEnable.h:
     10
    1112020-12-04  David Kilzer  <ddkilzer@apple.com>
    212

  • trunk/Source/WTF/wtf/Platform.h

    r270395 r270477  
    161161#endif
    162162
    163 #if USE(TEXTURE_MAPPER) && ENABLE(GRAPHICS_CONTEXT_GL) && !defined(USE_TEXTURE_MAPPER_GL)
    164 #define USE_TEXTURE_MAPPER_GL 1
    165 #endif
    166 
    167163/* FIXME: This is used to "turn on a specific feature of WebKit", so should be converted to an ENABLE macro. */
    168164#if PLATFORM(COCOA) && ENABLE(ACCESSIBILITY)

  • trunk/Source/WTF/wtf/PlatformEnable.h

    r270377 r270477  
    494494#endif
    495495
    496 #if !defined(ENABLE_GRAPHICS_CONTEXT_GL)
    497 #define ENABLE_GRAPHICS_CONTEXT_GL ENABLE_WEBGL
    498 #endif
    499 
    500496#if !defined(ENABLE_WEB_ARCHIVE)
    501497#define ENABLE_WEB_ARCHIVE 0
    … …  
    877873#endif
    878874
    879 #if ENABLE(WEBGL) && !ENABLE(GRAPHICS_CONTEXT_GL)
    880 #error "ENABLE(WEBGL) requires ENABLE(GRAPHICS_CONTEXT_GL)"
    881 #endif
    882 
    883875#if ENABLE(WEBGL2) && !ENABLE(WEBGL)
    884876#error "ENABLE(WEBGL2) requires ENABLE(WEBGL)"

  • trunk/Source/WebCore/CMakeLists.txt

    r270297 r270477  
    16221622)
    16231623
    1624 if (ENABLE_GRAPHICS_CONTEXT_GL)
     1624if (ENABLE_WEBGL)
    16251625    list(APPEND WebCore_SOURCES
    16261626        platform/graphics/ANGLEWebKitBridge.cpp

  • trunk/Source/WebCore/ChangeLog

    r270476 r270477  
     12020-12-05  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        Remove ENABLE_GRAPHICS_CONTEXT_GL by replacing it with ENABLE(WEBGL)
     4        https://bugs.webkit.org/show_bug.cgi?id=219551
     5
     6        Reviewed by Kenneth Russell.
     7
     8        GraphicsContextGL is a module only for WebGL. ENABLE_WEBGL should
     9        be removed if all ports enable it.
     10
     11        * CMakeLists.txt:
     12        * page/Chrome.cpp:
     13        (WebCore::Chrome::windowScreenDidChange):
     14        * platform/graphics/ANGLEWebKitBridge.cpp:
     15        * platform/graphics/ANGLEWebKitBridge.h:
     16        * platform/graphics/FormatConverter.cpp:
     17        * platform/graphics/FormatConverter.h:
     18        * platform/graphics/GLContext.cpp:
     19        * platform/graphics/GLContext.h:
     20        * platform/graphics/GraphicsContextGL.cpp:
     21        * platform/graphics/GraphicsContextGL.h:
     22        * platform/graphics/GraphicsContextGLAttributes.h:
     23        * platform/graphics/GraphicsContextGLImageExtractor.cpp:
     24        * platform/graphics/GraphicsContextGLImageExtractor.h:
     25        * platform/graphics/OpenGLShims.cpp:
     26        * platform/graphics/angle/ExtensionsGLANGLE.cpp:
     27        * platform/graphics/angle/GraphicsContextGLANGLE.cpp:
     28        * platform/graphics/angle/GraphicsContextGLANGLEUtilities.h:
     29        * platform/graphics/angle/TemporaryANGLESetting.cpp:
     30        * platform/graphics/cairo/GraphicsContextGLCairo.cpp:
     31        * platform/graphics/cg/GraphicsContextGLCG.cpp:
     32        * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
     33        * platform/graphics/cv/GraphicsContextGLCV.h:
     34        * platform/graphics/cv/GraphicsContextGLCVANGLE.cpp:
     35        * platform/graphics/cv/GraphicsContextGLCVANGLE.h:
     36        * platform/graphics/egl/GLContextEGL.cpp:
     37        * platform/graphics/egl/GLContextEGL.h:
     38        * platform/graphics/glx/GLContextGLX.cpp:
     39        * platform/graphics/glx/GLContextGLX.h:
     40        * platform/graphics/nicosia/texmap/NicosiaGCGLANGLELayer.h:
     41        * platform/graphics/opengl/ExtensionsGLOpenGL.cpp:
     42        * platform/graphics/opengl/ExtensionsGLOpenGLCommon.cpp:
     43        * platform/graphics/opengl/ExtensionsGLOpenGLES.cpp:
     44        * platform/graphics/opengl/GraphicsContextGLOpenGL.cpp:
     45        * platform/graphics/opengl/GraphicsContextGLOpenGL.h:
     46        * platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp:
     47        * platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp:
     48        * platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp:
     49        * platform/graphics/opengl/GraphicsContextGLOpenGLManager.cpp:
     50        * platform/graphics/opengl/GraphicsContextGLOpenGLPrivate.cpp:
     51        * platform/graphics/opengl/TemporaryOpenGLSetting.cpp:
     52        * platform/graphics/opengl/TemporaryOpenGLSetting.h:
     53        * platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp:
     54        * platform/graphics/texmap/TextureMapperGCGLPlatformLayer.cpp:
     55        * platform/graphics/texmap/TextureMapperGCGLPlatformLayer.h:
     56        * platform/graphics/win/GraphicsContextGLDirect2D.cpp:
     57
    1582020-12-05  Andres Gonzalez  <andresg_22@apple.com>
    259

  • trunk/Source/WebCore/page/Chrome.cpp

    r270273 r270477  
    6868#endif
    6969
    70 #if PLATFORM(MAC) && ENABLE(GRAPHICS_CONTEXT_GL)
     70#if PLATFORM(MAC) && ENABLE(WEBGL)
    7171#include "GraphicsContextGLOpenGLManager.h"
    7272#endif
    … …  
    543543    m_page.windowScreenDidChange(displayID, nominalFrameInterval);
    544544
    545 #if PLATFORM(MAC) && ENABLE(GRAPHICS_CONTEXT_GL)
     545#if PLATFORM(MAC) && ENABLE(WEBGL)
    546546    GraphicsContextGLOpenGLManager::sharedManager().screenDidChange(displayID, this);
    547547#endif

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

    r254551 r270477  
    2626#include "config.h"
    2727
    28 #if ENABLE(GRAPHICS_CONTEXT_GL)
     28#if ENABLE(WEBGL) && !USE(ANGLE)
    2929
    3030#include "ANGLEWebKitBridge.h"
    … …  
    207207}
    208208
    209 #endif // ENABLE(GRAPHICS_CONTEXT_GL)
     209#endif // ENABLE(WEBGL) && !USE(ANGLE)

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

    r254551 r270477  
    2626#pragma once
    2727
    28 #if ENABLE(GRAPHICS_CONTEXT_GL)
     28#if ENABLE(WEBGL) && !USE(ANGLE)
    2929
    3030#if USE(LIBEPOXY)
    … …  
    108108} // namespace WebCore
    109109
    110 #endif // ENABLE(GRAPHICS_CONTEXT_GL)
     110#endif // ENABLE(WEBGL) && !USE(ANGLE)

  • trunk/Source/WebCore/platform/graphics/FormatConverter.cpp

    r269850 r270477  
    2828#include "config.h"
    2929
    30 #if ENABLE(GRAPHICS_CONTEXT_GL)
     30#if ENABLE(WEBGL)
    3131
    3232#include "FormatConverter.h"
    … …  
    18111811} // namespace WebCore
    18121812
    1813 #endif // ENABLE(GRAPHICS_CONTEXT_GL)
     1813#endif // ENABLE(WEBGL)

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

    r269850 r270477  
    2828#pragma once
    2929
    30 #if ENABLE(GRAPHICS_CONTEXT_GL)
     30#if ENABLE(WEBGL)
    3131
    3232#include "GraphicsContextGL.h"
    … …  
    9090} // namespace WebCore
    9191
    92 #endif // ENABLE(GRAPHICS_CONTEXT_GL)
     92#endif // ENABLE(WEBGL)

  • trunk/Source/WebCore/platform/graphics/GLContext.cpp

    r254064 r270477  
    1919#include "config.h"
    2020
    21 #if ENABLE(GRAPHICS_CONTEXT_GL)
     21#if USE(OPENGL) || USE(OPENGL_ES)
    2222#include "GLContext.h"
    2323#include <wtf/ThreadSpecific.h>

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

    r268453 r270477  
    7575    virtual bool isEGLContext() const = 0;
    7676
    77 #if ENABLE(GRAPHICS_CONTEXT_GL)
     77#if ENABLE(WEBGL)
    7878    virtual PlatformGraphicsContextGL platformContext() = 0;
    7979#endif

  • trunk/Source/WebCore/platform/graphics/GraphicsContextGL.cpp

    r269850 r270477  
    2929#include "GraphicsContextGL.h"
    3030
    31 #if ENABLE(GRAPHICS_CONTEXT_GL)
     31#if ENABLE(WEBGL)
    3232
    3333#include "ExtensionsGL.h"

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

    r270400 r270477  
    2626#pragma once
    2727
    28 #if ENABLE(GRAPHICS_CONTEXT_GL)
     28#if ENABLE(WEBGL)
    2929
    3030#include "GraphicsContextGLAttributes.h"

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

    r261679 r270477  
    2626#pragma once
    2727
    28 #if ENABLE(GRAPHICS_CONTEXT_GL)
     28#if ENABLE(WEBGL)
    2929
    3030namespace WebCore {
    … …  
    6161}
    6262
    63 #endif // ENABLE(GRAPHICS_CONTEXT_GL)
     63#endif // ENABLE(WEBGL)

  • trunk/Source/WebCore/platform/graphics/GraphicsContextGLImageExtractor.cpp

    r268578 r270477  
    2727#include "GraphicsContextGLImageExtractor.h"
    2828
    29 #if ENABLE(GRAPHICS_CONTEXT_GL)
     29#if ENABLE(WEBGL)
    3030
    3131namespace WebCore {

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

    r269614 r270477  
    2626#pragma once
    2727
    28 #if ENABLE(GRAPHICS_CONTEXT_GL)
     28#if ENABLE(WEBGL)
    2929
    3030#include "GraphicsContextGL.h"

  • trunk/Source/WebCore/platform/graphics/OpenGLShims.cpp

    r254064 r270477  
    1818
    1919#include "config.h"
    20 #if ENABLE(GRAPHICS_CONTEXT_GL)
     20#if ENABLE(WEBGL)
    2121
    2222#define DISABLE_SHIMS
    … …  
    231231} // namespace WebCore
    232232
    233 #endif // ENABLE(GRAPHICS_CONTEXT_GL)
     233#endif // ENABLE(WEBGL)

  • trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp

    r270400 r270477  
    2626#include "config.h"
    2727
    28 #if ENABLE(GRAPHICS_CONTEXT_GL) && USE(ANGLE)
     28#if ENABLE(WEBGL) && USE(ANGLE)
    2929#include "ExtensionsGLANGLE.h"
    3030
    … …  
    546546} // namespace WebCore
    547547
    548 #endif // ENABLE(GRAPHICS_CONTEXT_GL) && USE(ANGLE)
     548#endif // ENABLE(WEBGL) && USE(ANGLE)

  • trunk/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp

    r270401 r270477  
    2727#include "config.h"
    2828
    29 #if ENABLE(GRAPHICS_CONTEXT_GL) && USE(ANGLE)
     29#if ENABLE(WEBGL) && USE(ANGLE)
    3030#include "GraphicsContextGL.h"
    3131
    … …  
    29672967}
    29682968
    2969 #endif // ENABLE(GRAPHICS_CONTEXT_GL) && USE(ANGLE)
     2969#endif // ENABLE(WEBGL) && USE(ANGLE)

  • trunk/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLEUtilities.h

    r268386 r270477  
    2626#pragma once
    2727
    28 #if ENABLE(GRAPHICS_CONTEXT_GL) && USE(ANGLE)
     28#if ENABLE(WEBGL) && USE(ANGLE)
    2929
    3030#include "GraphicsTypesGL.h"

  • trunk/Source/WebCore/platform/graphics/angle/TemporaryANGLESetting.cpp

    r254064 r270477  
    2727#include "config.h"
    2828
    29 #if ENABLE(GRAPHICS_CONTEXT_GL) && USE(ANGLE)
     29#if ENABLE(WEBGL) && USE(ANGLE)
    3030#include "TemporaryANGLESetting.h"
    3131
    … …  
    6161}
    6262
    63 #endif // ENABLE(GRAPHICS_CONTEXT_GL) && USE(ANGLE)
     63#endif // ENABLE(WEBGL) && USE(ANGLE)

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

    r269614 r270477  
    2929#include "GraphicsContextGLOpenGL.h"
    3030
    31 #if ENABLE(GRAPHICS_CONTEXT_GL) && USE(CAIRO)
     31#if ENABLE(WEBGL) && USE(CAIRO)
    3232
    3333#include "CairoUtilities.h"
    … …  
    139139} // namespace WebCore
    140140
    141 #endif // ENABLE(GRAPHICS_CONTEXT_GL) && USE(CAIRO)
     141#endif // ENABLE(WEBGL) && USE(CAIRO)

  • trunk/Source/WebCore/platform/graphics/cg/GraphicsContextGLCG.cpp

    r269614 r270477  
    2727#include "config.h"
    2828
    29 #if ENABLE(GRAPHICS_CONTEXT_GL)
     29#if ENABLE(WEBGL)
    3030
    3131#include "BitmapImage.h"
    … …  
    554554} // namespace WebCore
    555555
    556 #endif // ENABLE(GRAPHICS_CONTEXT_GL)
     556#endif // ENABLE(WEBGL)

  • trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm

    r270401 r270477  
    2626#import "config.h"
    2727
    28 #if ENABLE(GRAPHICS_CONTEXT_GL)
     28#if ENABLE(WEBGL)
    2929#import "GraphicsContextGLOpenGL.h"
    3030
    … …  
    710710}
    711711
    712 #endif // ENABLE(GRAPHICS_CONTEXT_GL)
     712#endif // ENABLE(WEBGL)

  • trunk/Source/WebCore/platform/graphics/cv/GraphicsContextGLCV.h

    r269678 r270477  
    2626#pragma once
    2727
    28 #if ENABLE(GRAPHICS_CONTEXT_GL) && USE(AVFOUNDATION)
     28#if ENABLE(WEBGL) && USE(AVFOUNDATION)
    2929
    3030#include "GraphicsContextGL.h"

  • trunk/Source/WebCore/platform/graphics/cv/GraphicsContextGLCVANGLE.cpp

    r270401 r270477  
    2727#include "GraphicsContextGLCVANGLE.h"
    2828
    29 #if ENABLE(GRAPHICS_CONTEXT_GL) && ENABLE(VIDEO) && USE(AVFOUNDATION)
     29#if ENABLE(WEBGL) && ENABLE(VIDEO) && USE(AVFOUNDATION)
    3030
    3131#include "FourCC.h"

  • trunk/Source/WebCore/platform/graphics/cv/GraphicsContextGLCVANGLE.h

    r269678 r270477  
    2626#pragma once
    2727
    28 #if ENABLE(GRAPHICS_CONTEXT_GL) && ENABLE(VIDEO) && USE(AVFOUNDATION)
     28#if ENABLE(WEBGL) && ENABLE(VIDEO) && USE(AVFOUNDATION)
    2929
    3030#import "GraphicsContextGLCV.h"

  • trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp

    r269850 r270477  
    492492}
    493493
    494 #if ENABLE(GRAPHICS_CONTEXT_GL)
     494#if ENABLE(WEBGL)
    495495PlatformGraphicsContextGL GLContextEGL::platformContext()
    496496{

  • trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.h

    r268453 r270477  
    6666    bool isEGLContext() const override { return true; }
    6767
    68 #if ENABLE(GRAPHICS_CONTEXT_GL)
     68#if ENABLE(WEBGL)
    6969    PlatformGraphicsContextGL platformContext() override;
    7070#endif

  • trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp

    r268453 r270477  
    395395}
    396396
    397 #if ENABLE(GRAPHICS_CONTEXT_GL)
     397#if ENABLE(WEBGL)
    398398PlatformGraphicsContextGL GLContextGLX::platformContext()
    399399{

  • trunk/Source/WebCore/platform/graphics/glx/GLContextGLX.h

    r268453 r270477  
    5050    bool isEGLContext() const override { return false; }
    5151
    52 #if ENABLE(GRAPHICS_CONTEXT_GL)
     52#if ENABLE(WEBGL)
    5353    PlatformGraphicsContextGL platformContext() override;
    5454#endif

  • trunk/Source/WebCore/platform/graphics/nicosia/texmap/NicosiaGCGLANGLELayer.h

    r263076 r270477  
    6262
    6363        bool makeContextCurrent();
    64 #if ENABLE(GRAPHICS_CONTEXT_GL)
     64#if ENABLE(WEBGL)
    6565        PlatformGraphicsContextGL platformContext() const;
    6666#endif

  • trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.cpp

    r270400 r270477  
    2727#include "ExtensionsGLOpenGL.h"
    2828
    29 #if ENABLE(GRAPHICS_CONTEXT_GL) && USE(OPENGL)
     29#if ENABLE(WEBGL) && USE(OPENGL)
    3030
    3131#include "GraphicsContextGLOpenGL.h"
    … …  
    283283} // namespace WebCore
    284284
    285 #endif // ENABLE(GRAPHICS_CONTEXT_GL) && USE(OPENGL)
     285#endif // ENABLE(WEBGL) && USE(OPENGL)

  • trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLCommon.cpp

    r270400 r270477  
    2727#include "config.h"
    2828
    29 #if ENABLE(GRAPHICS_CONTEXT_GL) && (USE(OPENGL) || USE(OPENGL_ES))
     29#if ENABLE(WEBGL) && !USE(ANGLE)
    3030#include "ExtensionsGLOpenGLCommon.h"
    3131
    … …  
    436436} // namespace WebCore
    437437
    438 #endif // ENABLE(GRAPHICS_CONTEXT_GL) && (USE(OPENGL) || USE(OPENGL_ES))
     438#endif // ENABLE(WEBGL) && !USE(ANGLE)

  • trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.cpp

    r270400 r270477  
    3131#include "ExtensionsGLOpenGLES.h"
    3232
    33 #if ENABLE(GRAPHICS_CONTEXT_GL)
     33#if ENABLE(WEBGL)
    3434#include "GraphicsContextGLOpenGL.h"
    3535#include "NotImplemented.h"
    … …  
    331331} // namespace WebCore
    332332
    333 #endif // ENABLE(GRAPHICS_CONTEXT_GL)
     333#endif // ENABLE(WEBGL)
    334334
    335335#endif // USE(OPENGL_ES)

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.cpp

    r270185 r270477  
    2929#include "GraphicsContextGLOpenGL.h"
    3030
    31 #if ENABLE(GRAPHICS_CONTEXT_GL)
     31#if ENABLE(WEBGL)
    3232
    3333#include "ExtensionsGL.h"
    … …  
    197197} // namespace WebCore
    198198
    199 #endif // ENABLE(GRAPHICS_CONTEXT_GL)
     199#endif // ENABLE(WEBGL)

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h

    r270451 r270477  
    2626#pragma once
    2727
    28 #if ENABLE(GRAPHICS_CONTEXT_GL)
     28#if ENABLE(WEBGL)
    2929
    3030#include "GraphicsContextGL.h"
    … …  
    752752} // namespace WebCore
    753753
    754 #endif // ENABLE(GRAPHICS_CONTEXT_GL)
     754#endif // ENABLE(WEBGL)

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp

    r270400 r270477  
    2828#include "GraphicsContextGLOpenGL.h"
    2929
    30 #if ENABLE(GRAPHICS_CONTEXT_GL) && USE(OPENGL)
     30#if ENABLE(WEBGL) && USE(OPENGL)
    3131
    3232#include "ExtensionsGLOpenGL.h"
    … …  
    449449}
    450450
    451 #endif // ENABLE(GRAPHICS_CONTEXT_GL) && USE(OPENGL)
     451#endif // ENABLE(WEBGL) && USE(OPENGL)

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp

    r270400 r270477  
    3030#include "GraphicsContextGLOpenGL.h"
    3131
    32 #if ENABLE(GRAPHICS_CONTEXT_GL) && (USE(OPENGL) || USE(OPENGL_ES))
     32#if ENABLE(WEBGL) && !USE(ANGLE)
    3333
    3434#if USE(OPENGL_ES)
    … …  
    29622962}
    29632963
    2964 #endif // ENABLE(GRAPHICS_CONTEXT_GL) && (USE(OPENGL) || USE(OPENGL_ES))
     2964#endif // ENABLE(WEBGL) && !USE(ANGLE)

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp

    r270400 r270477  
    3030#include "GraphicsContextGLOpenGL.h"
    3131
    32 #if ENABLE(GRAPHICS_CONTEXT_GL) && USE(OPENGL_ES)
     32#if ENABLE(WEBGL) && USE(OPENGL_ES)
    3333
    3434#include "ExtensionsGLOpenGLES.h"
    … …  
    413413}
    414414
    415 #endif // ENABLE(GRAPHICS_CONTEXT_GL) && USE(OPENGL_ES)
     415#endif // ENABLE(WEBGL) && USE(OPENGL_ES)

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLManager.cpp

    r268198 r270477  
    2626#include "config.h"
    2727
    28 #if ENABLE(GRAPHICS_CONTEXT_GL)
     28#if ENABLE(WEBGL)
    2929#include "GraphicsContextGLOpenGLManager.h"
    3030
    … …  
    276276} // namespace WebCore
    277277
    278 #endif // ENABLE(GRAPHICS_CONTEXT_GL)
     278#endif // ENABLE(WEBGL)

  • trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLPrivate.cpp

    r254064 r270477  
    2020#include "config.h"
    2121
    22 #if ENABLE(GRAPHICS_CONTEXT_GL)
     22#if ENABLE(WEBGL)
    2323#include "GraphicsContextGLOpenGLPrivate.h"
    2424
    … …  
    6565} // namespace WebCore
    6666
    67 #endif // ENABLE(GRAPHICS_CONTEXT_GL)
     67#endif // ENABLE(WEBGL)

  • trunk/Source/WebCore/platform/graphics/opengl/TemporaryOpenGLSetting.cpp

    r254064 r270477  
    2727#include "config.h"
    2828
    29 #if ENABLE(GRAPHICS_CONTEXT_GL) && (USE(OPENGL) || USE(OPENGL_ES))
     29#if ENABLE(WEBGL) && (USE(OPENGL) || USE(OPENGL_ES))
    3030#include "TemporaryOpenGLSetting.h"
    3131

  • trunk/Source/WebCore/platform/graphics/opengl/TemporaryOpenGLSetting.h

    r254214 r270477  
    2929#include "GraphicsTypesGL.h"
    3030
    31 #if ENABLE(GRAPHICS_CONTEXT_GL) && (USE(OPENGL) || USE(OPENGL_ES))
     31#if ENABLE(WEBGL) && (USE(OPENGL) || USE(OPENGL_ES))
    3232
    3333#include <wtf/Noncopyable.h>

  • trunk/Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp

    r270451 r270477  
    2929#include "GraphicsContextGLOpenGL.h"
    3030
    31 #if ENABLE(GRAPHICS_CONTEXT_GL) && USE(TEXTURE_MAPPER)
     31#if ENABLE(WEBGL) && USE(TEXTURE_MAPPER)
    3232
    3333#include "GraphicsContextGLOpenGLPrivate.h"
    … …  
    468468} // namespace WebCore
    469469
    470 #endif // ENABLE(GRAPHICS_CONTEXT_GL) && USE(TEXTURE_MAPPER)
     470#endif // ENABLE(WEBGL) && USE(TEXTURE_MAPPER)

  • trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGCGLPlatformLayer.cpp

    r263076 r270477  
    2121#include "TextureMapperGCGLPlatformLayer.h"
    2222
    23 #if ENABLE(GRAPHICS_CONTEXT_GL) && USE(TEXTURE_MAPPER) && !USE(NICOSIA)
     23#if ENABLE(WEBGL) && USE(TEXTURE_MAPPER) && !USE(NICOSIA)
    2424
    2525#include "BitmapTextureGL.h"
    … …  
    122122} // namespace WebCore
    123123
    124 #endif // ENABLE(GRAPHICS_CONTEXT_GL) && USE(TEXTURE_MAPPER)
     124#endif // ENABLE(WEBGL) && USE(TEXTURE_MAPPER)

  • trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGCGLPlatformLayer.h

    r263076 r270477  
    2020#pragma once
    2121
    22 #if ENABLE(GRAPHICS_CONTEXT_GL) && USE(TEXTURE_MAPPER) && !USE(NICOSIA)
     22#if ENABLE(WEBGL) && USE(TEXTURE_MAPPER) && !USE(NICOSIA)
    2323
    2424#include "GraphicsContextGLOpenGL.h"
    … …  
    5959} // namespace WebCore
    6060
    61 #endif // ENABLE(GRAPHICS_CONTEXT_GL) && USE(TEXTURE_MAPPER)
     61#endif // ENABLE(WEBGL) && USE(TEXTURE_MAPPER)

  • trunk/Source/WebCore/platform/graphics/win/GraphicsContextGLDirect2D.cpp

    r268578 r270477  
    2727#include "GraphicsContextGLOpenGL.h"
    2828
    29 #if ENABLE(GRAPHICS_CONTEXT_GL) && USE(DIRECT2D)
     29#if ENABLE(WEBGL) && USE(DIRECT2D)
    3030
    3131#include "COMPtr.h"
    … …  
    5959} // namespace WebCore
    6060
    61 #endif // ENABLE(GRAPHICS_CONTEXT_GL) && USE(DIRECT2D)
     61#endif // ENABLE(WEBGL) && USE(DIRECT2D)

  • trunk/Source/WebKit/CMakeLists.txt

    r270462 r270477  
    299299endif ()
    300300
    301 if (ENABLE_GRAPHICS_CONTEXT_GL)
    302     # For platforms that want to use system-provided OpenGL (ES) / EGL headers,
    303     # these include directories, libraries or definitions need to be
    304     # added before the ANGLE directories.
    305     if (USE_LIBEPOXY)
     301# For platforms that want to use system-provided OpenGL (ES) / EGL headers,
     302# these include directories, libraries or definitions need to be
     303# added before the ANGLE directories.
     304if (USE_LIBEPOXY)
     305    list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
     306        ${LIBEPOXY_INCLUDE_DIRS}
     307    )
     308    list(APPEND WebKit_PRIVATE_LIBRARIES
     309        ${LIBEPOXY_LIBRARIES}
     310    )
     311    add_definitions(${LIBEPOXY_DEFINITIONS})
     312else ()
     313    if (USE_OPENGL)
    306314        list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
    307             ${LIBEPOXY_INCLUDE_DIRS}
     315            ${OPENGL_INCLUDE_DIRS}
    308316        )
    309317        list(APPEND WebKit_PRIVATE_LIBRARIES
    310             ${LIBEPOXY_LIBRARIES}
     318            ${OPENGL_LIBRARIES}
    311319        )
    312         add_definitions(${LIBEPOXY_DEFINITIONS})
    313     else ()
    314         if (USE_OPENGL)
    315             list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
    316                 ${OPENGL_INCLUDE_DIRS}
    317             )
    318             list(APPEND WebKit_PRIVATE_LIBRARIES
    319                 ${OPENGL_LIBRARIES}
    320             )
    321             add_definitions(${OPENGL_DEFINITIONS})
    322         elseif (USE_OPENGL_ES)
    323             list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
    324                 ${OPENGLES2_INCLUDE_DIRS}
    325             )
    326             list(APPEND WebKit_PRIVATE_LIBRARIES
    327                 ${OPENGLES2_LIBRARIES}
    328             )
    329             add_definitions(${OPENGLES2_DEFINITIONS})
    330         endif ()
    331 
    332         if (USE_EGL)
    333             list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
    334                 ${EGL_INCLUDE_DIRS}
    335             )
    336             list(APPEND WebKit_PRIVATE_LIBRARIES
    337                 ${EGL_LIBRARIES}
    338             )
    339             add_definitions(${EGL_DEFINITIONS})
    340         endif ()
     320        add_definitions(${OPENGL_DEFINITIONS})
     321    elseif (USE_OPENGL_ES)
     322        list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
     323            ${OPENGLES2_INCLUDE_DIRS}
     324        )
     325        list(APPEND WebKit_PRIVATE_LIBRARIES
     326            ${OPENGLES2_LIBRARIES}
     327        )
     328        add_definitions(${OPENGLES2_DEFINITIONS})
     329    endif ()
     330
     331    if (USE_EGL)
     332        list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
     333            ${EGL_INCLUDE_DIRS}
     334        )
     335        list(APPEND WebKit_PRIVATE_LIBRARIES
     336            ${EGL_LIBRARIES}
     337        )
     338        add_definitions(${EGL_DEFINITIONS})
    341339    endif ()
    342340endif ()

  • trunk/Source/WebKit/ChangeLog

    r270470 r270477  
     12020-12-05  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        Remove ENABLE_GRAPHICS_CONTEXT_GL by replacing it with ENABLE(WEBGL)
     4        https://bugs.webkit.org/show_bug.cgi?id=219551
     5
     6        Reviewed by Kenneth Russell.
     7
     8        * CMakeLists.txt:
     9        * UIProcess/API/glib/WebKitProtocolHandler.cpp:
     10        (WebKit::WebKitProtocolHandler::handleGPU):
     11        * UIProcess/gtk/HardwareAccelerationManager.cpp:
     12        (WebKit::HardwareAccelerationManager::HardwareAccelerationManager):
     13
    1142020-12-04  Said Abou-Hallawa  <said@apple.com>
    215

  • trunk/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp

    r267875 r270477  
    347347        hardwareAccelerationPolicy(request));
    348348
    349 #if ENABLE(GRAPHICS_CONTEXT_GL)
     349#if ENABLE(WEBGL)
    350350    g_string_append_printf(html,
    351351        " <tbody><tr>"
    … …  
    481481    }
    482482#endif
    483 #endif // ENABLE(GRAPHICS_CONTEXT_GL)
     483#endif // ENABLE(WEBGL)
    484484
    485485    g_string_append(html, "<table>");

  • trunk/Source/WebKit/UIProcess/gtk/HardwareAccelerationManager.cpp

    r260816 r270477  
    4242    , m_forceHardwareAcceleration(false)
    4343{
    44 #if !ENABLE(GRAPHICS_CONTEXT_GL)
     44#if !ENABLE(WEBGL)
    4545    m_canUseHardwareAcceleration = false;
    4646    return;

  • trunk/Source/cmake/GStreamerDependencies.cmake

    r260760 r270477  
    1 if (PORT STREQUAL "GTK")
    2   WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_GRAPHICS_CONTEXT_GL)
    3 endif ()
    41WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_VIDEO)
    52WEBKIT_OPTION_DEPEND(USE_GSTREAMER_MPEGTS ENABLE_VIDEO)

  • trunk/Source/cmake/OptionsFTW.cmake

    r270120 r270477  
    235235SET_AND_EXPOSE_TO_BUILD(USE_INSPECTOR_SOCKET_SERVER OFF)
    236236
    237 SET_AND_EXPOSE_TO_BUILD(ENABLE_GRAPHICS_CONTEXT_GL ON)
    238 
    239237set(WTF_LIBRARY_TYPE SHARED)
    240238set(JavaScriptCore_LIBRARY_TYPE SHARED)

  • trunk/Source/cmake/OptionsGTK.cmake

    r270178 r270477  
    7575# Set the default value for ENABLE_GLES2 automatically.
    7676# We are not enabling or disabling automatically a feature here, because
    77 # the feature is by default always on (ENABLE_GRAPHICS_CONTEXT_GL=ON).
     77# the feature is by default always on.
    7878# What we select here automatically is if we use OPENGL (ENABLE_GLES2=OFF)
    7979# or OPENGLES2 (ENABLE_GLES2=ON) for building the feature.
    … …  
    9090WEBKIT_OPTION_DEFINE(ENABLE_GTKDOC "Whether or not to use generate gtkdoc." PUBLIC OFF)
    9191WEBKIT_OPTION_DEFINE(ENABLE_INTROSPECTION "Whether to enable GObject introspection." PUBLIC ON)
    92 WEBKIT_OPTION_DEFINE(ENABLE_GRAPHICS_CONTEXT_GL "Whether to use OpenGL." PUBLIC ON)
    9392WEBKIT_OPTION_DEFINE(ENABLE_QUARTZ_TARGET "Whether to enable support for the Quartz windowing target." PUBLIC ${GTK_SUPPORTS_QUARTZ})
    9493WEBKIT_OPTION_DEFINE(ENABLE_X11_TARGET "Whether to enable support for the X11 windowing target." PUBLIC ${GTK_SUPPORTS_X11})
    … …  
    106105WEBKIT_OPTION_DEFINE(USE_ANGLE_WEBGL "Whether to use ANGLE as WebGL backend." PRIVATE OFF)
    107106
    108 WEBKIT_OPTION_DEPEND(ENABLE_3D_TRANSFORMS ENABLE_GRAPHICS_CONTEXT_GL)
    109 WEBKIT_OPTION_DEPEND(ENABLE_ASYNC_SCROLLING ENABLE_GRAPHICS_CONTEXT_GL)
    110 WEBKIT_OPTION_DEPEND(ENABLE_GLES2 ENABLE_GRAPHICS_CONTEXT_GL)
    111 WEBKIT_OPTION_DEPEND(ENABLE_WEBGL ENABLE_GRAPHICS_CONTEXT_GL)
    112107WEBKIT_OPTION_DEPEND(USE_ANGLE_WEBGL ENABLE_WEBGL)
    113 WEBKIT_OPTION_DEPEND(USE_WPE_RENDERER ENABLE_GRAPHICS_CONTEXT_GL)
    114108WEBKIT_OPTION_DEPEND(USE_WPE_RENDERER ENABLE_WAYLAND_TARGET)
    115109
    … …  
    273267SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER TRUE)
    274268
    275 if (ENABLE_GRAPHICS_CONTEXT_GL)
    276     # ENABLE_GRAPHICS_CONTEXT_GL is true if either USE_OPENGL or ENABLE_GLES2 is true.
    277     # But USE_OPENGL is the opposite of ENABLE_GLES2.
     269if (OPENGL_FOUND OR ENABLE_GLES2)
     270    # USE_OPENGL is the opposite of ENABLE_GLES2.
    278271    if (ENABLE_GLES2)
    279272        find_package(OpenGLES2 REQUIRED)
    … …  
    285278        endif ()
    286279    else ()
    287         if (NOT OPENGL_FOUND)
    288             message(FATAL_ERROR "Either OpenGL or OpenGLES2 is needed for ENABLE_GRAPHICS_CONTEXT_GL.")
    289         endif ()
    290280        SET_AND_EXPOSE_TO_BUILD(USE_OPENGL TRUE)
    291281    endif ()
    292282
    293283    if (NOT EGL_FOUND AND (NOT ENABLE_X11_TARGET OR NOT GLX_FOUND))
    294         message(FATAL_ERROR "Either GLX or EGL is needed for ENABLE_GRAPHICS_CONTEXT_GL.")
     284        message(FATAL_ERROR "Either GLX or EGL is needed.")
    295285    endif ()
    296286

  • trunk/Source/cmake/OptionsMac.cmake

    r269045 r270477  
    107107WEBKIT_OPTION_END()
    108108
    109 set(ENABLE_GRAPHICS_CONTEXT_GL ON)
    110109set(ENABLE_WEBKIT_LEGACY ON)
    111110set(ENABLE_WEBKIT ON)

  • trunk/Source/cmake/OptionsPlayStation.cmake

    r270169 r270477  
    156156
    157157# Rendering options
    158 SET_AND_EXPOSE_TO_BUILD(ENABLE_GRAPHICS_CONTEXT_GL ON)
    159158SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS ON)
    160159SET_AND_EXPOSE_TO_BUILD(USE_EGL ON)

  • trunk/Source/cmake/OptionsWPE.cmake

    r268793 r270477  
    229229endif ()
    230230
    231 SET_AND_EXPOSE_TO_BUILD(ENABLE_GRAPHICS_CONTEXT_GL TRUE)
    232 
    233231SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER TRUE)
    234232SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER_GL TRUE)

  • trunk/Source/cmake/OptionsWinCairo.cmake

    r267771 r270477  
    6060SET_AND_EXPOSE_TO_BUILD(USE_INSPECTOR_SOCKET_SERVER ${ENABLE_REMOTE_INSPECTOR})
    6161
    62 SET_AND_EXPOSE_TO_BUILD(ENABLE_GRAPHICS_CONTEXT_GL ON)
    6362SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
    6463
Note: See TracChangeset for help on using the changeset viewer.