Changeset 152275 in webkit


Ignore:
Timestamp:
Jul 1, 2013 6:00:38 PM (11 years ago)
Author:
kov@webkit.org
Message:

[GTK] Remove unsupported AC backends
​https://bugs.webkit.org/show_bug.cgi?id=117362

Patch by Gustavo Noronha Silva <​gustavo.noronha@collabora.com> on 2013-07-01
Reviewed by Martin Robinson.

.:

  • Source/autotools/FindDependencies.m4: remove checks related to acceleration backend,

turn them into a check for OpenGL being available, simply.

  • Source/autotools/ReadCommandLineArguments.m4: remove command line option to select

accelerated backend, it's now auto-detected.

  • Source/autotools/SetupAutoconfHeader.m4: no longer defines USE_CLUTTER and

USE_TEXTURE_MAPPER_CAIRO.

  • Source/autotools/SetupAutomake.m4: remove checks related to acceleration backend,

turn them into a check for OpenGL being available, simply.

  • Source/autotools/Versions.m4: no longer check for clutter/clutter-gtk.

Source/WebCore:

  • GNUmakefile.am:
  • GNUmakefile.list.am:
  • Source/WebCore/platform/graphics/PlatformLayer.h: Removed mentions of clutter

and the texmap cairo backend.

  • platform/graphics/clutter/DrawingBufferClutter.cpp: Removed.
  • platform/graphics/clutter/GraphicsContext3DClutter.cpp: Removed.
  • platform/graphics/clutter/GraphicsContext3DPrivate.cpp: Removed.
  • platform/graphics/clutter/GraphicsContext3DPrivate.h: Removed.
  • platform/graphics/clutter/GraphicsLayerActor.cpp: Removed.
  • platform/graphics/clutter/GraphicsLayerActor.h: Removed.
  • platform/graphics/clutter/GraphicsLayerClutter.cpp: Removed.
  • platform/graphics/clutter/GraphicsLayerClutter.h: Removed.
  • platform/graphics/clutter/PlatformClutterAnimation.cpp: Removed.
  • platform/graphics/clutter/PlatformClutterAnimation.h: Removed.
  • platform/graphics/clutter/PlatformClutterLayerClient.h: Removed.
  • platform/graphics/clutter/TransformationMatrixClutter.cpp: Removed.
  • Source/WebCore/platform/graphics/transforms/TransformationMatrix.h: Removed cogl

matrix type conversion.

Source/WebKit/gtk:

  • GNUmakefile.am:
  • WebCoreSupport/AcceleratedCompositingContext.h: removed clutter and cairo

additions.

  • WebCoreSupport/AcceleratedCompositingContextCairo.cpp: Removed.
  • WebCoreSupport/AcceleratedCompositingContextClutter.cpp: Removed.
  • webkit/webkitglobals.cpp:

(webkitInit): removed clutter-gtk initialization.

Tools:

  • gtk/jhbuild-optional.modules: no longer needs clutter-gtk, clutter

and cogl, so removed.

Location:
trunk
Files:
14 deleted
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r152267 r152275  
     12013-07-01  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
     2
     3        [GTK] Remove unsupported AC backends
     4        https://bugs.webkit.org/show_bug.cgi?id=117362
     5
     6        Reviewed by Martin Robinson.
     7
     8        * Source/autotools/FindDependencies.m4: remove checks related to acceleration backend,
     9        turn them into a check for OpenGL being available, simply.
     10        * Source/autotools/ReadCommandLineArguments.m4: remove command line option to select
     11        accelerated backend, it's now auto-detected.
     12        * Source/autotools/SetupAutoconfHeader.m4: no longer defines USE_CLUTTER and
     13        USE_TEXTURE_MAPPER_CAIRO.
     14        * Source/autotools/SetupAutomake.m4: remove checks related to acceleration backend,
     15        turn them into a check for OpenGL being available, simply.
     16        * Source/autotools/Versions.m4: no longer check for clutter/clutter-gtk.
     17
    1182013-07-01  Timothy Hatcher  <timothy@apple.com>
    219

  • trunk/Source/Platform/GNUmakefile.am

    r151587 r152275  
    4040        -I$(srcdir)/Source/WebCore/platform/graphics/gtk \
    4141        -I$(srcdir)/Source/WebCore/platform/graphics/harfbuzz \
     42        -I$(srcdir)/Source/WebCore/platform/graphics/opengl \
    4243        -I$(srcdir)/Source/WebCore/platform/graphics/texmap \
    4344        -I$(srcdir)/Source/WebCore/platform/graphics/transforms \

  • trunk/Source/WebCore/ChangeLog

    r152269 r152275  
     12013-07-01  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
     2
     3        [GTK] Remove unsupported AC backends
     4        https://bugs.webkit.org/show_bug.cgi?id=117362
     5
     6        Reviewed by Martin Robinson.
     7
     8        * GNUmakefile.am:
     9        * GNUmakefile.list.am:
     10        * Source/WebCore/platform/graphics/PlatformLayer.h: Removed mentions of clutter
     11        and the texmap cairo backend.
     12        * platform/graphics/clutter/DrawingBufferClutter.cpp: Removed.
     13        * platform/graphics/clutter/GraphicsContext3DClutter.cpp: Removed.
     14        * platform/graphics/clutter/GraphicsContext3DPrivate.cpp: Removed.
     15        * platform/graphics/clutter/GraphicsContext3DPrivate.h: Removed.
     16        * platform/graphics/clutter/GraphicsLayerActor.cpp: Removed.
     17        * platform/graphics/clutter/GraphicsLayerActor.h: Removed.
     18        * platform/graphics/clutter/GraphicsLayerClutter.cpp: Removed.
     19        * platform/graphics/clutter/GraphicsLayerClutter.h: Removed.
     20        * platform/graphics/clutter/PlatformClutterAnimation.cpp: Removed.
     21        * platform/graphics/clutter/PlatformClutterAnimation.h: Removed.
     22        * platform/graphics/clutter/PlatformClutterLayerClient.h: Removed.
     23        * platform/graphics/clutter/TransformationMatrixClutter.cpp: Removed.
     24        * Source/WebCore/platform/graphics/transforms/TransformationMatrix.h: Removed cogl
     25        matrix type conversion.
     26
    1272013-07-01  Alex Christensen  <achristensen@apple.com>
    228

  • trunk/Source/WebCore/GNUmakefile.am

    r152100 r152275  
    203203        $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --attrs $(WebCore)/svg/xlinkattrs.in --outputDir "$(GENSOURCES_WEBCORE)"
    204204
    205 if USE_TEXTURE_MAPPER_CAIRO
    206 webcore_cppflags += \
    207         -I$(srcdir)/Source/WebCore/platform/graphics/texmap
    208 endif  # END USE_TEXTURE_MAPPER_CAIRO
    209 
    210205if USE_TEXTURE_MAPPER_GL
    211206webcore_cppflags += \
    212207        -I$(srcdir)/Source/WebCore/platform/graphics/texmap
    213208endif  # END USETEXTURE_MAPPER_GL
    214 
    215 if USE_CLUTTER
    216 webcore_cppflags += \
    217         -I$(srcdir)/Source/WebCore/platform/clutter \
    218         -I$(srcdir)/Source/WebCore/platform/graphics/clutter
    219 endif  # END USE_CLUTTER
    220209
    221210if ENABLE_INDEXED_DATABASE
    … …  
    491480        -fno-strict-aliasing \
    492481        $(CAIRO_CFLAGS) \
    493         $(CLUTTER_CFLAGS) \
    494482        $(COVERAGE_CFLAGS) \
    495483        $(ENCHANT_CFLAGS) \
    … …  
    538526        -fno-strict-aliasing \
    539527        $(CAIRO_CFLAGS) \
    540         $(CLUTTER_CFLAGS) \
    541528        $(COVERAGE_CFLAGS) \
    542529        $(ENCHANT_CFLAGS) \
    … …  
    586573        -fno-strict-aliasing \
    587574        $(CAIRO_CFLAGS) \
    588         $(CLUTTER_CFLAGS) \
    589575        $(COVERAGE_CFLAGS) \
    590576        $(ENCHANT_CFLAGS) \

  • trunk/Source/WebCore/GNUmakefile.list.am

    r152235 r152275  
    56555655        Source/WebCore/platform/graphics/cairo/CairoUtilities.h \
    56565656        Source/WebCore/platform/graphics/cairo/DrawErrorUnderline.h \
     5657        Source/WebCore/platform/graphics/cairo/DrawingBufferCairo.cpp \
    56575658        Source/WebCore/platform/graphics/cairo/FloatRectCairo.cpp \
    56585659        Source/WebCore/platform/graphics/cairo/FontCairo.cpp \
    … …  
    56605661        Source/WebCore/platform/graphics/cairo/FontCustomPlatformData.h \
    56615662        Source/WebCore/platform/graphics/cairo/GradientCairo.cpp \
     5663        Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp \
     5664        Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp \
     5665        Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.h \
    56625666        Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp \
    56635667        Source/WebCore/platform/graphics/cairo/ImageBufferDataCairo.h \
    … …  
    63536357endif
    63546358
    6355 if USE_CLUTTER
    6356 webcore_sources += \
    6357         Source/WebCore/platform/graphics/clutter/DrawingBufferClutter.cpp \
    6358         Source/WebCore/platform/graphics/clutter/GraphicsContext3DClutter.cpp \
    6359         Source/WebCore/platform/graphics/clutter/GraphicsContext3DPrivate.cpp \
    6360         Source/WebCore/platform/graphics/clutter/GraphicsContext3DPrivate.h
    6361 else
    6362 webcore_sources += \
    6363         Source/WebCore/platform/graphics/cairo/DrawingBufferCairo.cpp \
    6364         Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp \
    6365         Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.cpp \
    6366         Source/WebCore/platform/graphics/cairo/GraphicsContext3DPrivate.h
    6367 endif  # END USE_CLUTTER
    6368 
    63696359# ---
    63706360# Accelerated compositing support
    63716361# ---
    63726362if USE_ACCELERATED_COMPOSITING
    6373 if USE_CLUTTER
    6374 webcore_sources += \
    6375         Source/WebCore/platform/graphics/clutter/GraphicsLayerActor.cpp \
    6376         Source/WebCore/platform/graphics/clutter/GraphicsLayerActor.h \
    6377         Source/WebCore/platform/graphics/clutter/GraphicsLayerClutter.cpp \
    6378         Source/WebCore/platform/graphics/clutter/GraphicsLayerClutter.h \
    6379         Source/WebCore/platform/graphics/clutter/PlatformClutterAnimation.cpp \
    6380         Source/WebCore/platform/graphics/clutter/PlatformClutterAnimation.h \
    6381         Source/WebCore/platform/graphics/clutter/TransformationMatrixClutter.cpp
    6382 endif  # END USE_CLUTTER
    6383 
    6384 if USE_TEXTURE_MAPPER_CAIRO
    6385 webcore_sources += \
    6386         Source/WebCore//platform/graphics/filters/texmap/CustomFilterValidatedProgramTextureMapper.cpp \
    6387         Source/WebCore//platform/graphics/filters/texmap/TextureMapperPlatformCompiledProgram.h \
    6388         Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp \
    6389         Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.h \
    6390         Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp \
    6391         Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h \
    6392         Source/WebCore/platform/graphics/GraphicsLayerTransform.cpp \
    6393         Source/WebCore/platform/graphics/GraphicsLayerTransform.h \
    6394         Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp \
    6395         Source/WebCore/platform/graphics/GraphicsLayerAnimation.h \
    6396         Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.cpp \
    6397         Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h \
    6398         Source/WebCore/platform/graphics/texmap/TextureMapper.cpp \
    6399         Source/WebCore/platform/graphics/texmap/TextureMapper.h \
    6400         Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.cpp \
    6401         Source/WebCore/platform/graphics/texmap/TextureMapperFPSCounter.h \
    6402         Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp \
    6403         Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h \
    6404         Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp \
    6405         Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h \
    6406         Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h \
    6407         Source/WebCore/platform/graphics/texmap/TextureMapperSurfaceBackingStore.cpp \
    6408         Source/WebCore/platform/graphics/texmap/TextureMapperSurfaceBackingStore.h \
    6409         Source/WebCore/platform/graphics/texmap/TextureMapperTile.cpp \
    6410         Source/WebCore/platform/graphics/texmap/TextureMapperTile.h \
    6411         Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.cpp \
    6412         Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.h
    6413 endif  # END USE_TEXTURE_MAPPER_CAIRO
    6414 
    64156363if USE_TEXTURE_MAPPER_GL
    64166364webcore_sources += \

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

    r147888 r152275  
    4040};
    4141#elif PLATFORM(GTK)
    42 #if USE(TEXTURE_MAPPER_CAIRO) || USE(TEXTURE_MAPPER_GL)
     42#if USE(TEXTURE_MAPPER_GL)
    4343namespace WebCore {
    4444class TextureMapperPlatformLayer;
    4545typedef TextureMapperPlatformLayer PlatformLayer;
    46 };
    47 #elif USE(CLUTTER)
    48 typedef struct _ClutterActor ClutterActor;
    49 namespace WebCore {
    50 typedef ClutterActor PlatformLayer;
    5146};
    5247#endif

  • trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h

    r149193 r152275  
    3535#if USE(CA)
    3636typedef struct CATransform3D CATransform3D;
    37 #endif
    38 #if USE(CLUTTER)
    39 typedef struct _CoglMatrix CoglMatrix;
    4037#endif
    4138#if USE(CG)
    … …  
    335332    operator CATransform3D() const;
    336333#endif
    337 #if USE(CLUTTER)
    338     TransformationMatrix(const CoglMatrix*);
    339     operator CoglMatrix() const;
    340 #endif
    341334#if USE(CG)
    342335    TransformationMatrix(const CGAffineTransform&);

  • trunk/Source/WebKit/gtk/ChangeLog

    r152216 r152275  
     12013-07-01  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
     2
     3        [GTK] Remove unsupported AC backends
     4        https://bugs.webkit.org/show_bug.cgi?id=117362
     5
     6        Reviewed by Martin Robinson.
     7
     8        * GNUmakefile.am:
     9        * WebCoreSupport/AcceleratedCompositingContext.h: removed clutter and cairo
     10        additions.
     11        * WebCoreSupport/AcceleratedCompositingContextCairo.cpp: Removed.
     12        * WebCoreSupport/AcceleratedCompositingContextClutter.cpp: Removed.
     13        * webkit/webkitglobals.cpp:
     14        (webkitInit): removed clutter-gtk initialization.
     15
    1162013-07-01  ChangSeok Oh  <changseok.oh@collabora.com>
    217

  • trunk/Source/WebKit/gtk/GNUmakefile.am

    r150074 r152275  
    5656        $(webkitgtk_cppflags) \
    5757        -fno-strict-aliasing \
    58         $(CLUTTER_CFLAGS) \
    59         $(CLUTTER_GTK_CFLAGS) \
    6058        $(COVERAGE_CFLAGS) \
    6159        $(ENCHANT_CFLAGS) \
    … …  
    109107        libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
    110108        $(CAIRO_LIBS) \
    111         $(CLUTTER_LIBS) \
    112         $(CLUTTER_GTK_LIBS) \
    113109        $(COVERAGE_LDFLAGS) \
    114110        $(ENCHANT_LIBS) \
    … …  
    194190webkitgtk_sources += \
    195191        Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContext.h \
    196         Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextClutter.cpp \
    197192        Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp \
    198         Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextCairo.cpp \
    199193        Source/WebKit/gtk/WebCoreSupport/AssertMatchingEnums.cpp \
    200194        Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \

  • trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContext.h

    r142595 r152275  
    7676    unsigned int m_layerFlushTimerCallbackId;
    7777
    78 #if USE(CLUTTER)
    79     GtkWidget* m_rootLayerEmbedder;
    80     OwnPtr<WebCore::GraphicsLayer> m_rootLayer;
    81     OwnPtr<WebCore::GraphicsLayer> m_nonCompositedContentLayer;
    82 
    83     static gboolean layerFlushTimerFiredCallback(AcceleratedCompositingContext*);
    84 #elif USE(TEXTURE_MAPPER_GL)
     78#if USE(TEXTURE_MAPPER_GL)
    8579    OwnPtr<WebCore::RedirectedXCompositeWindow> m_redirectedWindow;
    8680    OwnPtr<WebCore::GraphicsLayer> m_rootLayer;

  • trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp

    r151638 r152275  
    5555#include <wtf/gobject/GOwnPtr.h>
    5656#include <wtf/gobject/GRefPtr.h>
    57 
    58 #if USE(CLUTTER)
    59 #include <clutter-gtk/clutter-gtk.h>
    60 #endif
    6157
    6258static WebKitCacheModel cacheModel = WEBKIT_CACHE_MODEL_DEFAULT;
    … …  
    565561    WebCore::ResourceHandle::setIgnoreSSLErrors(true);
    566562
    567 #if USE(CLUTTER)
    568     gtk_clutter_init(0, 0);
    569 #endif
    570 
    571563    atexit(webkitExit);
    572564}

  • trunk/Source/autotools/FindDependencies.m4

    r152163 r152275  
    257257fi
    258258
    259 if test "$with_acceleration_backend" = "auto"; then
    260     if test "$found_opengl" = "yes"; then
    261         with_acceleration_backend="opengl";
    262     else
    263         with_acceleration_backend="none";
    264     fi
    265 fi
    266 
    267 if test "$with_acceleration_backend" = "opengl"; then
     259if test "$found_opengl" = "yes"; then
    268260    PKG_CHECK_MODULES([XCOMPOSITE], [xcomposite]);
    269261    PKG_CHECK_MODULES([XDAMAGE], [xdamage]);
    … …  
    274266fi
    275267
    276 # OpenGL is turned on by default (along with WebGL and accelerated compositing), but if Clutter is chosen
    277 # as the accelerated drawing backend, we want to disable it. COGL does not play well with OpenGL.
     268# OpenGL is turned on by default if available (along with WebGL and accelerated compositing).
    278269if test "$enable_webgl" = "auto"; then
    279     if test "$with_acceleration_backend" = "opengl"; then
     270    if test "$found_opengl" = yes; then
    280271        enable_webgl="yes";
    281272    else
    … …  
    284275fi
    285276
    286 if test "$enable_webgl" = "yes" && test "$with_acceleration_backend" != "opengl"; then
    287     AC_MSG_ERROR([OpenGL must be active (and Clutter disabled) to use WebGL.])
     277if test "$enable_webgl" = "yes" && test "$found_opengl" != "yes"; then
     278    AC_MSG_ERROR([OpenGL must be active to use WebGL.])
    288279fi;
    289280
    290 if test "$enable_accelerated_compositing" = "yes" && test "$with_acceleration_backend" = "none"; then
    291     AC_MSG_ERROR([OpenGL or Clutter must be active to use accelerated compositing.])
     281if test "$enable_accelerated_compositing" = "yes" && test "$found_opengl" != "yes"; then
     282    AC_MSG_ERROR([OpenGL must be active to use accelerated compositing.])
    292283fi
    293284
    294285if test "$enable_accelerated_compositing" = "auto"; then
    295     if test "$with_acceleration_backend" != "none"; then
     286    if test "$found_opengl" = "yes"; then
    296287        enable_accelerated_compositing="yes";
    297288    else
    … …  
    334325enable_css_shaders=no;
    335326AC_MSG_CHECKING([whether to enable CSS Filters and Shaders])
    336 if test "$enable_accelerated_compositing" = "yes" && test "$with_acceleration_backend" = "opengl"; then
     327if test "$enable_accelerated_compositing" = "yes" && test "$found_opengl" = "yes"; then
    337328    enable_css_filters=yes;
    338329    enable_css_shaders=yes;
    … …  
    433424fi
    434425
    435 acceleration_backend_description=$with_acceleration_backend
    436 if test "$with_acceleration_backend" = "clutter"; then
    437     PKG_CHECK_MODULES(CLUTTER, clutter-1.0 >= clutter_required_version)
    438     PKG_CHECK_MODULES([CLUTTER_GTK], [clutter-gtk-1.0 >= clutter_gtk_required_version])
    439 
    440     AC_SUBST(CLUTTER_CFLAGS)
    441     AC_SUBST(CLUTTER_LIBS)
    442     AC_SUBST(CLUTTER_GTK_CFLAGS)
    443     AC_SUBST(CLUTTER_GTK_LIBS)
    444 
    445     enable_gles2=no
    446     enable_glx=no
    447     enable_egl=no
    448 fi
    449 
    450 if test "$with_acceleration_backend" = "opengl"; then
     426acceleration_description=
     427if test "$found_opengl" = "yes"; then
     428    acceleration_description="OpenGL"
    451429    if test "$enable_gles2" = "yes"; then
    452         acceleration_backend_description="$acceleration_backend_description (gles2"
     430        acceleration_description="$acceleration_description (gles2"
    453431        OPENGL_LIBS="-lGLESv2"
    454432    else
    455         acceleration_backend_description="$acceleration_backend_description (gl"
     433        acceleration_description="$acceleration_description (gl"
    456434        OPENGL_LIBS="-lGL"
    457435    fi
    458436    if test "$enable_egl" = "yes"; then
    459         acceleration_backend_description="$acceleration_backend_description, egl"
     437        acceleration_description="$acceleration_description, egl"
    460438        OPENGL_LIBS="$OPENGL_LIBS -lEGL"
    461439    fi
    462440    if test "$enable_glx" = "yes"; then
    463         acceleration_backend_description="$acceleration_backend_description, glx"
     441        acceleration_description="$acceleration_description, glx"
    464442    fi
    465443
    … …  
    470448
    471449    OPENGL_LIBS="$OPENGL_LIBS $DLOPEN_LIBS"
    472     acceleration_backend_description="$acceleration_backend_description)"
     450    acceleration_description="$acceleration_description)"
    473451fi
    474452AC_SUBST([OPENGL_LIBS])
    475453
    476454enable_accelerated_canvas=no
    477 if test "$enable_accelerated_compositing" = "yes" && test "$with_acceleration_backend" = "opengl"; then
     455if test "$enable_accelerated_compositing" = "yes" && test "$found_opengl" = "yes"; then
    478456    CAIRO_GL_LIBS="cairo-gl"
    479457    if test "$enable_glx" = "yes"; then

  • trunk/Source/autotools/ReadCommandLineArguments.m4

    r149759 r152275  
    169169AC_MSG_RESULT([$enable_debug_symbols])
    170170
    171 AC_MSG_CHECKING([which GPU acceleration backend to use])
    172 AC_ARG_WITH(acceleration_backend,
    173     AC_HELP_STRING([--with-acceleration-backend=@<:@opengl/clutter/none@:>@],
    174         [Select accelerated backend (Clutter currently unsupported, OpenGL autodetected) [default=autodetect]]),
    175     [],
    176     [with_acceleration_backend="auto"])
    177 AC_MSG_RESULT([$with_acceleration_backend])
    178 
    179171AC_MSG_CHECKING([whether to enable WebGL support])
    180172AC_ARG_ENABLE(webgl, AC_HELP_STRING([--enable-webgl], [enable support for WebGL [default=check]]),

  • trunk/Source/autotools/SetupAutoconfHeader.m4

    r151674 r152275  
    6565if test "$enable_accelerated_compositing" = "yes"; then
    6666    AC_DEFINE([WTF_USE_ACCELERATED_COMPOSITING], [1], [ ])
    67 
    68     if test "$with_acceleration_backend" = "none"; then
    69         AC_DEFINE([WTF_USE_TEXTURE_MAPPER], [1], [ ])
    70         AC_DEFINE([WTF_USE_TEXTURE_MAPPER_CAIRO], [1], [ ])
    71     fi
    72 
    73     if test "$with_acceleration_backend" = "opengl"; then
    74         AC_DEFINE([WTF_USE_TEXTURE_MAPPER], [1], [ ])
    75         AC_DEFINE([WTF_USE_TEXTURE_MAPPER_GL], [1], [ ])
    76     fi
    77 
    78     if test "$with_acceleration_backend" = "clutter"; then
    79         AC_DEFINE([WTF_USE_CLUTTER], [1], [ ])
    80     fi
    81 fi
    82 
    83 if test "$with_acceleration_backend" = "opengl"; then
    8467    AC_DEFINE([WTF_USE_OPENGL], [1], [ ])
     68    AC_DEFINE([WTF_USE_TEXTURE_MAPPER], [1], [ ])
     69    AC_DEFINE([WTF_USE_TEXTURE_MAPPER_GL], [1], [ ])
    8570fi
    8671

  • trunk/Source/autotools/SetupAutomake.m4

    r146468 r152275  
    3838# Accelerated compositing conditionals.
    3939AM_CONDITIONAL([USE_ACCELERATED_COMPOSITING], [test "$enable_accelerated_compositing" = "yes"])
    40 AM_CONDITIONAL([USE_TEXTURE_MAPPER_CAIRO],
    41     [test "$enable_accelerated_compositing" = "yes" && test "$with_acceleration_backend" = "none"])
    4240AM_CONDITIONAL([USE_TEXTURE_MAPPER_GL],
    43     [test "$enable_accelerated_compositing" = "yes" && test "$with_acceleration_backend" = "opengl"])
    44 AM_CONDITIONAL([USE_CLUTTER], [test "$with_acceleration_backend" = "clutter"])
     41    [test "$enable_accelerated_compositing" = "yes" && test "$found_opengl" = "yes"])
    4542
    4643# These are the same for now, but they will soon be separate.
    47 AM_CONDITIONAL([USE_OPENGL], [test "$with_acceleration_backend" = "opengl"])
     44AM_CONDITIONAL([USE_OPENGL], [test "$found_opengl" = "yes"])
    4845AM_CONDITIONAL([USE_EGL], [test "$enable_egl" = "yes"])
    4946AM_CONDITIONAL([USE_GLES2], [test "$enable_gles2" = "yes"])

  • trunk/Source/autotools/Versions.m4

    r151679 r152275  
    3636m4_define([pango_required_version], [1.30.0])
    3737m4_define([sqlite_required_version], [3.0])
    38 
    39 m4_define([clutter_required_version], [1.14])
    40 m4_define([clutter_gtk_required_version], [1.4])
    41 

  • trunk/Tools/ChangeLog

    r152267 r152275  
     12013-07-01  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
     2
     3        [GTK] Remove unsupported AC backends
     4        https://bugs.webkit.org/show_bug.cgi?id=117362
     5
     6        Reviewed by Martin Robinson.
     7
     8        * gtk/jhbuild-optional.modules: no longer needs clutter-gtk, clutter
     9        and cogl, so removed.
     10
    1112013-07-01  Timothy Hatcher  <timothy@apple.com>
    212

  • trunk/Tools/gtk/jhbuild-optional.modules

    r149108 r152275  
    77       certain distributions. Feel free to add more here, within reason,
    88       as long as they are not built by default. -->
    9 
    10   <metamodule id="webkitgtk-clutter-dependencies">
    11     <dependencies>
    12       <dep package="clutter"/>
    13       <dep package="clutter-gtk"/>
    14       <dep package="cogl"/>
    15     </dependencies>
    16   </metamodule>
    179
    1810  <repository type="tarball" name="ftp.gnome.org"
    … …  
    2517  </autotools>
    2618
    27   <autotools id="cogl"
    28             autogen-sh="configure"
    29             autogenargs="--disable-introspection">
    30     <branch module="/pub/GNOME/sources/cogl/1.14/cogl-1.14.0.tar.xz" version="1.14.0"
    31             repo="ftp.gnome.org"
    32             hash="sha256:276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8"/>
    33   </autotools>
    34 
    35   <autotools id="clutter"
    36            autogen-sh="configure"
    37            autogenargs="--disable-introspection">
    38     <dependencies>
    39       <dep package="cogl"/>
    40       <dep package="atk"/>
    41     </dependencies>
    42     <branch module="/pub/GNOME/sources/clutter/1.14/clutter-1.14.0.tar.xz" version="1.14.0"
    43             repo="ftp.gnome.org"
    44             hash="sha256:3b7a07373c27fad4f0cf59fd66a6855d66f9a42b7b570a00ca51a8b488af64d5"/>
    45   </autotools>
    46 
    47   <autotools id="clutter-gtk"
    48            autogen-sh="configure"
    49            autogenargs="--disable-introspection">
    50     <dependencies>
    51       <dep package="clutter"/>
    52     </dependencies>
    53     <branch module="/pub/GNOME/sources/clutter-gtk/1.4/clutter-gtk-1.4.4.tar.xz" version="1.4.4"
    54             repo="ftp.gnome.org"             
    55             hash="sha256:bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e"/>
    56   </autotools>
    57 
    5819</moduleset>
Note: See TracChangeset for help on using the changeset viewer.