Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-13 19:41:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1426329 - Reduce includes of GLContext.h in headers. - r=lenzak

Browse Source 
MozReview-Commit-ID: LPrK3ghNI5f
This commit is contained in:
Jeff Gilbert 2017-12-20 00:43:11 -08:00
parent 02a910737b
commit 96cde974a6
6 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gfx/gl/GLLibraryEGL.h
View File

@ -18,32 +18,16 @@
#include <bitset>
#include <vector>
#ifdef XP_WIN
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN 1
#endif
#include <windows.h>
typedef HDC EGLNativeDisplayType;
typedef HBITMAP EGLNativePixmapType;
typedef HWND EGLNativeWindowType;
#else
typedef void* EGLNativeDisplayType;
typedef void* EGLNativePixmapType;
typedef void* EGLNativeWindowType;
#ifdef ANDROID
// We only need to explicitly dlopen egltrace
// on android as we can use LD_PRELOAD or other tricks
// on other platforms. We look for it in /data/local
// as that's writeable by all users
//
// This should really go in GLLibraryEGL.cpp but we currently reference
// APITRACE_LIB in GLContextProviderEGL.cpp. Further refactoring
// will come in subsequent patches on Bug 732865
#define APITRACE_LIB "/data/local/tmp/egltrace.so"
#endif
#ifdef ANDROID
// We only need to explicitly dlopen egltrace
// on android as we can use LD_PRELOAD or other tricks
// on other platforms. We look for it in /data/local
// as that's writeable by all users
//
// This should really go in GLLibraryEGL.cpp but we currently reference
// APITRACE_LIB in GLContextProviderEGL.cpp. Further refactoring
// will come in subsequent patches on Bug 732865
#define APITRACE_LIB "/data/local/tmp/egltrace.so"
#endif
#if defined(MOZ_X11)

19
gfx/gl/GLTypes.h
View File

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#if !defined(GLTYPES_H_)
#ifndef GLTYPES_H_
#define GLTYPES_H_
#include <stddef.h>
@ -94,4 +94,21 @@ typedef uint64_t EGLTime;
#define EGL_NO_SYNC ((EGLSync)0)
#define EGL_NO_IMAGE ((EGLImage)0)
#ifdef XP_WIN
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN 1
#endif
#include <windef.h>
typedef HDC EGLNativeDisplayType;
typedef HBITMAP EGLNativePixmapType;
typedef HWND EGLNativeWindowType;
#else
typedef void* EGLNativeDisplayType;
typedef void* EGLNativePixmapType;
typedef void* EGLNativeWindowType;
#endif
#endif // GLTYPES_H_

2
gfx/gl/SharedSurface.cpp
View File

@ -219,6 +219,8 @@ SharedSurface::SharedSurface(SharedSurfaceType type,
, mIsProducerAcquired(false)
{ }
SharedSurface::~SharedSurface() = default;
layers::TextureFlags
SharedSurface::GetTextureFlags() const
{

3
gfx/gl/SharedSurface.h
View File

@ -76,8 +76,7 @@ protected:
bool canRecycle);
public:
virtual ~SharedSurface() {
}
virtual ~SharedSurface();
// Specifies to the TextureClient any flags which
// are required by the SharedSurface backend.

1
gfx/vr/ipc/VRLayerChild.h
View File

@ -11,7 +11,6 @@
#include "mozilla/RefPtr.h"
#include "mozilla/gfx/PVRLayerChild.h"
#include "GLContext.h"
#include "gfxVR.h"
class nsICanvasRenderingContextInternal;

4
widget/android/AndroidCompositorWidget.h
View File

@ -6,9 +6,7 @@
#ifndef mozilla_widget_AndroidCompositorWidget_h
#define mozilla_widget_AndroidCompositorWidget_h
#include "GLContext.h"
#include "GLLibraryEGL.h"
#include "GLTypes.h"
#include "GLDefs.h"
#include "mozilla/widget/InProcessCompositorWidget.h"
struct ANativeWindow;