b=578877, reenable WebGL on Linux; r=vlad,a=b
authorVladimir Vukicevic <vladimir@pobox.com>
Mon, 27 Dec 2010 12:05:01 -0800
changeset 59690 e9aa8f38d75e527bc6d58d09e19d2f2e75042436
parent 59689 8f8b1db55800a150d11fecf9063c5d7fd16fa4b4
child 59691 699023bb3c9c425e1fb57d58ac7a590232676f31
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersvlad, b
bugs578877
milestone2.0b9pre
b=578877, reenable WebGL on Linux; r=vlad,a=b
content/canvas/src/Makefile.in
gfx/Makefile.in
layout/build/Makefile.in
modules/libpref/src/init/all.js
toolkit/library/libxul-config.mk
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -69,27 +69,18 @@ ifdef MOZ_WEBGL
 
 CPPSRCS += \
 	WebGLContext.cpp \
 	WebGLContextGL.cpp \
 	WebGLContextUtils.cpp \
 	WebGLContextValidate.cpp \
 	$(NULL)
 
-# We can't build ANGLE on linux until build bug 560894 and related
-# are fixed.
-ifneq ($(OS_ARCH),Linux)
 DEFINES += -DUSE_ANGLE
 USE_ANGLE=1
-else
-ifdef FORCE_BUILD_ANGLE
-DEFINES += -DUSE_ANGLE
-USE_ANGLE=1
-endif
-endif
 
 else
 
 CPPSRCS += WebGLContextNotSupported.cpp
 
 endif
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
--- a/gfx/Makefile.in
+++ b/gfx/Makefile.in
@@ -51,23 +51,17 @@ endif
 # In static builds, ycbcr must appear after layers in
 # the link line on linux. This order is defined by the
 # order listed in DIRS. On shared builds ycbcr must
 # be built first so the order is reversed.
 ifndef BUILD_STATIC_LIBS
 DIRS		+= ycbcr
 endif
 
-ifneq ($(OS_ARCH),Linux)
 DIRS		+= angle
-else
-ifdef FORCE_BUILD_ANGLE
-DIRS		+= angle
-endif
-endif
 
 
 DIRS		+= src qcms layers harfbuzz/src ots/src thebes src/thebes
 
 ifdef BUILD_STATIC_LIBS
 DIRS		+= ycbcr
 endif
 
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -55,25 +55,17 @@ LIBRARY_NAME	= gklayout
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsLayoutModule
 GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 ifndef MOZ_ENABLE_LIBXUL
 EXTRA_DSO_LIBS	= gkgfx
-
-ifneq ($(OS_ARCH),Linux)
 EXTRA_DSO_LIBS += angle
-else
-ifdef FORCE_BUILD_ANGLE
-EXTRA_DSO_LIBS += angle
-endif
-endif
-
 endif
 
 EXTRA_DSO_LIBS	+= thebes ycbcr
 
 
 CPPSRCS		= \
 		nsLayoutModule.cpp \
 		nsContentDLF.cpp \
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -3197,24 +3197,17 @@ pref("image.mem.decode_bytes_at_a_time",
 
 // The longest time we can spend in an iteration of an async decode
 pref("image.mem.max_ms_before_yield", 400);
 
 // The maximum source data size for which we auto sync decode
 pref("image.mem.max_bytes_for_sync_decode", 150000);
 
 // WebGL prefs
-// keep disabled on linux until bug 578877 is fixed
-// This is not an ideal define, but it gets the right set of
-// build machines.
-#ifdef MOZ_WIDGET_GTK2
-pref("webgl.enabled_for_all_sites", false);
-#else
 pref("webgl.enabled_for_all_sites", true);
-#endif
 pref("webgl.shader_validator", true);
 pref("webgl.force_osmesa", false);
 pref("webgl.mochitest_native_gl", false);
 pref("webgl.osmesalib", "");
 pref("webgl.verbose", false);
 
 #ifdef XP_WIN
 #ifndef WINCE
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -301,23 +301,17 @@ COMPONENT_LIBS += imgicon
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
 COMPONENT_LIBS += widget_android
 endif
 
 STATIC_LIBS += thebes ycbcr
 
-ifneq ($(OS_ARCH),Linux)
 STATIC_LIBS += angle
-else
-ifdef FORCE_BUILD_ANGLE
-STATIC_LIBS += angle
-endif
-endif
 
 COMPONENT_LIBS += gkgfxthebes
 
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
 COMPONENT_LIBS += gkwidget
 endif
 ifeq (beos,$(MOZ_WIDGET_TOOLKIT))
 COMPONENT_LIBS += widget_beos