[GTK] [AC] Simplify accelerated compositing build options
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 9 Jan 2012 15:08:42 +0000 (15:08 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 9 Jan 2012 15:08:42 +0000 (15:08 +0000)
https://bugs.webkit.org/show_bug.cgi?id=75518

Patch by Martin Robinson <mrobinson@igalia.com> on 2012-01-09
Reviewed by Gustavo Noronha Silva.

.:

* configure.ac: Remove the --enable-3d-rendering option. It's enabled by
default now when accelerated compositing is enabled.
* GNUmakefile.am: Automatically enable 3D rendering when accelerated compositing
is turned on.

Source/WebCore:

* GNUmakefile.am: Automatically enable 3D rendering when AC is available.
* GNUmakefile.list.am: Clean up a comment.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@104459 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
GNUmakefile.am
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am
Source/WebCore/GNUmakefile.list.am
configure.ac

index 84e54e5..18f4501 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-01-09  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] [AC] Simplify accelerated compositing build options
+        https://bugs.webkit.org/show_bug.cgi?id=75518
+
+        Reviewed by Gustavo Noronha Silva.
+
+        * configure.ac: Remove the --enable-3d-rendering option. It's enabled by
+        default now when accelerated compositing is enabled.
+        * GNUmakefile.am: Automatically enable 3D rendering when accelerated compositing
+        is turned on.
+
 2012-01-04  Jon Lee  <jonlee@apple.com>
 
         Clicking on the cancel button on readonly and disabled search fields darkens as if the search field was editable
index ea10176..c97ef32 100644 (file)
@@ -172,7 +172,8 @@ endif
 
 if USE_ACCELERATED_COMPOSITING
 global_cppflags += \
-       -DWTF_USE_ACCELERATED_COMPOSITING=1
+       -DWTF_USE_ACCELERATED_COMPOSITING=1 \
+       -DENABLE_3D_RENDERING=1
 endif
 
 if USE_TEXTURE_MAPPER_CAIRO
index 04edd42..6649773 100644 (file)
@@ -1,3 +1,13 @@
+2012-01-09  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] [AC] Simplify accelerated compositing build options
+        https://bugs.webkit.org/show_bug.cgi?id=75518
+
+        Reviewed by Gustavo Noronha Silva.
+
+        * GNUmakefile.am: Automatically enable 3D rendering when AC is available.
+        * GNUmakefile.list.am: Clean up a comment.
+
 2012-01-09  Antti Koivisto  <antti@apple.com>
 
         possible regression: r104060 maybe causing crashes
index ebb8cdf..0943e70 100644 (file)
@@ -545,16 +545,13 @@ webcore_cppflags += -DENABLE_WEBGL=1
 endif  # END ENABLE_WEBGL
 
 # ---
-# 3D rendering (CSS3 3D transforms) support
-# ---
-if ENABLE_3D_RENDERING
-FEATURE_DEFINES += ENABLE_3D_RENDERING=1
-webcore_cppflags += -DENABLE_3D_RENDERING=1
-endif  # END ENABLE_3D_RENDERING
-
-# ---
-# Compile with accelerated compositing support
+# Accelerated compositing support
 # ---
+if USE_ACCELERATED_COMPOSITING
+FEATURE_DEFINES += \
+       ENABLE_3D_RENDERING=1 \
+       ACCELERATED_COMPOSITING=1
+endif  # END USE_ACCELERATED_COMPOSITING
 
 if USE_TEXTURE_MAPPER_CAIRO
 webcore_cppflags += \
index 6d7ea21..23c8a46 100644 (file)
@@ -5641,7 +5641,7 @@ webcore_sources += \
 endif  # END ENABLE_REQUEST_ANIMATION_FRAME
 
 # ---
-# Compile with accelerated compositing support
+# Accelerated compositing support
 # ---
 if USE_ACCELERATED_COMPOSITING
 if USE_CLUTTER
index c6d91cd..2813487 100644 (file)
@@ -381,14 +381,6 @@ AC_ARG_ENABLE(optimizations,
               [if test "$enable_debug" = "yes"; then enable_optimizations="no"; else enable_optimizations="yes"; fi])
 AC_MSG_RESULT([$enable_optimizations])
 
-# check whether to enable 3D rendering support
-AC_MSG_CHECKING([whether to enable support for 3D Rendering])
-AC_ARG_ENABLE(3d_rendering,
-              AC_HELP_STRING([--enable-3d-rendering],
-                             [enable support for 3D Rendering (experimental) [default=no]]),
-              [],[enable_3d_rendering="no"])
-AC_MSG_RESULT([$enable_3d_rendering])
-
 # check whether to enable WebGL support
 AC_MSG_CHECKING([whether to enable WebGL support])
 AC_ARG_ENABLE(webgl,
@@ -411,6 +403,16 @@ if test "$enable_webgl" = "yes" ||  test "$with_accelerated_compositing" = "open
 fi
 AC_SUBST([OPENGL_LIBS])
 
+if test "$with_accelerated_compositing" = "clutter"; then
+   PKG_CHECK_MODULES(CLUTTER, clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
+   PKG_CHECK_MODULES([CLUTTER_GTK], [clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED_VERSION])
+
+   AC_SUBST(CLUTTER_CFLAGS)
+   AC_SUBST(CLUTTER_LIBS)
+   AC_SUBST(CLUTTER_GTK_CFLAGS)
+   AC_SUBST(CLUTTER_GTK_LIBS)
+fi
+
 # check whether to enable channel messaging support
 AC_MSG_CHECKING([whether to enable HTML5 Channel Messaging support])
 AC_ARG_ENABLE(channel_messaging,
@@ -1046,17 +1048,6 @@ if test "$enable_web_audio" = "yes"; then
     AC_SUBST([LIBFFTW_LIBS])
 fi
 
-if test "$with_accelerated_compositing" = "clutter"; then
-   PKG_CHECK_MODULES(CLUTTER, clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
-   PKG_CHECK_MODULES([CLUTTER_GTK],
-                     [clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED_VERSION])
-
-   AC_SUBST(CLUTTER_CFLAGS)
-   AC_SUBST(CLUTTER_LIBS)
-   AC_SUBST(CLUTTER_GTK_CFLAGS)
-   AC_SUBST(CLUTTER_GTK_LIBS)
-fi
-
 # check for code coverage support
 if test "$enable_coverage" = "yes"; then
    COVERAGE_CFLAGS="-MD"
@@ -1138,7 +1129,6 @@ AM_CONDITIONAL([USE_CLUTTER], [test "$with_accelerated_compositing" = "clutter"]
 
 # WebKit feature conditionals
 AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug_features" = "yes"])
-AM_CONDITIONAL([ENABLE_3D_RENDERING],[test "$enable_3d_rendering" = "yes"])
 AM_CONDITIONAL([ENABLE_WEBGL],[test "$enable_webgl" = "yes"])
 AM_CONDITIONAL([ENABLE_BLOB],[test "$enable_blob" = "yes"])
 AM_CONDITIONAL([ENABLE_METER_TAG],[test "$enable_meter_tag" = "yes"])
@@ -1246,7 +1236,6 @@ Build configuration:
  Accelerated Compositing                                  : $with_accelerated_compositing
 
 Features:
- 3D Rendering                                             : $enable_3d_rendering
  WebGL                                                    : $enable_webgl
  Blob support                                             : $enable_blob
  DOM mutation observer support                            : $enable_mutation_observers