diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2016-10-15 21:41:03 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2016-10-15 21:41:29 +0300 |
| commit | 3996fbc564632b76ca00693e3eaa64827f5d5754 (patch) | |
| tree | 1792dfaf4db2ba46ebf3d780b8d429f8cf96e7d1 | |
| parent | cf5750a85e68928f19ec17376adadc6dee1f5103 (diff) | |
OpenGL: bump Windows to GL 3.3 compat profile
Part of T49012
| -rw-r--r-- | intern/ghost/intern/GHOST_ContextWGL.cpp | 6 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowWin32.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/intern/ghost/intern/GHOST_ContextWGL.cpp b/intern/ghost/intern/GHOST_ContextWGL.cpp index 255c134e0e7..39ef63fa723 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 32bdbe6a611..1f49adecdef 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 |