Title: [160725] trunk/Source
- Revision
- 160725
- Author
- [email protected]
- Date
- 2013-12-17 13:18:36 -0800 (Tue, 17 Dec 2013)
Log Message
Compile fix for WebGL on Windows without GRAPHICS_SURFACE.
https://bugs.webkit.org/show_bug.cgi?id=125867
Patch by Alex Christensen <[email protected]> on 2013-12-17
Reviewed by Martin Robinson.
Source/WebCore:
* platform/graphics/opengl/GLPlatformSurface.cpp:
(WebCore::GLPlatformSurface::createOffScreenSurface):
Protect reference to EGLOffScreenSurface with USE(GRAPHICS_SURFACE).
Source/WTF:
* wtf/FeatureDefines.h:
Removed unused ENABLE_GLIB_SUPPORT macro.
* wtf/Platform.h:
Don't use GRAPHICS_SURFACE for WebGL on Windows.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (160724 => 160725)
--- trunk/Source/WTF/ChangeLog 2013-12-17 20:48:39 UTC (rev 160724)
+++ trunk/Source/WTF/ChangeLog 2013-12-17 21:18:36 UTC (rev 160725)
@@ -1,5 +1,17 @@
2013-12-17 Alex Christensen <[email protected]>
+ Compile fix for WebGL on Windows without GRAPHICS_SURFACE.
+ https://bugs.webkit.org/show_bug.cgi?id=125867
+
+ Reviewed by Martin Robinson.
+
+ * wtf/FeatureDefines.h:
+ Removed unused ENABLE_GLIB_SUPPORT macro.
+ * wtf/Platform.h:
+ Don't use GRAPHICS_SURFACE for WebGL on Windows.
+
+2013-12-17 Alex Christensen <[email protected]>
+
[Win] Fixed linker error with GStreamer.
https://bugs.webkit.org/show_bug.cgi?id=124861
Modified: trunk/Source/WTF/wtf/FeatureDefines.h (160724 => 160725)
--- trunk/Source/WTF/wtf/FeatureDefines.h 2013-12-17 20:48:39 UTC (rev 160724)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2013-12-17 21:18:36 UTC (rev 160725)
@@ -506,10 +506,6 @@
#define ENABLE_GEOLOCATION 0
#endif
-#if !defined(ENABLE_GLIB_SUPPORT)
-#define ENABLE_GLIB_SUPPORT 0
-#endif
-
#if !defined(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING)
#define ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING 0
#endif
Modified: trunk/Source/WTF/wtf/Platform.h (160724 => 160725)
--- trunk/Source/WTF/wtf/Platform.h 2013-12-17 20:48:39 UTC (rev 160724)
+++ trunk/Source/WTF/wtf/Platform.h 2013-12-17 21:18:36 UTC (rev 160725)
@@ -897,7 +897,6 @@
#define WTF_USE_OPENGL 1
#define WTF_USE_OPENGL_ES_2 1
#define WTF_USE_EGL 1
-#define WTF_USE_GRAPHICS_SURFACE 1
#endif
#if USE(TEXTURE_MAPPER) && USE(3D_GRAPHICS) && !defined(WTF_USE_TEXTURE_MAPPER_GL)
Modified: trunk/Source/WebCore/ChangeLog (160724 => 160725)
--- trunk/Source/WebCore/ChangeLog 2013-12-17 20:48:39 UTC (rev 160724)
+++ trunk/Source/WebCore/ChangeLog 2013-12-17 21:18:36 UTC (rev 160725)
@@ -1,3 +1,14 @@
+2013-12-17 Alex Christensen <[email protected]>
+
+ Compile fix for WebGL on Windows without GRAPHICS_SURFACE.
+ https://bugs.webkit.org/show_bug.cgi?id=125867
+
+ Reviewed by Martin Robinson.
+
+ * platform/graphics/opengl/GLPlatformSurface.cpp:
+ (WebCore::GLPlatformSurface::createOffScreenSurface):
+ Protect reference to EGLOffScreenSurface with USE(GRAPHICS_SURFACE).
+
2013-12-17 Radu Stavila <[email protected]>
[CSS Regions] Positioned elements in regions get clipped if they fall outside the region
Modified: trunk/Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp (160724 => 160725)
--- trunk/Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp 2013-12-17 20:48:39 UTC (rev 160724)
+++ trunk/Source/WebCore/platform/graphics/opengl/GLPlatformSurface.cpp 2013-12-17 21:18:36 UTC (rev 160725)
@@ -47,7 +47,7 @@
OwnPtr<GLPlatformSurface> surface;
#if USE(GLX)
surface = adoptPtr(new GLXOffScreenSurface(attributes));
-#elif USE(EGL)
+#elif USE(EGL) && USE(GRAPHICS_SURFACE)
surface = EGLOffScreenSurface::createOffScreenSurface(attributes);
#else
// FIXME: Need WGL implementation for Windows
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
