Commit: b9f4f9e4ff1c3f9ab9268ef68789926eba0f71e6
Author: Clément Foucault
Date: Sat Feb 24 03:00:09 2018 +0100
Branches: temp-drawcontext
https://developer.blender.org/rBb9f4f9e4ff1c3f9ab9268ef68789926eba0f71e6
GHOST: OSX: Make OGL 3.3 core profile defaults.
We are using 3.3 features for Blender 2.8. There is no other choice.
===================================================================
M intern/ghost/intern/GHOST_ContextCGL.mm
M intern/ghost/intern/GHOST_SystemCocoa.mm
M intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm
b/intern/ghost/intern/GHOST_ContextCGL.mm
index 6cc3f4dd28a..598dccdaad7 100644
--- a/intern/ghost/intern/GHOST_ContextCGL.mm
+++ b/intern/ghost/intern/GHOST_ContextCGL.mm
@@ -73,7 +73,7 @@ GHOST_ContextCGL::GHOST_ContextCGL(
break;
case 3:
// Apple didn't implement 3.0 or 3.1
- assert(contextMinorVersion == 2);
+ assert(contextMinorVersion == 3);
assert(contextProfileMask ==
GL_CONTEXT_CORE_PROFILE_BIT);
m_coreProfile = true;
break;
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm
b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 16d9de396f6..011719ea946 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -602,7 +602,7 @@ createOffscreenContext()
#if defined(WITH_GL_PROFILE_CORE)
GL_CONTEXT_CORE_PROFILE_BIT,
- 3, 2,
+ 3, 3,
#else
0, // no profile bit
2, 1,
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm
b/intern/ghost/intern/GHOST_WindowCocoa.mm
index 309c19f92af..2b986428fd3 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -1005,7 +1005,7 @@ GHOST_Context
*GHOST_WindowCocoa::newDrawingContext(GHOST_TDrawingContextType ty
#if defined(WITH_GL_PROFILE_CORE)
GL_CONTEXT_CORE_PROFILE_BIT,
- 3, 2,
+ 3, 3,
#else
0, // no profile bit
2, 1,
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
