Bug 1894917 - Remove d3d10 header check to moz.configure r=glandium

The header has been in mingw since 2010, and is in the Windows SDK since
well before the version we require.

Differential Revision: https://phabricator.services.mozilla.com/D209377

dom/webgpu/moz.build

@@ -70,8 +70,7 @@ UNIFIED_SOURCES += [
     "ipc/WebGPUParent.cpp",
 ]
 
-if CONFIG["MOZ_ENABLE_D3D10_LAYER"]:
-    DEFINES["MOZ_ENABLE_D3D10_LAYER"] = True
+if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
     EXPORTS.mozilla.webgpu += [
         "ExternalTextureD3D11.h",
     ]

gfx/layers/moz.build

@@ -34,29 +34,29 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
     UNIFIED_SOURCES += [
         "IMFYCbCrImage.cpp",
     ]
-    if CONFIG["MOZ_ENABLE_D3D10_LAYER"]:
-        EXPORTS.mozilla.layers += [
-            "d3d11/CompositorD3D11.h",
-            "d3d11/DeviceAttachmentsD3D11.h",
-            "d3d11/FenceD3D11.h",
-            "d3d11/GpuProcessD3D11QueryMap.h",
-            "d3d11/GpuProcessD3D11TextureMap.h",
-            "d3d11/HelpersD3D11.h",
-            "d3d11/ShaderDefinitionsD3D11.h",
-            "d3d11/TextureD3D11.h",
-            "d3d11/TextureHostWrapperD3D11.h",
-        ]
-        UNIFIED_SOURCES += [
-            "d3d11/FenceD3D11.cpp",
-            "d3d11/GpuProcessD3D11QueryMap.cpp",
-            "d3d11/GpuProcessD3D11TextureMap.cpp",
-            "d3d11/TextureD3D11.cpp",
-            "d3d11/TextureHostWrapperD3D11.cpp",
-        ]
-        SOURCES += [
-            "d3d11/CompositorD3D11.cpp",
-            "d3d11/DeviceAttachmentsD3D11.cpp",
-        ]
+    EXPORTS.mozilla.layers += [
+        "d3d11/CompositorD3D11.h",
+        "d3d11/DeviceAttachmentsD3D11.h",
+        "d3d11/FenceD3D11.h",
+        "d3d11/GpuProcessD3D11QueryMap.h",
+        "d3d11/GpuProcessD3D11TextureMap.h",
+        "d3d11/HelpersD3D11.h",
+        "d3d11/ShaderDefinitionsD3D11.h",
+        "d3d11/TextureD3D11.h",
+        "d3d11/TextureHostWrapperD3D11.h",
+    ]
+    UNIFIED_SOURCES += [
+        "d3d11/FenceD3D11.cpp",
+        "d3d11/GpuProcessD3D11QueryMap.cpp",
+        "d3d11/GpuProcessD3D11TextureMap.cpp",
+        "d3d11/TextureD3D11.cpp",
+        "d3d11/TextureHostWrapperD3D11.cpp",
+    ]
+    SOURCES += [
+        "d3d11/CompositorD3D11.cpp",
+        "d3d11/DeviceAttachmentsD3D11.cpp",
+    ]
+
     if CONFIG["MOZ_WMF_MEDIA_ENGINE"]:
         EXPORTS.mozilla.layers += [
             "DcompSurfaceImage.h",
@@ -503,9 +503,6 @@ FINAL_LIBRARY = "xul"
 if CONFIG["MOZ_DEBUG"]:
     DEFINES["D3D_DEBUG_INFO"] = True
 
-if CONFIG["MOZ_ENABLE_D3D10_LAYER"]:
-    DEFINES["MOZ_ENABLE_D3D10_LAYER"] = True
-
 if CONFIG["ENABLE_TESTS"]:
     DIRS += ["apz/test/gtest"]
     DIRS += ["apz/test/gtest/mvm"]

gfx/thebes/moz.build

@@ -282,11 +282,6 @@ LOCAL_INCLUDES += [
 if CONFIG["MOZ_WIDGET_TOOLKIT"] in ("android", "gtk"):
     DEFINES["MOZ_ENABLE_FREETYPE"] = True
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
-    for var in ("MOZ_ENABLE_D3D10_LAYER",):
-        if CONFIG[var]:
-            DEFINES[var] = True
-
 if CONFIG["MOZ_WIDGET_TOOLKIT"] in ("android"):
     CXXFLAGS += CONFIG["CAIRO_FT_CFLAGS"]
 

gfx/webrender_bindings/moz.build

@@ -71,8 +71,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
         "RenderAndroidSurfaceTextureHost.cpp",
     ]
 
-if CONFIG["MOZ_ENABLE_D3D10_LAYER"]:
-    DEFINES["MOZ_ENABLE_D3D10_LAYER"] = True
+if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
     EXPORTS.mozilla.webrender += [
         "DCLayerTree.h",
         "RenderCompositorANGLE.h",

old-configure.in

@@ -803,15 +803,6 @@ if test "$OS_ARCH" = "WINNT"; then
     AC_DEFINE(HAVE_UINT64_T)
 fi
 
-case "$MOZ_WIDGET_TOOLKIT" in
-  windows)
-    if test "$COMPILE_ENVIRONMENT"; then
-      MOZ_CHECK_HEADER(d3d10.h, MOZ_ENABLE_D3D10_LAYER=1)
-    fi
-    ;;
-esac
-AC_SUBST(MOZ_ENABLE_D3D10_LAYER)
-
 dnl ========================================================
 dnl =
 dnl = Maintainer debug option (no --enable equivalent)

widget/moz.build

@@ -387,9 +387,6 @@ LOCAL_INCLUDES += [
 ]
 FINAL_LIBRARY = "xul"
 
-if CONFIG["MOZ_ENABLE_D3D10_LAYER"]:
-    DEFINES["MOZ_ENABLE_D3D10_LAYER"] = True
-
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
     CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
 if CONFIG["MOZ_WAYLAND"]:

widget/windows/moz.build

@@ -190,10 +190,6 @@ DEFINES["MOZ_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"]
 # Turn `firefox` into `Firefox`.
 DEFINES["MOZ_TOAST_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"].title()
 
-for var in ("MOZ_ENABLE_D3D10_LAYER",):
-    if CONFIG[var]:
-        DEFINES[var] = True
-
 USE_LIBS += [
     "jsoncpp",
 ]