Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

b=571172; disable ANGLE compilation on Linux-x86_64, until build slaves are fixed

Browse Source
This commit is contained in:
Vladimir Vukicevic 2010-07-14 20:52:37 -07:00
parent 59836b1055
commit 7b749dffcd
5 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
content/canvas/src/Makefile.in
View File

@ -79,14 +79,24 @@ CPPSRCS += \
NativeJSContext.cpp \
$(NULL)
# We can't build ANGLE on linux-64 until build bug 560894 and related
# are fixed.
ifneq ($(OS_ARCH)_$(OS_TEST),Linux_x86_64)
DEFINES += -DUSE_ANGLE
endif
ifndef MOZ_ENABLE_LIBXUL
ifdef USE_ANGLE
SHARED_LIBRARY_LIBS += \
$(DEPTH)/gfx/angle/$(LIB_PREFIX)angle.$(LIB_SUFFIX) \
$(NULL)
endif
endif
else
CPPSRCS += WebGLContextNotSupported.cpp

4
content/canvas/src/WebGLContextGL.cpp
View File

@ -56,7 +56,7 @@
#include "jstypedarray.h"
#ifndef USE_GLES2
#if !defined(USE_GLES2) && defined(USE_ANGLE)
// shader translator
#include "angle/ShaderLang.h"
#endif
@ -2831,7 +2831,7 @@ WebGLContext::CompileShader(nsIWebGLShader *sobj)
MakeContextCurrent();
#ifndef USE_GLES2
#if !defined(USE_GLES2) && defined(USE_ANGLE)
if (shader->NeedsTranslation() && mShaderValidation) {
ShHandle compiler = 0;
int debugFlags = 0;

4
content/canvas/src/WebGLContextValidate.cpp
View File

@ -41,7 +41,7 @@
#include "CheckedInt.h"
#ifndef USE_GLES2
#if !defined(USE_GLES2) && defined(USE_ANGLE)
#include "angle/ShaderLang.h"
#endif
@ -419,7 +419,9 @@ WebGLContext::InitAndValidateGL()
// gl_PointSize is always available in ES2 GLSL, but has to be
// specifically enabled on desktop GLSL.
gl->fEnable(LOCAL_GL_VERTEX_PROGRAM_POINT_SIZE);
#endif
#if !defined(USE_GLES2) && defined(USE_ANGLE)
// initialize shader translator
static bool didTranslatorInit = false;
if (!didTranslatorInit && mShaderValidation) {

2
gfx/Makefile.in
View File

@ -56,7 +56,9 @@ ifndef BUILD_STATIC_LIBS
DIRS += ycbcr
endif
ifneq ($(OS_ARCH)$(OS_TEST),Linuxx86_64)
DIRS += angle
endif
DIRS += src qcms layers harfbuzz/src thebes src/thebes

7
toolkit/library/libxul-config.mk
View File

@ -301,7 +301,12 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),android)
COMPONENT_LIBS += widget_android
endif
STATIC_LIBS += thebes ycbcr angle
STATIC_LIBS += thebes ycbcr
ifneq ($(OS_ARCH)_$(OS_TEST),Linux_x86_64)
STATIC_LIBS += angle
endif
COMPONENT_LIBS += gkgfxthebes
ifeq (windows,$(MOZ_WIDGET_TOOLKIT))