| author | Masatoshi Kimura <VYV03354@nifty.ne.jp> |
| Tue, 15 Nov 2016 06:56:01 +0900 | |
| changeset 374175 | ace9b5fc8f65791d304ef64d49158d26e6a1ad14 |
| parent 374174 | a0677677a9f4f3c3dea1c710f4c0bd295a0d09da |
| child 374176 | 6d89952994fb85d75b3766d19ce6428455e96b5c |
| push id | 1419 |
| push user | jlund@mozilla.com |
| push date | Mon, 10 Apr 2017 20:44:07 +0000 |
| treeherder | mozilla-release@5e6801b73ef6 [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| reviewers | glandium |
| bugs | 1317569 |
| milestone | 53.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
|
--- a/browser/config/mozconfigs/win32/common-opt +++ b/browser/config/mozconfigs/win32/common-opt @@ -1,15 +1,14 @@ # This file is sourced by the nightly, beta, and release mozconfigs. . "$topsrcdir/browser/config/mozconfigs/common" ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} ac_add_options --enable-jemalloc -ac_add_options --enable-require-all-d3dc-versions if [ -f /c/builds/gapi.data ]; then _gapi_keyfile=/c/builds/gapi.data else _gapi_keyfile=/e/builds/gapi.data fi ac_add_options --with-google-api-keyfile=${_gapi_keyfile}
--- a/browser/config/mozconfigs/win32/debug +++ b/browser/config/mozconfigs/win32/debug @@ -1,17 +1,16 @@ . "$topsrcdir/build/mozconfig.win-common" MOZ_AUTOMATION_L10N_CHECK=0 . "$topsrcdir/browser/config/mozconfigs/common" ac_add_options --enable-debug ac_add_options --enable-dmd ac_add_options --enable-profiling # needed for --enable-dmd to work on Windows ac_add_options --enable-verify-mar -ac_add_options --enable-require-all-d3dc-versions # Needed to enable breakpad in application.ini export MOZILLA_OFFICIAL=1 # Enable Telemetry export MOZ_TELEMETRY_REPORTING=1 . $topsrcdir/build/win32/mozconfig.vs-latest
--- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -56,19 +56,16 @@ endif DEFINES += -DJAREXT= ifdef MOZ_ANGLE_RENDERER DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER) ifdef MOZ_D3DCOMPILER_VISTA_DLL DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$(MOZ_D3DCOMPILER_VISTA_DLL) endif -ifdef MOZ_D3DCOMPILER_XP_DLL -DEFINES += -DMOZ_D3DCOMPILER_XP_DLL=$(MOZ_D3DCOMPILER_XP_DLL) -endif endif DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME) # Set MSVC dlls version to package, if any. ifdef MOZ_NO_DEBUG_RTL ifdef WIN32_REDIST_DIR DEFINES += -DMOZ_PACKAGE_MSVC_DLLS=1
--- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -584,20 +584,16 @@ ; ANGLE GLES-on-D3D rendering library #ifdef MOZ_ANGLE_RENDERER @BINPATH@/libEGL.dll @BINPATH@/libGLESv2.dll #ifdef MOZ_D3DCOMPILER_VISTA_DLL @BINPATH@/@MOZ_D3DCOMPILER_VISTA_DLL@ #endif - -#ifdef MOZ_D3DCOMPILER_XP_DLL -@BINPATH@/@MOZ_D3DCOMPILER_XP_DLL@ -#endif #endif # MOZ_ANGLE_RENDERER ; [Browser Chrome Files] @RESPATH@/browser/chrome.manifest @RESPATH@/browser/chrome/browser@JAREXT@ @RESPATH@/browser/chrome/browser.manifest @RESPATH@/browser/chrome/pdfjs.manifest @RESPATH@/browser/chrome/pdfjs/*
--- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -209,17 +209,16 @@ def old_configure_options(*options): '--enable-png-arm-neon-support', '--enable-posix-nspr-emulation', '--enable-pref-extensions', '--enable-pulseaudio', '--enable-raw', '--enable-readline', '--enable-reflow-perf', '--enable-release', - '--enable-require-all-d3dc-versions', '--enable-safe-browsing', '--enable-sandbox', '--enable-signmar', '--enable-simulator', '--enable-small-chunk-size', '--enable-startup-notification', '--enable-startupcache', '--enable-stdcxx-compat',
--- a/gfx/angle/Makefile.in +++ b/gfx/angle/Makefile.in @@ -4,16 +4,12 @@ ifdef MOZ_ANGLE_RENDERER libs:: ifdef MOZ_D3DCOMPILER_VISTA_DLL_PATH cp -fp "$(MOZ_D3DCOMPILER_VISTA_DLL_PATH)" "$(DIST)/bin" endif -ifdef MOZ_D3DCOMPILER_XP_CAB - expand '$(MOZ_D3DCOMPILER_XP_CAB)' -F:$(MOZ_D3DCOMPILER_XP_DLL) '$(DIST)/bin' -endif - endif include $(topsrcdir)/config/rules.mk
--- a/gfx/angle/moz.build +++ b/gfx/angle/moz.build @@ -134,19 +134,16 @@ if CONFIG['GNU_CXX']: '-Wno-unused-private-field', ] else: CXXFLAGS += [ '-Wno-shadow-compatible-local', '-Wno-shadow-local', ] -if CONFIG['MOZ_DIRECTX_SDK_PATH'] and not CONFIG['MOZ_HAS_WINSDK_WITH_D3D']: - LOCAL_INCLUDES += ['%' + '%s/include/' % CONFIG['MOZ_DIRECTX_SDK_PATH']] - DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True DEFINES['_HAS_EXCEPTIONS'] = 0 if not CONFIG['MOZ_DEBUG']: DEFINES['_SECURE_SCL'] = 0 DEFINES['ANGLE_ENABLE_D3D9'] = True DEFINES['ANGLE_SKIP_DXGI_1_2_CHECK'] = True
--- a/gfx/angle/src/libANGLE/moz.build +++ b/gfx/angle/src/libANGLE/moz.build @@ -347,19 +347,16 @@ if CONFIG['GNU_CXX']: '-Wno-unused-private-field', ] else: CXXFLAGS += [ '-Wno-shadow-compatible-local', '-Wno-shadow-local', ] -if CONFIG['MOZ_DIRECTX_SDK_PATH'] and not CONFIG['MOZ_HAS_WINSDK_WITH_D3D']: - LOCAL_INCLUDES += ['%' + '%s/include/' % CONFIG['MOZ_DIRECTX_SDK_PATH']] - DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True DEFINES['_HAS_EXCEPTIONS'] = 0 if not CONFIG['MOZ_DEBUG']: DEFINES['_SECURE_SCL'] = 0 DEFINES['ANGLE_ENABLE_D3D9'] = True DEFINES['ANGLE_SKIP_DXGI_1_2_CHECK'] = True @@ -382,21 +379,16 @@ DEFINES['LIBANGLE_IMPLEMENTATION'] = "1" DEFINES['ANGLE_ENABLE_HLSL'] = "1" DEFINES['ANGLE_ENABLE_GLSL'] = "1" DEFINES['ANGLE_ENABLE_ESSL'] = "1" DEFINES['ANGLE_ENABLE_KEYEDMUTEX'] = "1" DEFINES['ANGLE_DEFAULT_D3D11'] = "0" if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']: OS_LIBS += [ 'd3d9', 'dxguid' ] -else: - EXTRA_DSO_LDOPTS += [ - '\'%s/lib/%s/d3d9.lib\'' % (CONFIG['MOZ_DIRECTX_SDK_PATH'], CONFIG['MOZ_D3D_CPU_SUFFIX']), - '\'%s/lib/%s/dxguid.lib\'' % (CONFIG['MOZ_DIRECTX_SDK_PATH'], CONFIG['MOZ_D3D_CPU_SUFFIX']), - ] Library('libANGLE') SOURCES['renderer/d3d/HLSLCompiler.cpp'].flags += ['-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES=\'{ TEXT("d3dcompiler_47.dll"), TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") }\''] if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']: SOURCES['renderer/d3d/d3d11/SwapChain11.cpp'].flags += ['-DANGLE_RESOURCE_SHARE_TYPE=D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX']
--- a/gfx/angle/src/libEGL/moz.build +++ b/gfx/angle/src/libEGL/moz.build @@ -27,19 +27,16 @@ if CONFIG['GNU_CXX']: '-Wno-unused-private-field', ] else: CXXFLAGS += [ '-Wno-shadow-compatible-local', '-Wno-shadow-local', ] -if CONFIG['MOZ_DIRECTX_SDK_PATH'] and not CONFIG['MOZ_HAS_WINSDK_WITH_D3D']: - LOCAL_INCLUDES += ['%' + '%s/include/' % CONFIG['MOZ_DIRECTX_SDK_PATH']] - DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True DEFINES['_HAS_EXCEPTIONS'] = 0 if not CONFIG['MOZ_DEBUG']: DEFINES['_SECURE_SCL'] = 0 DEFINES['ANGLE_ENABLE_D3D9'] = True DEFINES['ANGLE_SKIP_DXGI_1_2_CHECK'] = True @@ -62,21 +59,16 @@ USE_LIBS += [ 'libGLESv2' ] DEFINES['LIBANGLE_IMPLEMENTATION'] = "1" DEFINES['ANGLE_ENABLE_HLSL'] = "1" DEFINES['ANGLE_ENABLE_GLSL'] = "1" DEFINES['ANGLE_ENABLE_ESSL'] = "1" DEFINES['ANGLE_ENABLE_KEYEDMUTEX'] = "1" if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']: OS_LIBS += [ 'd3d9', 'dxguid' ] -else: - EXTRA_DSO_LDOPTS += [ - '\'%s/lib/%s/d3d9.lib\'' % (CONFIG['MOZ_DIRECTX_SDK_PATH'], CONFIG['MOZ_D3D_CPU_SUFFIX']), - '\'%s/lib/%s/dxguid.lib\'' % (CONFIG['MOZ_DIRECTX_SDK_PATH'], CONFIG['MOZ_D3D_CPU_SUFFIX']), - ] GeckoSharedLibrary('libEGL', linkage=None) RCFILE = SRCDIR + '/libEGL.rc' DEFFILE = SRCDIR + '/libEGL.def' USE_LIBS += ['libANGLE']
--- a/gfx/angle/src/libGLESv2/moz.build +++ b/gfx/angle/src/libGLESv2/moz.build @@ -34,19 +34,16 @@ if CONFIG['GNU_CXX']: '-Wno-unused-private-field', ] else: CXXFLAGS += [ '-Wno-shadow-compatible-local', '-Wno-shadow-local', ] -if CONFIG['MOZ_DIRECTX_SDK_PATH'] and not CONFIG['MOZ_HAS_WINSDK_WITH_D3D']: - LOCAL_INCLUDES += ['%' + '%s/include/' % CONFIG['MOZ_DIRECTX_SDK_PATH']] - DEFINES['_CRT_SECURE_NO_DEPRECATE'] = True DEFINES['_HAS_EXCEPTIONS'] = 0 if not CONFIG['MOZ_DEBUG']: DEFINES['_SECURE_SCL'] = 0 DEFINES['ANGLE_ENABLE_D3D9'] = True DEFINES['ANGLE_SKIP_DXGI_1_2_CHECK'] = True @@ -68,21 +65,16 @@ LOCAL_INCLUDES += [ '../../include', '.. DEFINES['LIBANGLE_IMPLEMENTATION'] = "1" DEFINES['ANGLE_ENABLE_HLSL'] = "1" DEFINES['ANGLE_ENABLE_GLSL'] = "1" DEFINES['ANGLE_ENABLE_ESSL'] = "1" DEFINES['ANGLE_ENABLE_KEYEDMUTEX'] = "1" if CONFIG['MOZ_HAS_WINSDK_WITH_D3D']: OS_LIBS += [ 'd3d9', 'dxguid' ] -else: - EXTRA_DSO_LDOPTS += [ - '\'%s/lib/%s/d3d9.lib\'' % (CONFIG['MOZ_DIRECTX_SDK_PATH'], CONFIG['MOZ_D3D_CPU_SUFFIX']), - '\'%s/lib/%s/dxguid.lib\'' % (CONFIG['MOZ_DIRECTX_SDK_PATH'], CONFIG['MOZ_D3D_CPU_SUFFIX']), - ] GeckoSharedLibrary('libGLESv2', linkage=None) RCFILE = SRCDIR + '/libGLESv2.rc' DEFFILE = SRCDIR + '/libGLESv2.def' USE_LIBS += ['libANGLE']
--- a/gfx/gl/moz.build +++ b/gfx/gl/moz.build @@ -145,18 +145,16 @@ UNIFIED_SOURCES += [ ] include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' if CONFIG['MOZ_D3DCOMPILER_VISTA_DLL']: DEFINES['MOZ_D3DCOMPILER_VISTA_DLL'] = CONFIG['MOZ_D3DCOMPILER_VISTA_DLL'] -if CONFIG['MOZ_D3DCOMPILER_XP_DLL']: - DEFINES['MOZ_D3DCOMPILER_XP_DLL'] = CONFIG['MOZ_D3DCOMPILER_XP_DLL'] CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['TK_CFLAGS'] CFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CFLAGS += CONFIG['TK_CFLAGS'] LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
--- a/old-configure.in +++ b/old-configure.in @@ -3268,19 +3268,16 @@ dnl = ANGLE OpenGL->D3D translator for W dnl = * only applies to win32 dnl ======================================================== MOZ_ANGLE_RENDERER= MOZ_D3D_CPU_SUFFIX= MOZ_HAS_WINSDK_WITH_D3D= MOZ_D3DCOMPILER_VISTA_DLL= MOZ_D3DCOMPILER_VISTA_DLL_PATH= -MOZ_DIRECTX_SDK_PATH= -MOZ_D3DCOMPILER_XP_DLL= -MOZ_D3DCOMPILER_XP_CAB= if test "$COMPILE_ENVIRONMENT" ; then case "$target_os" in *mingw*) MOZ_ANGLE_RENDERER=1 ;; esac @@ -3289,21 +3286,16 @@ case "${target_cpu}" in i*86) MOZ_D3D_CPU_SUFFIX=x86 ;; x86_64) MOZ_D3D_CPU_SUFFIX=x64 ;; esac -MOZ_ARG_ENABLE_BOOL(require-all-d3dc-versions, -[ --enable-require-all-d3dc-versions Require all versions of the D3D compiler needed for supported Windows systems.], - MOZ_REQUIRE_ALL_D3DCS=1, - MOZ_REQUIRE_ALL_D3DCS=) - # This is potentially set in external mozconfig files; if it's set, # then the build exposes the "webgl" context name, which is reserved # for conformant implementations. if test -n "$MOZ_WEBGL_CONFORMANT"; then AC_DEFINE(MOZ_WEBGL_CONFORMANT) fi dnl ======================================================== @@ -3352,98 +3344,28 @@ if test -n "$MOZ_ANGLE_RENDERER"; then fi # On mingw, check if headers are provided by toolchain. if test -n "$GNU_CC"; then MOZ_CHECK_HEADER(d3d10.h, MOZ_HAS_WINSDK_WITH_D3D=1) fi ###################################### - # Find _43 for use by XP. - - if test "$HAVE_64BIT_BUILD"; then - AC_MSG_RESULT([We are building a 64-bit binary, skip checking d3dcompiler_43.]) - else - # Get the SDK path from the registry. - # First try to get the June 2010 SDK - MOZ_DIRECTX_SDK_REG_KEY=`reg query 'HKLM\Software\Microsoft\DirectX' //s | grep 'Microsoft DirectX SDK (June 2010)' | head -n 1` - if test -z "$MOZ_DIRECTX_SDK_REG_KEY" ; then - # Otherwise just take whatever comes first - MOZ_DIRECTX_SDK_REG_KEY=`reg query 'HKLM\Software\Microsoft\DirectX' //s | grep 'Microsoft DirectX SDK' | head -n 1` - fi - MOZ_DIRECTX_SDK_PATH=`reg query "$MOZ_DIRECTX_SDK_REG_KEY" //v InstallPath | grep REG_SZ | sed 's/.*\([[a-zA-Z]]\)\\:\\\\/\\1\\:\\\\/' | sed 's,\\\\,/,g'` - - if test -n "$MOZ_DIRECTX_SDK_PATH" && - test -f "$MOZ_DIRECTX_SDK_PATH"/lib/$MOZ_D3D_CPU_SUFFIX/dxguid.lib ; then - AC_MSG_RESULT([Found DirectX SDK via registry, using $MOZ_DIRECTX_SDK_PATH]) - else - AC_MSG_RESULT([DirectX SDK not found.]) - MOZ_DIRECTX_SDK_PATH= - fi - - # Check that our DirectX SDK is acceptable. - if test -n "$MOZ_DIRECTX_SDK_PATH"; then - if test -n "`echo $MOZ_DIRECTX_SDK_REG_KEY | grep 'February 2010'`" ; then - AC_MSG_RESULT([Found the February 2010 DirectX SDK, which is unacceptable to ANGLE.]) - MOZ_DIRECTX_SDK_PATH= - fi - fi - - if test -n "$MOZ_DIRECTX_SDK_PATH"; then - # Find a D3D compiler DLL in the DirectX SDK, if we didn't find one already. - # 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_D3D_CPU_SUFFIX/d3dx9.lib | egrep d3dx9_[[0-9]][[0-9]]\.dll | head -n1 | sed 's/.*\([[0-9]][[0-9]]\).*/\\1/g'` - - if test -n "$MOZ_D3DX9_VERSION" ; then - MOZ_D3DCOMPILER_XP_CAB=`find "$MOZ_DIRECTX_SDK_PATH"/Redist -name *D3DCompiler_${MOZ_D3DX9_VERSION}_${MOZ_D3D_CPU_SUFFIX}.cab | head -n1` - - if test -n "$MOZ_D3DCOMPILER_XP_CAB"; then - MOZ_D3DCOMPILER_XP_DLL=D3DCompiler_$MOZ_D3DX9_VERSION.dll - else - AC_MSG_RESULT([Couldn't find a CAB containing the D3D compiler DLL.]) - AC_MSG_ERROR([DirectX SDK at "$MOZ_DIRECTX_SDK_PATH" appears broken.]) - MOZ_DIRECTX_SDK_PATH= - fi - else - AC_MSG_RESULT([Couldn't determine the D3DX9 version for the DirectX SDK.]) - MOZ_DIRECTX_SDK_PATH= - fi - else - AC_MSG_RESULT([Couldn't find an acceptable DirectX SDK for ANGLE, needed for d3dcompiler_43.]) - fi - fi - - ###################################### # Check that we found what we needed. MOZ_FOUND_A_D3D_COMPILER= - MOZ_FOUND_BOTH_D3D_COMPILERS=1 if test -n "$MOZ_D3DCOMPILER_VISTA_DLL"; then MOZ_FOUND_A_D3D_COMPILER=1 AC_MSG_RESULT([Found d3dcompiler DLL for Vista+: $MOZ_D3DCOMPILER_VISTA_DLL]) - else - MOZ_FOUND_BOTH_D3D_COMPILERS= - fi - - if test -n "$MOZ_D3DCOMPILER_XP_DLL"; then - MOZ_FOUND_A_D3D_COMPILER=1 - AC_MSG_RESULT([Found d3dcompiler DLL for XP: $MOZ_D3DCOMPILER_XP_DLL]) - else - MOZ_FOUND_BOTH_D3D_COMPILERS= fi if test -z "$CROSS_COMPILE"; then if test -z "MOZ_FOUND_A_D3D_COMPILER"; then AC_MSG_ERROR([Couldn't find an acceptable D3D compiler DLL.]) fi - - if test -n "$MOZ_REQUIRE_ALL_D3DCS" -a -z "$MOZ_FOUND_BOTH_D3D_COMPILERS"; then - AC_MSG_ERROR([Both D3D compilers _43 and _46+ are required by --enable-require-d3d-compilers.]) - AC_MSG_ERROR([ Install Windows SDK 8.0+, as well as DirectX SDK (June 2010 version or newer), or reconfigure without this flag.]) - fi fi fi # MOZ_ANGLE_RENDERER fi # COMPILE_ENVIRONMENT dnl ======================================================== dnl Gamepad support @@ -5261,19 +5183,16 @@ AC_SUBST(MOZ_VERIFY_MAR_SIGNATURE) AC_SUBST(MOZ_ENABLE_SIGNMAR) AC_SUBST(MOZ_UPDATER) AC_SUBST(MOZ_ANGLE_RENDERER) AC_SUBST(MOZ_D3D_CPU_SUFFIX) AC_SUBST(MOZ_HAS_WINSDK_WITH_D3D) AC_SUBST(MOZ_D3DCOMPILER_VISTA_DLL) AC_SUBST(MOZ_D3DCOMPILER_VISTA_DLL_PATH) -AC_SUBST(MOZ_DIRECTX_SDK_PATH) -AC_SUBST(MOZ_D3DCOMPILER_XP_DLL) -AC_SUBST(MOZ_D3DCOMPILER_XP_CAB) AC_SUBST(MOZ_ANDROID_APPLICATION_CLASS) AC_SUBST(MOZ_ANDROID_BROWSER_INTENT_CLASS) AC_SUBST(MOZ_ANDROID_SEARCH_INTENT_CLASS) AC_SUBST(MOZ_EXCLUDE_HYPHENATION_DICTIONARIES) AC_SUBST(MOZ_INSTALL_TRACKING) AC_SUBST(ENABLE_STRIP) AC_SUBST(PKG_SKIP_STRIP)
--- a/toolkit/library/libxul.mk +++ b/toolkit/library/libxul.mk @@ -11,26 +11,16 @@ OS_LDFLAGS += -Wl,-version-script,symver symverscript: $(topsrcdir)/toolkit/library/symverscript.in $(call py_action,preprocessor, \ -DVERSION='xul$(MOZILLA_SYMBOLVERSION)' $< -o $@) EXTRA_DEPS += symverscript endif endif -ifdef MOZ_WEBRTC -ifeq (WINNT,$(OS_TARGET)) -ifndef MOZ_HAS_WINSDK_WITH_D3D -OS_LDFLAGS += \ - -LIBPATH:'$(MOZ_DIRECTX_SDK_PATH)/lib/$(MOZ_D3D_CPU_SUFFIX)' \ - $(NULL) -endif -endif -endif - # Generate GDB pretty printer-autoload files only on Linux. OSX's GDB is # too old to support Python pretty-printers; if this changes, we could make # this 'ifdef GNU_CC'. ifeq (Linux,$(OS_ARCH)) # Create a GDB Python auto-load file alongside the libxul shared library in # the build directory. PP_TARGETS += LIBXUL_AUTOLOAD LIBXUL_AUTOLOAD = $(topsrcdir)/toolkit/library/libxul.so-gdb.py.in