Bug 1824068 - Make gfx/gl buildable outside of a unified build environment r=andi

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

gfx/gl/GLBlitHelperD3D.cpp

@@ -14,8 +14,10 @@
 #include "ScopedGLHelpers.h"
 
 #include "mozilla/layers/D3D11ShareHandleImage.h"
+#include "mozilla/layers/D3D11TextureIMFSampleImage.h"
 #include "mozilla/layers/D3D11YCbCrImage.h"
 #include "mozilla/layers/TextureD3D11.h"
+#include "mozilla/StaticPrefs_gl.h"
 
 namespace mozilla {
 namespace gl {

gfx/gl/GLContextProviderWGL.cpp

@@ -18,6 +18,7 @@
 #include "mozilla/gfx/gfxVars.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/ScopeExit.h"
+#include "mozilla/StaticPrefs_gl.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/layers/CompositorOptions.h"
 #include "mozilla/widget/CompositorWidget.h"

gfx/gl/SharedSurfaceD3D11Interop.cpp

@@ -8,10 +8,14 @@
 #include <d3d11.h>
 #include <d3d11_1.h>
 #include "GLContext.h"
+#include "GLBlitHelper.h"
 #include "MozFramebuffer.h"
+#include "ScopedGLHelpers.h"
 #include "WGLLibrary.h"
 #include "nsPrintfCString.h"
 #include "mozilla/gfx/DeviceManagerDx.h"
+#include "mozilla/gfx/Logging.h"
+#include "mozilla/layers/LayersSurfaces.h"
 #include "mozilla/StaticPrefs_webgl.h"
 
 namespace mozilla {

gfx/gl/SharedSurfaceD3D11Interop.h

@@ -6,6 +6,7 @@
 #ifndef SHARED_SURFACE_D3D11_INTEROP_H_
 #define SHARED_SURFACE_D3D11_INTEROP_H_
 
+#include <d3d11.h>
 #include <windows.h>
 #include "SharedSurface.h"
 

gfx/gl/moz.build

@@ -54,7 +54,6 @@ EXPORTS += [
 
 # Win32 is a special snowflake, for ANGLE
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
-    REQUIRES_UNIFIED_BUILD = True
     EXPORTS += [
         "GLContextWGL.h",
         "SharedSurfaceANGLE.h",  # Needs <windows.h> for `HANDLE`.