Changeset 152454 in webkit


Ignore:
Timestamp:
Jul 8, 2013 8:54:26 AM (11 years ago)
Author:
zandobersek@gmail.com
Message:

[Autoconf] Define WTF_USE_OPENGL when OpenGL was found
https://bugs.webkit.org/show_bug.cgi?id=118341

Reviewed by Gustavo Noronha Silva.

After r152275, WTF_USE_OPENGL is only defined if the accelerated compositing is enabled.
This breaks the build if disabling the accelerated compositing feature as the OpenGL-specific
code is not compiled anymore even if it's still required.

To avoid that, WTF_USE_OPENGL should be defined if OpenGL was found. The accelerated compositing
feature also relies on this condition, exiting the configuration process with an error otherwise.

  • Source/autotools/SetupAutoconfHeader.m4:
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r152275 r152454  
     12013-07-08  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        [Autoconf] Define WTF_USE_OPENGL when OpenGL was found
     4        https://bugs.webkit.org/show_bug.cgi?id=118341
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        After r152275, WTF_USE_OPENGL is only defined if the accelerated compositing is enabled.
     9        This breaks the build if disabling the accelerated compositing feature as the OpenGL-specific
     10        code is not compiled anymore even if it's still required.
     11
     12        To avoid that, WTF_USE_OPENGL should be defined if OpenGL was found. The accelerated compositing
     13        feature also relies on this condition, exiting the configuration process with an error otherwise.
     14
     15        * Source/autotools/SetupAutoconfHeader.m4:
     16
    1172013-07-01  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
    218
  • trunk/Source/autotools/SetupAutoconfHeader.m4

    r152275 r152454  
    6565if test "$enable_accelerated_compositing" = "yes"; then
    6666    AC_DEFINE([WTF_USE_ACCELERATED_COMPOSITING], [1], [ ])
    67     AC_DEFINE([WTF_USE_OPENGL], [1], [ ])
    6867    AC_DEFINE([WTF_USE_TEXTURE_MAPPER], [1], [ ])
    6968    AC_DEFINE([WTF_USE_TEXTURE_MAPPER_GL], [1], [ ])
     69fi
     70
     71if test "$found_opengl" = "yes"; then
     72    AC_DEFINE([WTF_USE_OPENGL], [1], [ ])
    7073fi
    7174
Note: See TracChangeset for help on using the changeset viewer.