diff options
| author | Christian Rauch <Rauch.Christian@gmx.de> | 2021-06-23 02:15:59 +0300 |
|---|---|---|
| committer | Christian Rauch <Rauch.Christian@gmx.de> | 2021-06-24 20:40:05 +0300 |
| commit | b129a0b39742e142ff223692288129fbc146e825 (patch) | |
| tree | 7e5d92fbbe72884cf0075884e77fd7dc965eeeac | |
| parent | 5f27a5fff7f24d57c39e4b79feeeb4c408c89139 (diff) | |
GHOST: remove unused EGL context includes in Win32 and Cocoa
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 6 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.cpp | 6 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowCocoa.mm | 6 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowWin32.cpp | 7 |
4 files changed, 5 insertions, 20 deletions
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index f0cc8946215..e0e4438a8b2 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -32,11 +32,7 @@ #include "GHOST_WindowCocoa.h" #include "GHOST_WindowManager.h" -#if defined(WITH_GL_EGL) -# include "GHOST_ContextEGL.h" -#else -# include "GHOST_ContextCGL.h" -#endif +#include "GHOST_ContextCGL.h" #ifdef WITH_INPUT_NDOF # include "GHOST_NDOFManagerCocoa.h" diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index 2eecea2ef5d..e9fd771e866 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -50,11 +50,7 @@ #include "GHOST_WindowManager.h" #include "GHOST_WindowWin32.h" -#if defined(WITH_GL_EGL) -# include "GHOST_ContextEGL.h" -#else -# include "GHOST_ContextWGL.h" -#endif +#include "GHOST_ContextWGL.h" #ifdef WITH_INPUT_NDOF # include "GHOST_NDOFManagerWin32.h" diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index 1776b0d5ce0..d082fa99ad8 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -22,11 +22,7 @@ #include "GHOST_Debug.h" #include "GHOST_SystemCocoa.h" -#if defined(WITH_GL_EGL) -# include "GHOST_ContextEGL.h" -#else -# include "GHOST_ContextCGL.h" -#endif +#include "GHOST_ContextCGL.h" #include <Cocoa/Cocoa.h> #include <Metal/Metal.h> diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index 33c79daf11d..0a647c446e7 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -30,11 +30,8 @@ #include "utf_winfunc.h" #include "utfconv.h" -#if defined(WITH_GL_EGL) -# include "GHOST_ContextEGL.h" -#else -# include "GHOST_ContextWGL.h" -#endif +#include "GHOST_ContextWGL.h" + #ifdef WIN32_COMPOSITING # include <Dwmapi.h> #endif |