Skip to content
Permalink
Browse files
REGRESSION(r199738): The ANGLE update broke accelerated compositing i…
…n GTK+ port

https://bugs.webkit.org/show_bug.cgi?id=156789

Reviewed by Carlos Garcia Campos.

After the update, the ANGLE library has to be built with
ANGLE_ENABLE_ESSL and ANGLE_ENABLE_GLSL definitions in order
to compile in the support for the two translators that Linux-based
ports using OpenGL ES or OpenGL require. Missing files are also added.

* CMakeLists.txt:


Canonical link: https://commits.webkit.org/175002@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@199872 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
zdobersek committed Apr 22, 2016
1 parent a06636b commit d6be93d5eaddf95fbf35d0b30d1687eeae679a2f
Showing with 22 additions and 0 deletions.
  1. +8 −0 Source/WebCore/CMakeLists.txt
  2. +14 −0 Source/WebCore/ChangeLog
@@ -3249,6 +3249,7 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/Diagnostics.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/DirectiveHandler.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/EmulatePrecision.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ExtensionGLSL.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/glslang_lex.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/glslang_tab.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ForLoopUnroll.cpp
@@ -3271,6 +3272,7 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/ParseContext.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/PoolAlloc.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/PruneEmptyDeclarations.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RecordConstantPrecision.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RegenerateStructNames.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemovePow.cpp
${THIRDPARTY_DIR}/ANGLE/src/compiler/translator/RemoveSwitchFallThrough.cpp
@@ -3863,6 +3865,12 @@ if (ENABLE_GRAPHICS_CONTEXT_3D AND NOT WIN32)
ADD_TARGET_PROPERTIES(ANGLESupport COMPILE_FLAGS "-Wno-null-conversion")
endif ()

# Enable the ESSL and GLSL translators.
set_property(TARGET ANGLESupport
PROPERTY COMPILE_DEFINITIONS
ANGLE_ENABLE_ESSL
ANGLE_ENABLE_GLSL)

target_include_directories(ANGLESupport PRIVATE
"${THIRDPARTY_DIR}/ANGLE/include"
"${THIRDPARTY_DIR}/ANGLE/src"
@@ -1,3 +1,17 @@
2016-04-21 Zan Dobersek <zdobersek@igalia.com>

REGRESSION(r199738): The ANGLE update broke accelerated compositing in GTK+ port
https://bugs.webkit.org/show_bug.cgi?id=156789

Reviewed by Carlos Garcia Campos.

After the update, the ANGLE library has to be built with
ANGLE_ENABLE_ESSL and ANGLE_ENABLE_GLSL definitions in order
to compile in the support for the two translators that Linux-based
ports using OpenGL ES or OpenGL require. Missing files are also added.

* CMakeLists.txt:

2016-04-21 Chris Dumez <cdumez@apple.com>

Drop [UsePointersEvenForNonNullableObjectArguments] from Document

0 comments on commit d6be93d

Please sign in to comment.