diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
tree | 3d53dacf6430f9099e1fb20835881205de674961 /src/3rdparty/angle/src/libGLESv2/global_state.h | |
parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'src/3rdparty/angle/src/libGLESv2/global_state.h')
-rw-r--r-- | src/3rdparty/angle/src/libGLESv2/global_state.h | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/src/3rdparty/angle/src/libGLESv2/global_state.h b/src/3rdparty/angle/src/libGLESv2/global_state.h index db202539cb..3e3740c90e 100644 --- a/src/3rdparty/angle/src/libGLESv2/global_state.h +++ b/src/3rdparty/angle/src/libGLESv2/global_state.h @@ -9,8 +9,6 @@ #ifndef LIBGLESV2_GLOBALSTATE_H_ #define LIBGLESV2_GLOBALSTATE_H_ -#include <EGL/egl.h> - namespace gl { class Context; @@ -18,32 +16,14 @@ class Context; Context *GetGlobalContext(); Context *GetValidGlobalContext(); -} +} // namespace gl namespace egl { -class Error; -class Display; -class Surface; - -void SetGlobalError(const Error &error); -EGLint GetGlobalError(); - -void SetGlobalAPI(EGLenum API); -EGLenum GetGlobalAPI(); - -void SetGlobalDisplay(Display *dpy); -Display *GetGlobalDisplay(); - -void SetGlobalDrawSurface(Surface *surface); -Surface *GetGlobalDrawSurface(); - -void SetGlobalReadSurface(Surface *surface); -Surface *GetGlobalReadSurface(); +class Thread; -void SetGlobalContext(gl::Context *context); -gl::Context *GetGlobalContext(); +Thread *GetCurrentThread(); -} +} // namespace egl #endif // LIBGLESV2_GLOBALSTATE_H_ |