Commit: 32bedbaa5843eedf55f706d21f10112f2867973a Author: Christian Rauch Date: Wed Jun 23 00:15:59 2021 +0100 Branches: wl_default https://developer.blender.org/rB32bedbaa5843eedf55f706d21f10112f2867973a
GHOST: remove unused EGL context includes in Win32 and Cocoa =================================================================== M intern/ghost/intern/GHOST_SystemCocoa.mm M intern/ghost/intern/GHOST_SystemWin32.cpp M intern/ghost/intern/GHOST_WindowCocoa.mm M intern/ghost/intern/GHOST_WindowWin32.cpp =================================================================== diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index 6ddb7f031f5..e69da16f600 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 aa8dad44799..8534b589341 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 _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
