[Bf-blender-cvs] [cd6c6ee] master: Fix T46993: UI lag in fullscreen mode on OS X / Intel graphics.
Brecht Van Lommel
noreply at git.blender.org
Thu Jan 7 23:53:54 CET 2016
Commit: cd6c6ee1a54ec0eed33592bcb7e499ce5141d4ac
Author: Brecht Van Lommel
Date: Thu Jan 7 23:45:12 2016 +0100
Branches: master
https://developer.blender.org/rBcd6c6ee1a54ec0eed33592bcb7e499ce5141d4ac
Fix T46993: UI lag in fullscreen mode on OS X / Intel graphics.
If anyone finds OS X UI drawing glitches with different graphics cards please
report them and I'll add an exception specifically for Intel, but in theory this
should work fine for all graphics cards.
===================================================================
M intern/ghost/intern/GHOST_ContextCGL.mm
M source/blender/windowmanager/intern/wm_draw.c
===================================================================
diff --git a/intern/ghost/intern/GHOST_ContextCGL.mm b/intern/ghost/intern/GHOST_ContextCGL.mm
index 6a9c23e..e09de4b 100644
--- a/intern/ghost/intern/GHOST_ContextCGL.mm
+++ b/intern/ghost/intern/GHOST_ContextCGL.mm
@@ -177,10 +177,6 @@ static void makeAttribList(
// Pixel Format Attributes for the windowed NSOpenGLContext
attribs.push_back(NSOpenGLPFADoubleBuffer);
- // Guarantees the back buffer contents to be valid after a call to NSOpenGLContext object's flushBuffer
- // needed for 'Draw Overlap' drawing method
- attribs.push_back(NSOpenGLPFABackingStore);
-
// Force software OpenGL, for debugging
/* XXX jwilkins: fixed this to work on Intel macs? useful feature for Windows and Linux too?
* Maybe a command line flag is better... */
diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c
index 8ace4ee..d20cffe 100644
--- a/source/blender/windowmanager/intern/wm_draw.c
+++ b/source/blender/windowmanager/intern/wm_draw.c
@@ -864,15 +864,6 @@ static int wm_automatic_draw_method(wmWindow *win)
/* ATI opensource driver is known to be very slow at this */
if (GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_UNIX, GPU_DRIVER_OPENSOURCE))
return USER_DRAW_OVERLAP;
- /* also Intel drivers are slow */
-#if 0 /* 2.64 BCon3 period, let's try if intel now works... */
- else if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_UNIX, GPU_DRIVER_ANY))
- return USER_DRAW_OVERLAP;
- else if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_WIN, GPU_DRIVER_ANY))
- return USER_DRAW_OVERLAP_FLIP;
- else if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_MAC, GPU_DRIVER_ANY))
- return USER_DRAW_OVERLAP_FLIP;
-#endif
/* Windows software driver darkens color on each redraw */
else if (GPU_type_matches(GPU_DEVICE_SOFTWARE, GPU_OS_WIN, GPU_DRIVER_SOFTWARE))
return USER_DRAW_OVERLAP_FLIP;
More information about the Bf-blender-cvs
mailing list