Title: [153768] trunk/Source
- Revision
- 153768
- Author
- [email protected]
- Date
- 2013-08-06 15:11:57 -0700 (Tue, 06 Aug 2013)
Log Message
Enabled WebGL on WinCairo port.
https://bugs.webkit.org/show_bug.cgi?id=119502
Reviewed by Benjamin Poulain.
Source/WebKit:
* WebKit.vcxproj/WebKit.sln: Build ANGLE libraries.
* WebKit.vcxproj/WebKit/WebKitCFLite.props: Link to ANGLE libraries.
Source/WTF:
* wtf/FeatureDefines.h: Enabled WebGL.
* wtf/Platform.h: Added definitions required for WebGL on Windows.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (153767 => 153768)
--- trunk/Source/WTF/ChangeLog 2013-08-06 22:10:02 UTC (rev 153767)
+++ trunk/Source/WTF/ChangeLog 2013-08-06 22:11:57 UTC (rev 153768)
@@ -1,3 +1,13 @@
+2013-08-06 Alex Christensen <[email protected]>
+
+ Enabled WebGL on WinCairo port.
+ https://bugs.webkit.org/show_bug.cgi?id=119502
+
+ Reviewed by Benjamin Poulain.
+
+ * wtf/FeatureDefines.h: Enabled WebGL.
+ * wtf/Platform.h: Added definitions required for WebGL on Windows.
+
2013-08-05 Mark Rowe <[email protected]>
<rdar://problem/5927399> FastMalloc should support MallocStackLogging
Modified: trunk/Source/WTF/wtf/FeatureDefines.h (153767 => 153768)
--- trunk/Source/WTF/wtf/FeatureDefines.h 2013-08-06 22:10:02 UTC (rev 153767)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2013-08-06 22:11:57 UTC (rev 153768)
@@ -245,6 +245,10 @@
#define ENABLE_VIEW_MODE_CSS_MEDIA 0
#endif
+#if !defined(ENABLE_WEBGL)
+#define ENABLE_WEBGL 1
+#endif
+
#endif /* PLATFORM(WIN_CAIRO) */
/* --------- EFL port (Unix) --------- */
Modified: trunk/Source/WTF/wtf/Platform.h (153767 => 153768)
--- trunk/Source/WTF/wtf/Platform.h 2013-08-06 22:10:02 UTC (rev 153767)
+++ trunk/Source/WTF/wtf/Platform.h 2013-08-06 22:11:57 UTC (rev 153768)
@@ -904,6 +904,13 @@
#define WTF_USE_3D_GRAPHICS 1
#endif
+#if ENABLE(WEBGL) && PLATFORM(WIN)
+#define WTF_USE_OPENGL 1
+#define WTF_USE_OPENGL_ES_2 1
+#define WTF_USE_EGL 1
+#define WTF_USE_SURFACE 1
+#endif
+
/* Qt always uses Texture Mapper */
#if PLATFORM(QT)
#define WTF_USE_TEXTURE_MAPPER 1
Modified: trunk/Source/WebKit/ChangeLog (153767 => 153768)
--- trunk/Source/WebKit/ChangeLog 2013-08-06 22:10:02 UTC (rev 153767)
+++ trunk/Source/WebKit/ChangeLog 2013-08-06 22:11:57 UTC (rev 153768)
@@ -1,3 +1,13 @@
+2013-08-06 Alex Christensen <[email protected]>
+
+ Enabled WebGL on WinCairo port.
+ https://bugs.webkit.org/show_bug.cgi?id=119502
+
+ Reviewed by Benjamin Poulain.
+
+ * WebKit.vcxproj/WebKit.sln: Build ANGLE libraries.
+ * WebKit.vcxproj/WebKit/WebKitCFLite.props: Link to ANGLE libraries.
+
2013-08-05 Mark Lam <[email protected]>
Gardening: fix build after r153728.
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCFLite.props (153767 => 153768)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCFLite.props 2013-08-06 22:10:02 UTC (rev 153767)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitCFLite.props 2013-08-06 22:11:57 UTC (rev 153768)
@@ -6,8 +6,8 @@
</PropertyGroup>
<ItemDefinitionGroup>
<Link>
- <AdditionalDependencies>CFLite.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>CFLite.lib;preprocessor.lib;translator_common.lib;translator_glsl.lib;libEGL.lib;libGLESv2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln (153767 => 153768)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln 2013-08-06 22:10:02 UTC (rev 153767)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln 2013-08-06 22:11:57 UTC (rev 153768)
@@ -776,72 +776,101 @@
{67A61940-F80B-42A0-A29D-B6DB1C27BCEE}.Release|x64.ActiveCfg = Release|x64
{67A61940-F80B-42A0-A29D-B6DB1C27BCEE}.Release|x64.Build.0 = Release|x64
{567CC448-ADB5-4FAF-8707-EEB08202452D}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {567CC448-ADB5-4FAF-8707-EEB08202452D}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
{567CC448-ADB5-4FAF-8707-EEB08202452D}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {567CC448-ADB5-4FAF-8707-EEB08202452D}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
{567CC448-ADB5-4FAF-8707-EEB08202452D}.Debug|Win32.ActiveCfg = Debug|Win32
{567CC448-ADB5-4FAF-8707-EEB08202452D}.Debug|x64.ActiveCfg = Debug|x64
{567CC448-ADB5-4FAF-8707-EEB08202452D}.Production|Win32.ActiveCfg = Production|Win32
{567CC448-ADB5-4FAF-8707-EEB08202452D}.Production|x64.ActiveCfg = Production|x64
{567CC448-ADB5-4FAF-8707-EEB08202452D}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {567CC448-ADB5-4FAF-8707-EEB08202452D}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
{567CC448-ADB5-4FAF-8707-EEB08202452D}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {567CC448-ADB5-4FAF-8707-EEB08202452D}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
{567CC448-ADB5-4FAF-8707-EEB08202452D}.Release|Win32.ActiveCfg = Release|Win32
{567CC448-ADB5-4FAF-8707-EEB08202452D}.Release|x64.ActiveCfg = Release|x64
{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug|Win32.ActiveCfg = Debug|Win32
{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug|x64.ActiveCfg = Debug|x64
{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Production|Win32.ActiveCfg = Production|Win32
{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Production|x64.ActiveCfg = Production|x64
{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release|Win32.ActiveCfg = Release|Win32
{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release|x64.ActiveCfg = Release|x64
{B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
{B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
{B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug|Win32.ActiveCfg = Debug|Win32
{B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug|x64.ActiveCfg = Debug|x64
{B5871A7A-968C-42E3-A33B-981E6F448E78}.Production|Win32.ActiveCfg = Production|Win32
{B5871A7A-968C-42E3-A33B-981E6F448E78}.Production|x64.ActiveCfg = Production|x64
{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {B5871A7A-968C-42E3-A33B-981E6F448E78}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {B5871A7A-968C-42E3-A33B-981E6F448E78}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|Win32.ActiveCfg = Release|Win32
{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|x64.ActiveCfg = Release|x64
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|Win32.ActiveCfg = Debug|Win32
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|x64.ActiveCfg = Debug|x64
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Production|Win32.ActiveCfg = Production|Win32
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Production|x64.ActiveCfg = Production|x64
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|Win32.ActiveCfg = Release|Win32
{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|x64.ActiveCfg = Release|x64
{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Debug|Win32.ActiveCfg = Debug|Win32
{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Debug|x64.ActiveCfg = Debug|x64
{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Production|Win32.ActiveCfg = Production|Win32
{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Production|x64.ActiveCfg = Production|x64
{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Release|Win32.ActiveCfg = Release|Win32
{23C3AC97-A1BF-4188-A092-8C78CF022DD7}.Release|x64.ActiveCfg = Release|x64
{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Debug|Win32.ActiveCfg = Debug|Win32
{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Debug|x64.ActiveCfg = Debug|x64
{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Production|Win32.ActiveCfg = Production|Win32
{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Production|x64.ActiveCfg = Production|x64
{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
{74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Release|Win32.ActiveCfg = Release|Win32
+ {74D9486C-8F75-46FD-B2B7-6142E09AE3A8}.Release|x64.ActiveCfg = Release|x64
{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Debug|Win32.ActiveCfg = Debug|Win32
{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Debug|x64.ActiveCfg = Debug|x64
{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Production|Win32.ActiveCfg = Production|Win32
{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Production|x64.ActiveCfg = Production|x64
{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Release|Win32.ActiveCfg = Release|Win32
{8C6B55FF-783C-4AA4-BAC2-24A1CDBEDC8A}.Release|x64.ActiveCfg = Release|x64
EndGlobalSection
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
