Bug 658826 - disable optimization in D3DCompiler to avoid freeze bugs - r=jrmuizel
authorBenoit Jacob <bjacob@mozilla.com>
Mon, 03 Oct 2011 23:09:03 -0400
changeset 79399 65556aa6533968e73682a6b82cf5884b9fe362ea
parent 79398 26d62a2d24cb1c40ff88641c1564c404def6419a
child 79400 86b2eda5770082ffbe65bf660cfee7b42605d867
push id434
push userclegnitto@mozilla.com
push dateWed, 21 Dec 2011 12:10:54 +0000
treeherdermozilla-beta@bddb6ed8dd47 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs658826
milestone10.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 658826 - disable optimization in D3DCompiler to avoid freeze bugs - r=jrmuizel ANGLE's own buildsystem, which Chrome uses, has been doing this for a long time. This aligns us with them.
gfx/angle/Makefile.in
gfx/angle/src/libEGL/Makefile.in
gfx/angle/src/libGLESv2/Makefile.in
--- a/gfx/angle/Makefile.in
+++ b/gfx/angle/Makefile.in
@@ -123,16 +123,20 @@ CSRCS   = \
         memory.c \
         scanner.c \
         symbols.c \
         tokens.c \
 	$(NULL)
 
 DEFINES += -DANGLE_USE_NSPR -DANGLE_BUILD
 
+#these defines are from ANGLE's build_angle.gyp
+DEFINES += -DANGLE_DISABLE_TRACE
+DEFINES += -DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL0
+
 EXTRA_DSO_LDOPTS = $(MOZALLOC_LIB)
 
 ifdef MOZ_ANGLE
 
 # libEGL depends on (links against!) libGLESv2!
 DIRS = src/libGLESv2 src/libEGL
 
 libs::
--- a/gfx/angle/src/libEGL/Makefile.in
+++ b/gfx/angle/src/libEGL/Makefile.in
@@ -126,16 +126,20 @@ CSRCS   = \
   memory.c \
   scanner.c \
   symbols.c \
   tokens.c \
   $(NULL)
 
 DEFINES += -DANGLE_BUILD -DNOMINMAX -DLIBEGL_EXPORTS -D_CRT_SECURE_NO_DEPRECATE
 
+#these defines are from ANGLE's build_angle.gyp
+DEFINES += -DANGLE_DISABLE_TRACE
+DEFINES += -DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL0
+
 ifndef MOZ_DEBUG
 DEFINES += -D_SECURE_SCL=0
 endif
 
 CPPSRCS += \
   debug.cpp \
   Config.cpp \
   Display.cpp \
--- a/gfx/angle/src/libGLESv2/Makefile.in
+++ b/gfx/angle/src/libGLESv2/Makefile.in
@@ -126,16 +126,20 @@ CSRCS   = \
         memory.c \
         scanner.c \
         symbols.c \
         tokens.c \
 	$(NULL)
 
 DEFINES += -DANGLE_BUILD -DNOMINMAX -DLIBGLESV2_EXPORTS -D_CRT_SECURE_NO_DEPRECATE
 
+#these defines are from ANGLE's build_angle.gyp
+DEFINES += -DANGLE_DISABLE_TRACE
+DEFINES += -DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL0
+
 ifndef MOZ_DEBUG
 DEFINES += -D_SECURE_SCL=0
 endif
 
 CPPSRCS	+= \
 	debug.cpp \
 	Blit.cpp \
 	Buffer.cpp \