libwebkit2gtk fails to link without opengl
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 21 Jun 2015 10:06:14 +0000 (10:06 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 21 Jun 2015 10:06:14 +0000 (10:06 +0000)
https://bugs.webkit.org/show_bug.cgi?id=138332

Patch by Philip Chimento <philip.chimento@gmail.com> on 2015-06-21
Reviewed by Carlos Garcia Campos.

.:

* Source/cmake/OptionsGTK.cmake: USE(TEXTURE_MAPPER) must be
enabled regardless of whether OpenGL is, because certain symbols
such as WebCore::GraphicsLayer::create() need to be built.

Source/WebCore:

* CMakeLists.txt: The third-party ANGLE directories need to be
included even if ENABLE(GRAPHICS_CONTEXT_3D) is false. They must
be included after the OpenGL headers as the comment says.
* platform/graphics/texmap/BitmapTexturePool.cpp: Remove
reference to no longer existent header file.

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

ChangeLog
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/texmap/BitmapTexturePool.cpp
Source/cmake/OptionsGTK.cmake

index 41a147a..da66c03 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2015-06-21  Philip Chimento  <philip.chimento@gmail.com>
+
+        libwebkit2gtk fails to link without opengl
+        https://bugs.webkit.org/show_bug.cgi?id=138332
+
+        Reviewed by Carlos Garcia Campos.
+
+        * Source/cmake/OptionsGTK.cmake: USE(TEXTURE_MAPPER) must be
+        enabled regardless of whether OpenGL is, because certain symbols
+        such as WebCore::GraphicsLayer::create() need to be built.
+
 2015-06-20  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         [EFL][GTK] Define GLIB_VERSION_MIN_REQUIRED and require glib 2.36 for GTK
index d67fead..a5cdb68 100644 (file)
@@ -3047,8 +3047,6 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
     endif ()
 
     list(APPEND WebCore_INCLUDE_DIRECTORIES
-        "${THIRDPARTY_DIR}/ANGLE/"
-        "${THIRDPARTY_DIR}/ANGLE/include/KHR"
         "${WEBCORE_DIR}/platform/graphics/gpu"
     )
 
@@ -3148,6 +3146,11 @@ if (ENABLE_GRAPHICS_CONTEXT_3D)
     )
 endif ()
 
+list(APPEND WebCore_INCLUDE_DIRECTORIES
+    "${THIRDPARTY_DIR}/ANGLE/"
+    "${THIRDPARTY_DIR}/ANGLE/include/KHR"
+)
+
 if (ENABLE_WEB_REPLAY)
     list(APPEND WebCore_INCLUDE_DIRECTORIES
         "${JAVASCRIPTCORE_DIR}/inspector"
index 4bd7a5b..964b793 100644 (file)
@@ -1,3 +1,16 @@
+2015-06-21  Philip Chimento  <philip.chimento@gmail.com>
+
+        libwebkit2gtk fails to link without opengl
+        https://bugs.webkit.org/show_bug.cgi?id=138332
+
+        Reviewed by Carlos Garcia Campos.
+
+        * CMakeLists.txt: The third-party ANGLE directories need to be
+        included even if ENABLE(GRAPHICS_CONTEXT_3D) is false. They must
+        be included after the OpenGL headers as the comment says.
+        * platform/graphics/texmap/BitmapTexturePool.cpp: Remove
+        reference to no longer existent header file.
+
 2015-06-20  Tim Horton  <timothy_horton@apple.com>
 
         Deselection of text causes a noticeable jump on force touch machines
index edb4ccf..67b91f0 100644 (file)
@@ -30,8 +30,6 @@
 #if USE(TEXTURE_MAPPER_GL)
 #include "BitmapTextureGL.h"
 #include "GLContext.h"
-#else
-#include "BitmapTextureImageBuffer.h"
 #endif
 
 namespace WebCore {
index 044fa91..6d39217 100644 (file)
@@ -295,6 +295,8 @@ if (ENABLE_MEDIA_STREAM)
     SET_AND_EXPOSE_TO_BUILD(USE_OPENWEBRTC TRUE)
 endif ()
 
+SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER TRUE)
+
 if (ENABLE_OPENGL)
     # ENABLE_OPENGL is true if either USE_OPENGL or ENABLE_GLES2 is true.
     # But USE_OPENGL is the opposite of ENABLE_GLES2.
@@ -318,7 +320,6 @@ if (ENABLE_OPENGL)
 
     SET_AND_EXPOSE_TO_BUILD(ENABLE_GRAPHICS_CONTEXT_3D TRUE)
 
-    SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER TRUE)
     SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER_GL TRUE)
 
     SET_AND_EXPOSE_TO_BUILD(USE_EGL ${EGL_FOUND})