Bug 808785. Stop shipping d3dx9_43.dll. r=bjacob
authorJeff Muizelaar <jmuizelaar@mozilla.com>
Mon, 28 Jan 2013 11:52:06 -0500
changeset 120641 c00a6b146150f92bd4749d2562bcfd5099e2e14f
parent 120640 b10397812c05d8e428908f3db59fdb2eb376dfd1
child 120642 7f543b37a35979f8177f50268198b8742fccf175
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersbjacob
bugs808785
milestone21.0a1
Bug 808785. Stop shipping d3dx9_43.dll. r=bjacob Since ANGLE revision 1314 / issue 311: http://code.google.com/p/angleproject/issues/detail?id=311 d3dx9_43.dll is no longer needed.
browser/installer/Makefile.in
browser/installer/package-manifest.in
browser/installer/removed-files.in
configure.in
gfx/angle/Makefile.in
gfx/angle/src/libGLESv2/Makefile.in
gfx/gl/GLLibraryEGL.cpp
gfx/gl/Makefile.in
toolkit/mozapps/installer/signing.mk
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -59,17 +59,16 @@ endif
 ifdef _MSC_VER
 DEFINES += -D_MSC_VER=$(_MSC_VER)
 endif
 
 DEFINES += -DJAREXT=
 
 ifdef MOZ_ANGLE_RENDERER
 DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER)
-DEFINES += -DMOZ_D3DX9_DLL=$(MOZ_D3DX9_DLL)
 DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL)
 endif
 
 include $(topsrcdir)/ipc/app/defs.mk
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
 
 # Set MSVC dlls version to package, if any.
 ifdef WIN32_REDIST_DIR
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -529,17 +529,16 @@
 #ifdef MOZ_ENABLE_GNOME_COMPONENT
 @BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
 #endif
 
 ; ANGLE GLES-on-D3D rendering library
 #ifdef MOZ_ANGLE_RENDERER
 @BINPATH@/libEGL.dll
 @BINPATH@/libGLESv2.dll
-@BINPATH@/@MOZ_D3DX9_DLL@
 @BINPATH@/@MOZ_D3DCOMPILER_DLL@
 #endif
 
 ; [Browser Chrome Files]
 @BINPATH@/chrome/browser@JAREXT@
 @BINPATH@/chrome/browser.manifest
 @BINPATH@/chrome/pdfjs.manifest
 @BINPATH@/chrome/pdfjs/*
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -86,16 +86,17 @@ components/xmlextras.xpt
 components/xpcom.xpt
 components/xpti.dat
 components/xptitemp.dat
 components/nsMicrosummaryService.js
 components/nsProxyAutoConfig.manifest
 components/nsProxyAutoConfig.js
 D3DCompiler_42.dll
 d3dx9_42.dll
+d3dx9_43.dll
 defaults/pref/all.js
 defaults/pref/bug259708.js
 defaults/pref/bug307259.js
 defaults/pref/reporter.js
 defaults/pref/security-prefs.js
 defaults/pref/winpref.js
 defaults/pref/xpinstall.js
 defaults/preferences/services-aitc.js
--- a/configure.in
+++ b/configure.in
@@ -5820,20 +5820,17 @@ fi
 dnl ========================================================
 dnl = ANGLE OpenGL->D3D translator for WebGL
 dnl = * only applies to win32
 dnl = * enabled by default (shipping build); requires explicit --disable to disable
 dnl ========================================================
 MOZ_ANGLE_RENDERER=
 MOZ_DIRECTX_SDK_PATH=
 MOZ_DIRECTX_SDK_CPU_SUFFIX=
-MOZ_D3DX9_VERSION=
-MOZ_D3DX9_CAB=
 MOZ_D3DCOMPILER_CAB=
-MOZ_D3DX9_DLL=
 MOZ_D3DCOMPILER_DLL=
 case "$target_os" in
 *mingw*)
     MOZ_ANGLE_RENDERER=1
     ;;
 esac
 
 # The DirectX SDK libraries are split into x86 and x64 sub-directories
@@ -5881,24 +5878,22 @@ if test -n "$MOZ_ANGLE_RENDERER" -a -z "
 
   # Get the SDK numeric version (e.g. 43) by looking at the dependencies of d3dx9.lib
   MOZ_D3DX9_VERSION=`dumpbin //headers "$MOZ_DIRECTX_SDK_PATH"/lib/$MOZ_DIRECTX_SDK_CPU_SUFFIX/d3dx9.lib | egrep d3dx9_[[0-9]][[0-9]]\.dll | head -n1 | sed 's/.*\([[0-9]][[0-9]]\).*/\\1/g'`
 
   if test -z "$MOZ_D3DX9_VERSION" ; then
   	AC_MSG_ERROR([Couldn't determine the D3DX9 version, needed for WebGL. Either reinstall the DirectX SDK (June 2010 version or newer), or reconfigure with --disable-webgl.])
   fi
 
-  MOZ_D3DX9_CAB=`find "$MOZ_DIRECTX_SDK_PATH"/Redist -name *d3dx9_${MOZ_D3DX9_VERSION}_${MOZ_DIRECTX_SDK_CPU_SUFFIX}.cab | head -n1`
   MOZ_D3DCOMPILER_CAB=`find "$MOZ_DIRECTX_SDK_PATH"/Redist -name *D3DCompiler_${MOZ_D3DX9_VERSION}_${MOZ_DIRECTX_SDK_CPU_SUFFIX}.cab | head -n1`
 
-  if test -z "$MOZ_D3DX9_CAB" -o -z "$MOZ_D3DCOMPILER_CAB"; then
+  if test -z "$MOZ_D3DCOMPILER_CAB"; then
     AC_MSG_ERROR([Couldn't find the DirectX redistributable files. Either reinstall the DirectX SDK (making sure the "DirectX Redistributable Files" option is selected), or reconfigure with --disable-webgl.])
   fi
 
-  MOZ_D3DX9_DLL=d3dx9_$MOZ_D3DX9_VERSION.dll
   MOZ_D3DCOMPILER_DLL=D3DCompiler_$MOZ_D3DX9_VERSION.dll
 fi
 
 dnl ========================================================
 dnl = Breakpad crash reporting (on by default on supported platforms)
 dnl ========================================================
 
 case $target in
@@ -8473,19 +8468,17 @@ AC_SUBST(MOZ_MAINTENANCE_SERVICE)
 AC_SUBST(MOZ_STUB_INSTALLER)
 AC_SUBST(MOZ_VERIFY_MAR_SIGNATURE)
 AC_SUBST(MOZ_ENABLE_SIGNMAR)
 AC_SUBST(MOZ_UPDATER)
 AC_SUBST(MOZ_ANGLE_RENDERER)
 AC_SUBST(MOZ_DIRECTX_SDK_PATH)
 AC_SUBST(MOZ_DIRECTX_SDK_CPU_SUFFIX)
 AC_SUBST(MOZ_D3DX9_VERSION)
-AC_SUBST(MOZ_D3DX9_CAB)
 AC_SUBST(MOZ_D3DCOMPILER_CAB)
-AC_SUBST(MOZ_D3DX9_DLL)
 AC_SUBST(MOZ_D3DCOMPILER_DLL)
 AC_SUBST(MOZ_METRO)
 
 AC_SUBST(MOZ_ANDROID_HISTORY)
 AC_SUBST(MOZ_WEBSMS_BACKEND)
 AC_SUBST(ENABLE_STRIP)
 AC_SUBST(PKG_SKIP_STRIP)
 AC_SUBST(STRIP_FLAGS)
--- a/gfx/angle/Makefile.in
+++ b/gfx/angle/Makefile.in
@@ -128,19 +128,16 @@ CPPSRCS += \
 # src/libGLESv2/Makefile.in
 
 ifdef MOZ_ANGLE_RENDERER
 
 # libEGL depends on (links against!) libGLESv2!
 DIRS = src/libGLESv2 src/libEGL
 
 libs::
-ifdef MOZ_D3DX9_CAB
-	expand "$(MOZ_D3DX9_CAB)" -F:$(MOZ_D3DX9_DLL) "$(DIST)/bin"
-endif
 ifdef MOZ_D3DCOMPILER_CAB
 	expand "$(MOZ_D3DCOMPILER_CAB)" -F:$(MOZ_D3DCOMPILER_DLL) "$(DIST)/bin"
 endif
 
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/gfx/angle/src/libGLESv2/Makefile.in
+++ b/gfx/angle/src/libGLESv2/Makefile.in
@@ -184,20 +184,19 @@ include $(topsrcdir)/config/rules.mk
 
 ifdef GNU_CC
 
 TextureSSE2.$(OBJ_SUFFIX): CXXFLAGS+=-msse2
 
 OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions
 OS_LIBS += -ld3d9
 ifdef MOZ_D3DX9_VERSION
-OS_LIBS += -ld3dx9_$(MOZ_D3DX9_VERSION) -ld3dcompiler_$(MOZ_D3DX9_VERSION)
+OS_LIBS += -ld3dcompiler_$(MOZ_D3DX9_VERSION)
 else
-OS_LIBS += -ld3dx9 -ld3dcompiler
+OS_LIBS += -ld3dcompiler
 endif
 
 else
 
 EXTRA_DSO_LDOPTS = "$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/d3d9.lib" \
-                   "$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/d3dx9.lib" \
                    "$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_DIRECTX_SDK_CPU_SUFFIX)/D3DCompiler.lib"
 
 endif
--- a/gfx/gl/GLLibraryEGL.cpp
+++ b/gfx/gl/GLLibraryEGL.cpp
@@ -96,22 +96,16 @@ GLLibraryEGL::EnsureInitialized()
 #ifdef MOZ_WEBGL
     if (!mEGLLibrary) {
         // On Windows, the GLESv2, EGL and DXSDK libraries are shipped with libxul and
         // we should look for them there. We have to load the libs in this
         // order, because libEGL.dll depends on libGLESv2.dll which depends on the DXSDK
         // libraries. This matters especially for WebRT apps which are in a different directory.
         // See bug 760323 and bug 749459
 
-#ifndef MOZ_D3DX9_DLL
-#error MOZ_D3DX9_DLL should have been defined by the Makefile
-#endif
-        LoadLibraryForEGLOnWindows(NS_LITERAL_STRING(NS_STRINGIFY(MOZ_D3DX9_DLL)));
-        // intentionally leak the D3DX9_DLL library
-
 #ifndef MOZ_D3DCOMPILER_DLL
 #error MOZ_D3DCOMPILER_DLL should have been defined by the Makefile
 #endif
         LoadLibraryForEGLOnWindows(NS_LITERAL_STRING(NS_STRINGIFY(MOZ_D3DCOMPILER_DLL)));
         // intentionally leak the D3DCOMPILER_DLL library
 
         LoadLibraryForEGLOnWindows(NS_LITERAL_STRING("libGLESv2.dll"));
         // intentionally leak the libGLESv2.dll library
--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@@ -35,17 +35,16 @@ endif
 
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 EXPORTS	+= \
 	WGLLibrary.h \
 	$(NULL)
 ifdef MOZ_WEBGL
 DEFINES += -DMOZ_WEBGL
-DEFINES += -DMOZ_D3DX9_DLL=$(MOZ_D3DX9_DLL)
 DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL)
 endif
 endif
 
 CPPSRCS	= \
 	GLContext.cpp \
 	GLContextUtils.cpp \
 	GLLibraryLoader.cpp \
--- a/toolkit/mozapps/installer/signing.mk
+++ b/toolkit/mozapps/installer/signing.mk
@@ -12,17 +12,16 @@ MOZ_INTERNAL_SIGNING_FORMAT := signcode
 MOZ_EXTERNAL_SIGNING_FORMAT := signcode
 SIGN_INCLUDES := \
   '*.dll' \
   '*.exe' \
   $(NULL)
 
 SIGN_EXCLUDES := \
   'D3DCompiler*.dll' \
-  'd3dx9*.dll' \
   'msvc*.dll' \
   $(NULL)
 endif # Windows
 
 ifeq (Darwin, $(OS_ARCH))
 MOZ_INTERNAL_SIGNING_FORMAT := dmg
 MOZ_EXTERNAL_SIGNING_FORMAT :=
 endif # Darwin