Title: [191619] trunk/Source/WebCore
Revision
191619
Author
[email protected]
Date
2015-10-26 22:16:17 -0700 (Mon, 26 Oct 2015)

Log Message

[GTK] [Stable] Build GL texture mapper only if USE_TEXTURE_MAPPER_GL
https://bugs.webkit.org/show_bug.cgi?id=148606

Unreviewed, build-only change.

No new tests, build-only change.

Patch by Philip Chimento <[email protected]> on 2015-10-26

* PlatformGTK.cmake: Remove sources requiring GL from list of
sources that are built when USE_TEXTURE_MAPPER is true, and add a
separate condition within the USE_TEXTURE_MAPPER condition to
build those sources when USE_TEXTURE_MAPPER_GL is true.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (191618 => 191619)


--- trunk/Source/WebCore/ChangeLog	2015-10-27 05:15:50 UTC (rev 191618)
+++ trunk/Source/WebCore/ChangeLog	2015-10-27 05:16:17 UTC (rev 191619)
@@ -1,3 +1,17 @@
+2015-10-26  Philip Chimento  <[email protected]>
+
+        [GTK] [Stable] Build GL texture mapper only if USE_TEXTURE_MAPPER_GL
+        https://bugs.webkit.org/show_bug.cgi?id=148606
+
+        Unreviewed, build-only change.
+
+        No new tests, build-only change.
+
+        * PlatformGTK.cmake: Remove sources requiring GL from list of
+        sources that are built when USE_TEXTURE_MAPPER is true, and add a
+        separate condition within the USE_TEXTURE_MAPPER condition to
+        build those sources when USE_TEXTURE_MAPPER_GL is true.
+
 2015-10-26  Simon Fraser  <[email protected]>
 
         Remove redundant GraphicsContext::clip(const Path&, WindRule)

Modified: trunk/Source/WebCore/PlatformGTK.cmake (191618 => 191619)


--- trunk/Source/WebCore/PlatformGTK.cmake	2015-10-27 05:15:50 UTC (rev 191618)
+++ trunk/Source/WebCore/PlatformGTK.cmake	2015-10-27 05:16:17 UTC (rev 191619)
@@ -414,12 +414,17 @@
     )
     list(APPEND WebCore_SOURCES
         platform/graphics/texmap/BitmapTexture.cpp
-        platform/graphics/texmap/BitmapTextureGL.cpp
         platform/graphics/texmap/BitmapTexturePool.cpp
         platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
-        platform/graphics/texmap/TextureMapperGL.cpp
-        platform/graphics/texmap/TextureMapperShaderProgram.cpp
     )
+
+    if (USE_TEXTURE_MAPPER_GL)
+        list(APPEND WebCore_SOURCES
+            platform/graphics/texmap/BitmapTextureGL.cpp
+            platform/graphics/texmap/TextureMapperGL.cpp
+            platform/graphics/texmap/TextureMapperShaderProgram.cpp
+        )
+    endif ()
 endif ()
 
 if (ENABLE_THREADED_COMPOSITOR)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to