[Bf-blender-cvs] [3996fbc] blender2.8: OpenGL: bump Windows to GL 3.3 compat profile

[Mike Erwin]

Commit: 3996fbc564632b76ca00693e3eaa64827f5d5754
Author: Mike Erwin
Date:   Sat Oct 15 14:41:03 2016 -0400
Branches: blender2.8
https://developer.blender.org/rB3996fbc564632b76ca00693e3eaa64827f5d5754

OpenGL: bump Windows to GL 3.3 compat profile

Part of T49012

===================================================================

M	intern/ghost/intern/GHOST_ContextWGL.cpp
M	intern/ghost/intern/GHOST_WindowWin32.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_ContextWGL.cpp b/intern/ghost/intern/GHOST_ContextWGL.cpp
index 255c134..39ef63f 100644
--- a/intern/ghost/intern/GHOST_ContextWGL.cpp
+++ b/intern/ghost/intern/GHOST_ContextWGL.cpp
@@ -962,7 +962,7 @@ GHOST_TSuccess GHOST_ContextWGL::initializeDrawingContext()
 	     strcmp(renderer, "GDI Generic") == 0) && version[0] == '1' && version[2] == '1')
 	{
 		MessageBox(m_hWnd, "Your system does not use 3D hardware acceleration.\n"
-		                   "Blender requires a graphics driver with OpenGL 3.2 support.\n\n"
+		                   "Blender requires a graphics driver with OpenGL 3.3 support.\n\n"
 		                   "This may be caused by:\n"
 		                   "* A missing or faulty graphics driver installation.\n"
 		                   "  Blender needs a graphics card driver to work correctly.\n"
@@ -973,8 +973,8 @@ GHOST_TSuccess GHOST_ContextWGL::initializeDrawingContext()
 		           MB_OK | MB_ICONERROR);
 		exit(0);
 	}
-	else if (version[0] < '3' || (version[0] == '3' && version[2] < '2')) {
-		MessageBox(m_hWnd, "Blender requires a graphics driver with OpenGL 3.2 support.\n\n"
+	else if (version[0] < '3' || (version[0] == '3' && version[2] < '3')) {
+		MessageBox(m_hWnd, "Blender requires a graphics driver with OpenGL 3.3 support.\n\n"
 		                   "The program will now close.",
 		           "Blender - Unsupported Graphics Driver!",
 		           MB_OK | MB_ICONERROR);
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index 32bdbe6..1f49ade 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -628,12 +628,12 @@ GHOST_Context *GHOST_WindowWin32::newDrawingContext(GHOST_TDrawingContextType ty
 		        m_hDC,
 		        profile_mask,
 #if 0
-		        3, 2, // specific GL version requested
+		        3, 3, // specific GL version requested
 		              // AMD gives us exactly this version
 		              // NVIDIA gives at least this version <-- desired behavior
 #else
 		        2, 1, // any GL version >= 2.1 (hopefully the latest)
-		              // we check later to ensure it's >= 3.2 on Windows
+		              // we check later to ensure it's >= 3.3 on Windows
 		              // TODO(merwin): fix properly!
 		              //               2.1 ignores the profile bit & is incompatible with core profile
 		              //               query version of initial dummy context, request that + profile + debug