summaryrefslogtreecommitdiffstats
path: root/gfx/gl
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-05-13 13:58:36 +0000
committerMoonchild <moonchild@palemoon.org>2020-05-20 13:53:57 +0000
commitc3fc87a904fb3445f7e33bf6521a6de4d29e9832 (patch)
tree1fddc0374e02b6feee215c4f33f46eae748bd173 /gfx/gl
parent5f04717b0023491e843b4297bce1e19aa29069e3 (diff)
downloadUXP-c3fc87a904fb3445f7e33bf6521a6de4d29e9832.tar
UXP-c3fc87a904fb3445f7e33bf6521a6de4d29e9832.tar.gz
UXP-c3fc87a904fb3445f7e33bf6521a6de4d29e9832.tar.lz
UXP-c3fc87a904fb3445f7e33bf6521a6de4d29e9832.tar.xz
UXP-c3fc87a904fb3445f7e33bf6521a6de4d29e9832.zip
Issue #80 - De-unify gfx/gl
Diffstat (limited to 'gfx/gl')
-rw-r--r--gfx/gl/GLContextProviderEGL.cpp1
-rw-r--r--gfx/gl/GLContextProviderWGL.cpp2
-rw-r--r--gfx/gl/GLLibraryEGL.cpp5
-rwxr-xr-xgfx/gl/GLScreenBuffer.cpp2
-rw-r--r--gfx/gl/GLScreenBuffer.h1
-rw-r--r--gfx/gl/SharedSurfaceANGLE.cpp1
-rw-r--r--gfx/gl/SharedSurfaceD3D11Interop.cpp2
-rw-r--r--gfx/gl/SharedSurfaceD3D11Interop.h1
-rw-r--r--gfx/gl/SharedSurfaceGL.cpp2
-rw-r--r--gfx/gl/TextureImageEGL.h2
-rw-r--r--gfx/gl/moz.build4
11 files changed, 21 insertions, 2 deletions
diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp
index 23fc3472d..e39858a92 100644
--- a/gfx/gl/GLContextProviderEGL.cpp
+++ b/gfx/gl/GLContextProviderEGL.cpp
@@ -86,6 +86,7 @@
#include "GLContextEGL.h"
#include "GLContextProvider.h"
#include "GLLibraryEGL.h"
+#include "GLScreenBuffer.h"
#include "mozilla/ArrayUtils.h"
#include "mozilla/Preferences.h"
#include "mozilla/widget/CompositorWidget.h"
diff --git a/gfx/gl/GLContextProviderWGL.cpp b/gfx/gl/GLContextProviderWGL.cpp
index da8c93d10..43f5b67e8 100644
--- a/gfx/gl/GLContextProviderWGL.cpp
+++ b/gfx/gl/GLContextProviderWGL.cpp
@@ -7,8 +7,10 @@
#include "GLContextWGL.h"
#include "GLLibraryLoader.h"
#include "nsDebug.h"
+#include "nsIGfxInfo.h"
#include "nsIWidget.h"
#include "gfxPlatform.h"
+#include "gfxUtils.h"
#include "gfxWindowsSurface.h"
#include "prenv.h"
diff --git a/gfx/gl/GLLibraryEGL.cpp b/gfx/gl/GLLibraryEGL.cpp
index 75f40f13f..27bb1c42c 100644
--- a/gfx/gl/GLLibraryEGL.cpp
+++ b/gfx/gl/GLLibraryEGL.cpp
@@ -12,6 +12,7 @@
#include "mozilla/Tokenizer.h"
#include "mozilla/ScopeExit.h"
#include "mozilla/Unused.h"
+#include "mozilla/gfx/Logging.h"
#include "nsDirectoryServiceDefs.h"
#include "nsDirectoryServiceUtils.h"
#include "nsIGfxInfo.h"
@@ -25,6 +26,10 @@
#include "GLContextProvider.h"
#include "gfxPrefs.h"
#include "ScopedGLHelpers.h"
+#include "GLReadTexImageHelper.h"
+
+using namespace mozilla::gfx;
+using namespace mozilla::layers;
namespace mozilla {
namespace gl {
diff --git a/gfx/gl/GLScreenBuffer.cpp b/gfx/gl/GLScreenBuffer.cpp
index 463f7ebab..5d95eb928 100755
--- a/gfx/gl/GLScreenBuffer.cpp
+++ b/gfx/gl/GLScreenBuffer.cpp
@@ -33,10 +33,12 @@
#include "SharedSurfaceGLX.h"
#endif
+
namespace mozilla {
namespace gl {
using gfx::SurfaceFormat;
+using namespace mozilla::layers;
UniquePtr<GLScreenBuffer>
GLScreenBuffer::Create(GLContext* gl,
diff --git a/gfx/gl/GLScreenBuffer.h b/gfx/gl/GLScreenBuffer.h
index 6cacf221d..20692cf48 100644
--- a/gfx/gl/GLScreenBuffer.h
+++ b/gfx/gl/GLScreenBuffer.h
@@ -19,6 +19,7 @@
#include "GLDefs.h"
#include "mozilla/gfx/2D.h"
#include "mozilla/gfx/Point.h"
+#include "mozilla/layers/LayersTypes.h"
#include "mozilla/UniquePtr.h"
#include "SharedSurface.h"
#include "SurfaceTypes.h"
diff --git a/gfx/gl/SharedSurfaceANGLE.cpp b/gfx/gl/SharedSurfaceANGLE.cpp
index e82a24dfd..c0175ffbe 100644
--- a/gfx/gl/SharedSurfaceANGLE.cpp
+++ b/gfx/gl/SharedSurfaceANGLE.cpp
@@ -8,6 +8,7 @@
#include <d3d11.h>
#include "GLContextEGL.h"
#include "GLLibraryEGL.h"
+#include "GLReadTexImageHelper.h"
#include "mozilla/gfx/DeviceManagerDx.h"
#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor, etc
diff --git a/gfx/gl/SharedSurfaceD3D11Interop.cpp b/gfx/gl/SharedSurfaceD3D11Interop.cpp
index e667005d8..42da52e11 100644
--- a/gfx/gl/SharedSurfaceD3D11Interop.cpp
+++ b/gfx/gl/SharedSurfaceD3D11Interop.cpp
@@ -11,6 +11,8 @@
#include "WGLLibrary.h"
#include "nsPrintfCString.h"
#include "mozilla/gfx/DeviceManagerDx.h"
+#include "mozilla/layers/LayersSurfaces.h"
+#include "mozilla/layers/TextureForwarder.h"
namespace mozilla {
namespace gl {
diff --git a/gfx/gl/SharedSurfaceD3D11Interop.h b/gfx/gl/SharedSurfaceD3D11Interop.h
index 0f5bd35cf..dbee50428 100644
--- a/gfx/gl/SharedSurfaceD3D11Interop.h
+++ b/gfx/gl/SharedSurfaceD3D11Interop.h
@@ -7,6 +7,7 @@
#define SHARED_SURFACE_D3D11_INTEROP_H_
#include <windows.h>
+#include <d3d11.h>
#include "SharedSurface.h"
namespace mozilla {
diff --git a/gfx/gl/SharedSurfaceGL.cpp b/gfx/gl/SharedSurfaceGL.cpp
index 6fba1b4eb..adb4429ae 100644
--- a/gfx/gl/SharedSurfaceGL.cpp
+++ b/gfx/gl/SharedSurfaceGL.cpp
@@ -10,6 +10,8 @@
#include "GLReadTexImageHelper.h"
#include "mozilla/gfx/2D.h"
#include "ScopedGLHelpers.h"
+#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor, etc
+#include "mozilla/layers/TextureForwarder.h"
namespace mozilla {
namespace gl {
diff --git a/gfx/gl/TextureImageEGL.h b/gfx/gl/TextureImageEGL.h
index fa7075064..0a645742f 100644
--- a/gfx/gl/TextureImageEGL.h
+++ b/gfx/gl/TextureImageEGL.h
@@ -8,6 +8,8 @@
#include "GLTextureImage.h"
+using namespace mozilla::gfx;
+
namespace mozilla {
namespace gl {
diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build
index 6f43a495d..bfa8f9df5 100644
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -68,7 +68,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
'SharedSurfaceD3D11Interop.h',
'WGLLibrary.h',
]
- UNIFIED_SOURCES += [
+ SOURCES += [
'GLContextProviderWGL.cpp',
'SharedSurfaceANGLE.cpp',
'SharedSurfaceD3D11Interop.cpp',
@@ -118,7 +118,7 @@ elif gl_provider == 'GLX':
'SharedSurfaceGLX.h'
]
-UNIFIED_SOURCES += [
+SOURCES += [
'AndroidSurfaceTexture.cpp',
'DecomposeIntoNoRepeatTriangles.cpp',
'EGLUtils.cpp',