Title: [133623] trunk/Source/WTF
- Revision
- 133623
- Author
- [email protected]
- Date
- 2012-11-06 09:31:30 -0800 (Tue, 06 Nov 2012)
Log Message
Refactor setting TEXTURE_MAPPER_GL
https://bugs.webkit.org/show_bug.cgi?id=99758
Patch by Laszlo Gombos <[email protected]> on 2012-11-06
Reviewed by Noam Rosenthal.
Make the rule that sets the default for USE(3D_GRAPHICS) port independent.
If not set, set USE(TEXTURE_MAPPER_GL) when USE(TEXTURE_MAPPER) and
USE(3D_GRAPHICS) is enabled.
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (133622 => 133623)
--- trunk/Source/WTF/ChangeLog 2012-11-06 17:28:03 UTC (rev 133622)
+++ trunk/Source/WTF/ChangeLog 2012-11-06 17:31:30 UTC (rev 133623)
@@ -1,3 +1,17 @@
+2012-11-06 Laszlo Gombos <[email protected]>
+
+ Refactor setting TEXTURE_MAPPER_GL
+ https://bugs.webkit.org/show_bug.cgi?id=99758
+
+ Reviewed by Noam Rosenthal.
+
+ Make the rule that sets the default for USE(3D_GRAPHICS) port independent.
+
+ If not set, set USE(TEXTURE_MAPPER_GL) when USE(TEXTURE_MAPPER) and
+ USE(3D_GRAPHICS) is enabled.
+
+ * wtf/Platform.h:
+
2012-11-05 Philip Rogers <[email protected]>
Unblock SVG external references
Modified: trunk/Source/WTF/wtf/Platform.h (133622 => 133623)
--- trunk/Source/WTF/wtf/Platform.h 2012-11-06 17:28:03 UTC (rev 133622)
+++ trunk/Source/WTF/wtf/Platform.h 2012-11-06 17:31:30 UTC (rev 133623)
@@ -1052,17 +1052,17 @@
#define ENABLE_CSS_IMAGE_SET 1
#endif
+#if ENABLE(WEBGL) && !defined(WTF_USE_3D_GRAPHICS)
+#define WTF_USE_3D_GRAPHICS 1
+#endif
/* Qt always uses Texture Mapper */
#if PLATFORM(QT)
#define WTF_USE_TEXTURE_MAPPER 1
-#if USE(3D_GRAPHICS)
-#define WTF_USE_TEXTURE_MAPPER_GL 1
#endif
-#endif
-#if ENABLE(WEBGL) && !defined(WTF_USE_3D_GRAPHICS)
-#define WTF_USE_3D_GRAPHICS 1
+#if USE(TEXTURE_MAPPER) && USE(3D_GRAPHICS) && !defined(WTF_USE_TEXTURE_MAPPER_GL)
+#define WTF_USE_TEXTURE_MAPPER_GL 1
#endif
/* Compositing on the UI-process in WebKit2 */
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
