Changeset 173112 in webkit


Ignore:
Timestamp:
Aug 29, 2014 3:05:25 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL] Remove non Coordinated Graphics code path from cmake build system after r142169
​https://bugs.webkit.org/show_bug.cgi?id=135560

Patch by Eva Balazsfalvi <​evab.u-szeged@partner.samsung.com> on 2014-08-29
Reviewed by Gyuyoung Kim.

.:

  • Source/cmake/OptionsEfl.cmake: Removed TILED_BACKING_STORE guard.

Source/WebCore:

No new tests required, no new functionality.

  • PlatformEfl.cmake: Removed TEXTURE_MAPPER and 3D_GRAPHICS guards.
  • platform/graphics/efl/GraphicsContext3DEfl.cpp: Removed TEXTURE_MAPPER_GL and GRAPHICS_SURFACE guards.

(WebCore::GraphicsContext3D::platformLayer):
(WebCore::GraphicsContext3D::createGraphicsSurfaces):

  • platform/graphics/efl/GraphicsContext3DPrivate.cpp: Removed TEXTURE_MAPPER_GL and GRAPHICS_SURFACE guards.

(WebCore::GraphicsContext3DPrivate::initialize):
(WebCore::GraphicsContext3DPrivate::releaseResources):
(WebCore::GraphicsContext3DPrivate::paintToTextureMapper):
(WebCore::GraphicsContext3DPrivate::graphicsSurfaceFlags):

  • platform/graphics/efl/GraphicsContext3DPrivate.h: Removed TEXTURE_MAPPER_GL and GRAPHICS_SURFACE guards.
  • platform/graphics/surfaces/efl/GraphicsSurfaceCommon.cpp: Removed GRAPHICS_SURFACE guard.

Tools:

  • Scripts/webkitperl/FeatureList.pm: Removed TILED_BACKING_STORE guard.
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r173064 r173112  
     12014-08-29  Eva Balazsfalvi  <evab.u-szeged@partner.samsung.com>
     2
     3        [EFL] Remove non Coordinated Graphics code path from cmake build system after r142169
     4        https://bugs.webkit.org/show_bug.cgi?id=135560
     5
     6        Reviewed by Gyuyoung Kim.
     7
     8        * Source/cmake/OptionsEfl.cmake: Removed TILED_BACKING_STORE guard.
     9
    1102014-08-28  Brian J. Burg  <burg@cs.washington.edu>
    211

  • trunk/Source/WebCore/ChangeLog

    r173111 r173112  
     12014-08-29  Eva Balazsfalvi  <evab.u-szeged@partner.samsung.com>
     2
     3        [EFL] Remove non Coordinated Graphics code path from cmake build system after r142169
     4        https://bugs.webkit.org/show_bug.cgi?id=135560
     5
     6        Reviewed by Gyuyoung Kim.
     7
     8        No new tests required, no new functionality.
     9
     10        * PlatformEfl.cmake: Removed TEXTURE_MAPPER and 3D_GRAPHICS guards.
     11        * platform/graphics/efl/GraphicsContext3DEfl.cpp: Removed TEXTURE_MAPPER_GL and GRAPHICS_SURFACE guards.
     12        (WebCore::GraphicsContext3D::platformLayer):
     13        (WebCore::GraphicsContext3D::createGraphicsSurfaces):
     14        * platform/graphics/efl/GraphicsContext3DPrivate.cpp: Removed TEXTURE_MAPPER_GL and GRAPHICS_SURFACE guards.
     15        (WebCore::GraphicsContext3DPrivate::initialize):
     16        (WebCore::GraphicsContext3DPrivate::releaseResources):
     17        (WebCore::GraphicsContext3DPrivate::paintToTextureMapper):
     18        (WebCore::GraphicsContext3DPrivate::graphicsSurfaceFlags):
     19        * platform/graphics/efl/GraphicsContext3DPrivate.h: Removed TEXTURE_MAPPER_GL and GRAPHICS_SURFACE guards.
     20        * platform/graphics/surfaces/efl/GraphicsSurfaceCommon.cpp: Removed GRAPHICS_SURFACE guard.
     21
    1222014-08-29  Carlos Garcia Campos  <cgarcia@igalia.com>
    223

  • trunk/Source/WebCore/PlatformEfl.cmake

    r172956 r173112  
    1111    "${WEBCORE_DIR}/platform/graphics/harfbuzz/"
    1212    "${WEBCORE_DIR}/platform/graphics/harfbuzz/ng"
     13    "${WEBCORE_DIR}/platform/graphics/opengl"
    1314    "${WEBCORE_DIR}/platform/graphics/opentype"
     15    "${WEBCORE_DIR}/platform/graphics/surfaces"
     16    "${WEBCORE_DIR}/platform/graphics/surfaces/efl"
     17    "${WEBCORE_DIR}/platform/graphics/surfaces/glx"
     18    "${WEBCORE_DIR}/platform/graphics/texmap"
    1419    "${WEBCORE_DIR}/platform/graphics/texmap/coordinated"
    1520    "${WEBCORE_DIR}/platform/linux"
    … …  
    107112    platform/graphics/cairo/BitmapImageCairo.cpp
    108113    platform/graphics/cairo/CairoUtilities.cpp
     114    platform/graphics/cairo/DrawingBufferCairo.cpp
    109115    platform/graphics/cairo/FontCairo.cpp
    110116    platform/graphics/cairo/FontCairoHarfbuzzNG.cpp
    … …  
    123129
    124130    platform/graphics/efl/CairoUtilitiesEfl.cpp
     131    platform/graphics/efl/EvasGLContext.cpp
     132    platform/graphics/efl/EvasGLSurface.cpp
     133    platform/graphics/efl/GraphicsContext3DEfl.cpp
     134    platform/graphics/efl/GraphicsContext3DPrivate.cpp
    125135    platform/graphics/efl/IconEfl.cpp
    126136    platform/graphics/efl/ImageEfl.cpp
    … …  
    155165    platform/graphics/harfbuzz/HarfBuzzShaper.cpp
    156166
     167    platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
     168    platform/graphics/opengl/GLPlatformContext.cpp
     169    platform/graphics/opengl/GLPlatformSurface.cpp
     170    platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
     171    platform/graphics/opengl/TemporaryOpenGLSetting.cpp
     172
    157173    platform/graphics/opentype/OpenTypeVerticalData.cpp
     174
     175    platform/graphics/surfaces/GLTransportSurface.cpp
     176    platform/graphics/surfaces/GraphicsSurface.cpp
     177
     178    platform/graphics/surfaces/efl/GraphicsSurfaceCommon.cpp
     179
     180    platform/graphics/surfaces/glx/X11Helper.cpp
     181
     182    platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
     183    platform/graphics/texmap/TextureMapperGL.cpp
     184    platform/graphics/texmap/TextureMapperShaderProgram.cpp
    158185
    159186    platform/graphics/texmap/coordinated/AreaAllocator.cpp
    … …  
    254281    ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsApple.css
    255282)
    256 
    257 if (WTF_USE_TEXTURE_MAPPER)
    258     list(APPEND WebCore_SOURCES
    259         platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
    260     )
    261 endif ()
    262283
    263284set(WebCore_USER_AGENT_SCRIPTS
    … …  
    292313    ${PNG_LIBRARIES}
    293314    ${SQLITE_LIBRARIES}
     315    ${X11_X11_LIB}
    294316    ${ZLIB_LIBRARIES}
    295317)
    … …  
    359381endif ()
    360382
    361 if (WTF_USE_3D_GRAPHICS)
    362     list(APPEND WebCore_INCLUDE_DIRECTORIES
    363         "${WEBCORE_DIR}/platform/graphics/opengl"
    364         "${WEBCORE_DIR}/platform/graphics/surfaces"
    365         "${WEBCORE_DIR}/platform/graphics/surfaces/efl"
    366         "${WEBCORE_DIR}/platform/graphics/surfaces/glx"
    367         "${WEBCORE_DIR}/platform/graphics/texmap"
    368     )
    369 
    370     if (WTF_USE_EGL)
    371         list(APPEND WebCore_INCLUDE_DIRECTORIES
    372             ${EGL_INCLUDE_DIR}
    373             "${WEBCORE_DIR}/platform/graphics/surfaces/egl"
    374     )
    375     endif ()
    376 
    377     list(APPEND WebCore_SOURCES
    378         platform/graphics/cairo/DrawingBufferCairo.cpp
    379 
    380         platform/graphics/efl/EvasGLContext.cpp
    381         platform/graphics/efl/EvasGLSurface.cpp
    382         platform/graphics/efl/GraphicsContext3DEfl.cpp
    383         platform/graphics/efl/GraphicsContext3DPrivate.cpp
    384 
    385         platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
    386         platform/graphics/opengl/GLPlatformContext.cpp
    387         platform/graphics/opengl/GLPlatformSurface.cpp
    388         platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
    389         platform/graphics/opengl/TemporaryOpenGLSetting.cpp
    390 
    391         platform/graphics/surfaces/GLTransportSurface.cpp
    392         platform/graphics/surfaces/GraphicsSurface.cpp
    393 
    394         platform/graphics/surfaces/efl/GraphicsSurfaceCommon.cpp
    395 
    396         platform/graphics/surfaces/glx/X11Helper.cpp
    397 
    398         platform/graphics/texmap/TextureMapperGL.cpp
    399         platform/graphics/texmap/TextureMapperShaderProgram.cpp
    400     )
    401 
    402     if (WTF_USE_EGL)
    403         list(APPEND WebCore_SOURCES
    404             platform/graphics/surfaces/egl/EGLConfigSelector.cpp
    405             platform/graphics/surfaces/egl/EGLContext.cpp
    406             platform/graphics/surfaces/egl/EGLHelper.cpp
    407             platform/graphics/surfaces/egl/EGLSurface.cpp
    408             platform/graphics/surfaces/egl/EGLXSurface.cpp
    409         )
    410     else ()
    411         list(APPEND WebCore_SOURCES
    412             platform/graphics/surfaces/glx/GLXContext.cpp
    413             platform/graphics/surfaces/glx/GLXSurface.cpp
    414         )
    415     endif ()
    416 
    417     if (WTF_USE_OPENGL_ES_2)
    418         list(APPEND WebCore_SOURCES
    419             platform/graphics/opengl/Extensions3DOpenGLES.cpp
    420             platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
    421         )
    422     else ()
    423         list(APPEND WebCore_SOURCES
    424             platform/graphics/OpenGLShims.cpp
    425 
    426             platform/graphics/opengl/Extensions3DOpenGL.cpp
    427             platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
    428         )
    429     endif ()
    430 
    431     list(APPEND WebCore_LIBRARIES
    432         ${X11_X11_LIB}
    433     )
    434 
    435     if (WTF_USE_EGL)
    436         list(APPEND WebCore_LIBRARIES
    437             ${EGL_LIBRARY}
    438         )
    439     elseif (X11_Xcomposite_FOUND AND X11_Xrender_FOUND)
    440         list(APPEND WebCore_LIBRARIES
    441             ${X11_Xcomposite_LIB}
    442             ${X11_Xrender_LIB}
    443         )
    444     endif ()
     383if (WTF_USE_EGL)
     384    list(APPEND WebCore_INCLUDE_DIRECTORIES
     385        ${EGL_INCLUDE_DIR}
     386        "${WEBCORE_DIR}/platform/graphics/surfaces/egl"
     387    )
     388endif ()
     389
     390if (WTF_USE_EGL)
     391    list(APPEND WebCore_SOURCES
     392        platform/graphics/surfaces/egl/EGLConfigSelector.cpp
     393        platform/graphics/surfaces/egl/EGLContext.cpp
     394        platform/graphics/surfaces/egl/EGLHelper.cpp
     395        platform/graphics/surfaces/egl/EGLSurface.cpp
     396        platform/graphics/surfaces/egl/EGLXSurface.cpp
     397    )
     398else ()
     399    list(APPEND WebCore_SOURCES
     400        platform/graphics/surfaces/glx/GLXContext.cpp
     401        platform/graphics/surfaces/glx/GLXSurface.cpp
     402    )
     403endif ()
     404
     405if (WTF_USE_OPENGL_ES_2)
     406    list(APPEND WebCore_SOURCES
     407        platform/graphics/opengl/Extensions3DOpenGLES.cpp
     408        platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
     409    )
     410else ()
     411    list(APPEND WebCore_SOURCES
     412        platform/graphics/OpenGLShims.cpp
     413
     414        platform/graphics/opengl/Extensions3DOpenGL.cpp
     415        platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
     416    )
     417endif ()
     418
     419if (WTF_USE_EGL)
     420    list(APPEND WebCore_LIBRARIES
     421        ${EGL_LIBRARY}
     422    )
     423elseif (X11_Xcomposite_FOUND AND X11_Xrender_FOUND)
     424    list(APPEND WebCore_LIBRARIES
     425        ${X11_Xcomposite_LIB}
     426        ${X11_Xrender_LIB}
     427    )
    445428endif ()
    446429

  • trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp

    r170774 r173112  
    176176PlatformLayer* GraphicsContext3D::platformLayer() const
    177177{
    178 #if USE(TEXTURE_MAPPER_GL)
    179178    return m_private.get();
    180 #else
    181     notImplemented();
    182     return 0;
    183 #endif
    184179}
    185180
    … …  
    231226}
    232227
    233 #if USE(GRAPHICS_SURFACE)
    234228void GraphicsContext3D::createGraphicsSurfaces(const IntSize& size)
    235229{
    236230    m_private->didResizeCanvas(size);
    237231}
    238 #endif
    239232
    240233GraphicsContext3D::ImageExtractor::~ImageExtractor()

  • trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.cpp

    r170774 r173112  
    6969        if (!makeContextCurrent())
    7070            return false;
    71 #if USE(GRAPHICS_SURFACE)
    7271        m_surfaceOperation = CreateSurface;
    73 #endif
    7472    }
    7573
    … …  
    8886
    8987    // Release the current context and drawable only after destroying any associated gl resources.
    90 #if USE(GRAPHICS_SURFACE)
    9188    if (m_previousGraphicsSurface)
    9289        m_previousGraphicsSurface = nullptr;
    … …  
    9693
    9794    m_surfaceHandle = GraphicsSurfaceToken();
    98 #endif
    9995    if (m_offScreenSurface)
    10096        m_offScreenSurface->destroy();
    … …  
    164160}
    165161
    166 #if USE(TEXTURE_MAPPER_GL)
    167162void GraphicsContext3DPrivate::paintToTextureMapper(TextureMapper*, const FloatRect& /* target */, const TransformationMatrix&, float /* opacity */)
    168163{
    169164    notImplemented();
    170165}
    171 #endif
    172 
    173 #if USE(GRAPHICS_SURFACE)
     166
    174167void GraphicsContext3DPrivate::createGraphicsSurface()
    175168{
    … …  
    265258    return TextureMapperPlatformLayer::graphicsSurfaceFlags();
    266259}
    267 #endif
    268260
    269261} // namespace WebCore

  • trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.h

    r166889 r173112  
    2323
    2424#include "GraphicsContext3D.h"
    25 
    26 #if USE(TEXTURE_MAPPER_GL)
    2725#include <texmap/TextureMapperPlatformLayer.h>
    28 #endif
    29 
    3026#include "GLPlatformContext.h"
    3127
    3228namespace WebCore {
    33 class GraphicsContext3DPrivate
    34 #if USE(TEXTURE_MAPPER_GL)
    35         : public TextureMapperPlatformLayer
    36 #endif
     29class GraphicsContext3DPrivate: public TextureMapperPlatformLayer
    3730{
    3831public:
    … …  
    4437    PlatformGraphicsContext3D platformGraphicsContext3D() const;
    4538    void setContextLostCallback(std::unique_ptr<GraphicsContext3D::ContextLostCallback>);
    46 #if USE(TEXTURE_MAPPER_GL)
    4739    virtual void paintToTextureMapper(TextureMapper*, const FloatRect&, const TransformationMatrix&, float) override;
    48 #endif
    49 #if USE(GRAPHICS_SURFACE)
    5040    virtual IntSize platformLayerSize() const override;
    5141    virtual uint32_t copyToGraphicsSurface() override;
    … …  
    5343    virtual GraphicsSurface::Flags graphicsSurfaceFlags() const override;
    5444    void didResizeCanvas(const IntSize&);
    55 #endif
    5645    bool makeContextCurrent() const;
    5746
    5847private:
    59 #if USE(GRAPHICS_SURFACE)
    6048    enum PendingOperation {
    6149        Default = 0x00, // No Pending Operation.
    … …  
    6654
    6755    typedef unsigned PendingSurfaceOperation;
    68 #endif
    6956
    7057    bool initialize();
    … …  
    7764    std::unique_ptr<GLPlatformContext> m_offScreenContext;
    7865    std::unique_ptr<GLPlatformSurface> m_offScreenSurface;
    79 #if USE(GRAPHICS_SURFACE)
    8066    GraphicsSurfaceToken m_surfaceHandle;
    8167    RefPtr<GraphicsSurface> m_graphicsSurface;
    8268    RefPtr<GraphicsSurface> m_previousGraphicsSurface;
    8369    PendingSurfaceOperation m_surfaceOperation : 3;
    84 #endif
    8570    std::unique_ptr<GraphicsContext3D::ContextLostCallback> m_contextLostCallback;
    8671    ListHashSet<GC3Denum> m_syntheticErrors;

  • trunk/Source/WebCore/platform/graphics/surfaces/efl/GraphicsSurfaceCommon.cpp

    r166889 r173112  
    2626#include "config.h"
    2727#include "GraphicsSurface.h"
    28 
    29 #if USE(GRAPHICS_SURFACE)
    30 
    3128#include "GLPlatformContext.h"
    3229#include "GLTransportSurface.h"
    … …  
    268265}
    269266
    270 #endif

  • trunk/Source/cmake/OptionsEfl.cmake

    r173000 r173112  
    222222endif ()
    223223
    224 if (WTF_USE_TILED_BACKING_STORE)
    225     add_definitions(-DWTF_USE_COORDINATED_GRAPHICS=1)
    226 
    227     set(WTF_USE_TEXTURE_MAPPER 1)
    228     add_definitions(-DWTF_USE_TEXTURE_MAPPER=1)
    229 
    230     set(WTF_USE_3D_GRAPHICS 1)
    231     add_definitions(-DWTF_USE_3D_GRAPHICS=1)
    232 
    233     set(ENABLE_3D_RENDERING 1)
    234     add_definitions(-DENABLE_3D_RENDERING=1)
    235 else ()
    236     # Disable 3D graphics and WEBGL if tiled backing is disabled
    237     set(ENABLE_WEBGL 0)
    238     set(WTF_USE_3D_GRAPHICS 0)
    239     add_definitions(-DWTF_USE_3D_GRAPHICS=0)
    240 endif ()
    241 
    242 if (ENABLE_WEBGL OR WTF_USE_TILED_BACKING_STORE)
    243     set(USE_GRAPHICS_SURFACE 1)
    244     add_definitions(-DWTF_USE_GRAPHICS_SURFACE=1)
    245 
    246     option(ENABLE_GLES2 "Enable GLES Support")
    247     if (ENABLE_GLES2)
    248         find_package(GLES REQUIRED)
    249 
    250         set(WTF_USE_OPENGL_ES_2 1)
    251         add_definitions(-DWTF_USE_OPENGL_ES_2=1)
    252     else ()
    253         find_package(OpenGL REQUIRED)
    254 
    255         set(WTF_USE_OPENGL 1)
    256         add_definitions(-DWTF_USE_OPENGL=1)
    257     endif ()
    258 
    259     option(ENABLE_EGL "Enable EGL Support")
    260     if (ENABLE_EGL)
    261         find_package(EGL REQUIRED)
    262         set(WTF_USE_EGL 1)
    263         add_definitions(-DWTF_USE_EGL=1)
    264     else ()
    265         CHECK_INCLUDE_FILES("GL/glx.h" OPENGLX_FOUND)
    266         add_definitions(-DWTF_USE_GLX=1)
    267     endif ()
     224add_definitions(-DWTF_USE_COORDINATED_GRAPHICS=1)
     225
     226add_definitions(-DWTF_USE_TEXTURE_MAPPER=1)
     227
     228set(WTF_USE_3D_GRAPHICS 1)
     229add_definitions(-DWTF_USE_3D_GRAPHICS=1)
     230
     231set(ENABLE_3D_RENDERING 1)
     232add_definitions(-DENABLE_3D_RENDERING=1)
     233
     234add_definitions(-DWTF_USE_GRAPHICS_SURFACE=1)
     235
     236option(ENABLE_GLES2 "Enable GLES Support")
     237if (ENABLE_GLES2)
     238    find_package(GLES REQUIRED)
     239
     240    set(WTF_USE_OPENGL_ES_2 1)
     241    add_definitions(-DWTF_USE_OPENGL_ES_2=1)
     242else ()
     243    find_package(OpenGL REQUIRED)
     244
     245    set(WTF_USE_OPENGL 1)
     246    add_definitions(-DWTF_USE_OPENGL=1)
     247endif ()
     248
     249option(ENABLE_EGL "Enable EGL Support")
     250if (ENABLE_EGL)
     251    find_package(EGL REQUIRED)
     252    set(WTF_USE_EGL 1)
     253    add_definitions(-DWTF_USE_EGL=1)
     254else ()
     255    CHECK_INCLUDE_FILES("GL/glx.h" OPENGLX_FOUND)
     256    add_definitions(-DWTF_USE_GLX=1)
    268257endif ()
    269258

  • trunk/Tools/ChangeLog

    r173101 r173112  
     12014-08-29  Eva Balazsfalvi  <evab.u-szeged@partner.samsung.com>
     2
     3        [EFL] Remove non Coordinated Graphics code path from cmake build system after r142169
     4        https://bugs.webkit.org/show_bug.cgi?id=135560
     5
     6        Reviewed by Gyuyoung Kim.
     7
     8        * Scripts/webkitperl/FeatureList.pm: Removed TILED_BACKING_STORE guard.
     9
    1102014-08-28  Daniel Bates  <dabates@apple.com>
    211

  • trunk/Tools/Scripts/webkitperl/FeatureList.pm

    r172439 r173112  
    395395      define => "ENABLE_TEXT_AUTOSIZING", default => 0, value => \$textAutosizingSupport },
    396396
    397     { option => "tiled-backing-store", desc => "Toggle Tiled Backing Store support",
    398       define => "WTF_USE_TILED_BACKING_STORE", default => isEfl(), value => \$tiledBackingStoreSupport },
    399 
    400397    { option => "touch-events", desc => "Toggle Touch Events support",
    401398      define => "ENABLE_TOUCH_EVENTS", default => (isIOSWebKit() || isEfl() || isGtk()), value => \$touchEventsSupport },
Note: See TracChangeset for help on using the changeset viewer.