Bug 1627482 - Fix non-unified build errors in gfx/gl. r=tnikkel

Differential Revision: https://phabricator.services.mozilla.com/D69731
iaxat · Apr 5, 2020 · 2a22ee2 · 2a22ee2
1 parent c3bfd46
commit 2a22ee2
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 7 deletions.
diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp
@@ -38,6 +38,7 @@
 #include "mozilla/StaticPrefs_gl.h"
 #include "mozilla/IntegerPrintfMacros.h"
 #include "mozilla/gfx/Logging.h"
+#include "mozilla/layers/TextureForwarder.h"  // for LayersIPCChannel
 
 #include "OGLShaderProgram.h"  // for ShaderProgramType
 

diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp
@@ -63,6 +63,7 @@
 #include "LayersLogging.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/Services.h"
 #include "mozilla/gfx/gfxVars.h"
 #include "mozilla/layers/CompositorOptions.h"
 #include "mozilla/widget/CompositorWidget.h"

diff --git a/gfx/gl/GLLibraryEGL.cpp b/gfx/gl/GLLibraryEGL.cpp
@@ -6,6 +6,7 @@
 
 #include "gfxConfig.h"
 #include "gfxCrashReporterUtils.h"
+#include "gfxEnv.h"
 #include "gfxUtils.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Assertions.h"
@@ -31,6 +32,7 @@
 #include "prsystem.h"
 #include "GLContext.h"
 #include "GLContextProvider.h"
+#include "GLReadTexImageHelper.h"
 #include "ScopedGLHelpers.h"
 #ifdef MOZ_WIDGET_GTK
 #  include <gdk/gdk.h>
@@ -286,7 +288,8 @@ static EGLDisplay GetAndInitDisplayForAccelANGLE(
     return GetAndInitDisplayForWebRender(egl, EGL_DEFAULT_DISPLAY);
   }
 
-  FeatureState& d3d11ANGLE = gfxConfig::GetFeature(Feature::D3D11_HW_ANGLE);
+  gfx::FeatureState& d3d11ANGLE =
+      gfx::gfxConfig::GetFeature(gfx::Feature::D3D11_HW_ANGLE);
 
   if (!StaticPrefs::webgl_angle_try_d3d11()) {
     d3d11ANGLE.UserDisable("User disabled D3D11 ANGLE by pref",
@@ -305,7 +308,7 @@ static EGLDisplay GetAndInitDisplayForAccelANGLE(
     //       will live longer than the ANGLE display so we're fine.
   });
 
-  if (gfxConfig::IsForcedOnByUser(Feature::D3D11_HW_ANGLE)) {
+  if (gfx::gfxConfig::IsForcedOnByUser(gfx::Feature::D3D11_HW_ANGLE)) {
     return GetAndInitDisplay(egl, LOCAL_EGL_D3D11_ONLY_DISPLAY_ANGLE);
   }
 
@@ -346,8 +349,8 @@ bool GLLibraryEGL::ReadbackEGLImage(EGLImage image,
                               LOCAL_GL_NEAREST);
   mReadbackGL->fEGLImageTargetTexture2D(target, image);
 
-  ShaderConfigOGL config =
-      ShaderConfigFromTargetAndFormat(target, out_surface->GetFormat());
+  layers::ShaderConfigOGL config =
+      layers::ShaderConfigFromTargetAndFormat(target, out_surface->GetFormat());
   int shaderConfig = config.mFeatures;
   mReadbackGL->ReadTexImageHelper()->ReadTexImage(
       out_surface, 0, target, out_surface->GetSize(), shaderConfig);
@@ -811,7 +814,7 @@ EGLDisplay GLLibraryEGL::CreateDisplay(bool forceAccel,
     // Some drivers doesn't support EGL_DEFAULT_DISPLAY
     GdkDisplay* gdkDisplay = gdk_display_get_default();
     if (gdkDisplay && !GDK_IS_X11_DISPLAY(gdkDisplay)) {
-      nativeDisplay = WaylandDisplayGetWLDisplay(gdkDisplay);
+      nativeDisplay = widget::WaylandDisplayGetWLDisplay(gdkDisplay);
       if (!nativeDisplay) {
         NS_WARNING("Failed to get wl_display.");
         return nullptr;

diff --git a/gfx/gl/GLLibraryEGL.h b/gfx/gl/GLLibraryEGL.h
@@ -11,6 +11,7 @@
 
 #include "GLLibraryLoader.h"
 #include "mozilla/StaticMutex.h"
+#include "mozilla/StaticPtr.h"
 #include "mozilla/ThreadLocal.h"
 #include "GeckoProfiler.h"
 
@@ -25,6 +26,9 @@
 
 class nsIGfxInfo;
 
+template <typename T>
+class nsCOMPtr;
+
 namespace angle {
 class Platform;
 }

diff --git a/gfx/gl/GLLibraryLoader.cpp b/gfx/gl/GLLibraryLoader.cpp
@@ -6,6 +6,7 @@
 
 #include <regex>
 
+#include "mozilla/gfx/Logging.h"
 #include "nsDebug.h"
 
 #ifdef WIN32

diff --git a/gfx/gl/GLLibraryLoader.h b/gfx/gl/GLLibraryLoader.h
@@ -10,6 +10,7 @@
 
 #include "GLDefs.h"
 #include "nscore.h"
+#include "mozilla/Assertions.h"
 #include "mozilla/SharedLibrary.h"
 
 namespace mozilla {

diff --git a/gfx/gl/TextureImageEGL.cpp b/gfx/gl/TextureImageEGL.cpp
@@ -6,6 +6,7 @@
 #include "TextureImageEGL.h"
 #include "GLLibraryEGL.h"
 #include "GLContext.h"
+#include "GLContextEGL.h"
 #include "GLUploadHelpers.h"
 #include "gfxPlatform.h"
 #include "mozilla/gfx/Types.h"
@@ -103,7 +104,7 @@ bool TextureImageEGL::DirectUpdate(
   size_t uploadSize = 0;
   mTextureFormat = UploadSurfaceToTexture(mGLContext, aSurf, region, mTexture,
                                           mSize, &uploadSize, needInit, aFrom);
-  if (mTextureFormat == SurfaceFormat::UNKNOWN) {
+  if (mTextureFormat == gfx::SurfaceFormat::UNKNOWN) {
     return false;
   }
 

diff --git a/gfx/gl/TextureImageEGL.h b/gfx/gl/TextureImageEGL.h
@@ -8,6 +8,8 @@
 
 #include "GLTextureImage.h"
 
+#include "mozilla/gfx/Types.h"
+
 namespace mozilla {
 namespace gl {
 
@@ -18,7 +20,7 @@ class TextureImageEGL final : public TextureImage {
       ContentType aContentType, GLContext* aContext,
       Flags aFlags = TextureImage::NoFlags,
       TextureState aTextureState = Created,
-      TextureImage::ImageFormat aImageFormat = SurfaceFormat::UNKNOWN);
+      TextureImage::ImageFormat aImageFormat = gfx::SurfaceFormat::UNKNOWN);
 
   virtual ~TextureImageEGL();