[Bf-blender-cvs] [af23b09] master: Fix T46496: GL Render fails w/ Anti-Aliasing

Campbell Barton noreply at git.blender.org
Tue Oct 20 15:23:07 CEST 2015


Commit: af23b09e72ed6ed2bc68f13a26ac879e0708dbef
Author: Campbell Barton
Date:   Wed Oct 21 00:16:07 2015 +1100
Branches: master
https://developer.blender.org/rBaf23b09e72ed6ed2bc68f13a26ac879e0708dbef

Fix T46496: GL Render fails w/ Anti-Aliasing

Needed to check if scaled-multisample-blit is supported.

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

M	source/blender/gpu/intern/gpu_extensions.c

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

diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 02e57e4..e1dff03 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -1455,7 +1455,10 @@ GPUOffScreen *GPU_offscreen_create(int width, int height, int samples, char err_
 		    /* Only needed for GPU_offscreen_read_pixels.
 		     * We could add an arg if we intend to use multi-samle
 		     * offscreen buffers w/o reading their pixels */
-		    !GLEW_EXT_framebuffer_blit)
+		    !GLEW_EXT_framebuffer_blit ||
+		    /* This is required when blitting from a multi-sampled buffers,
+		     * even though we're not scaling. */
+		    !GLEW_EXT_framebuffer_multisample_blit_scaled)
 		{
 			samples = 0;
 		}




More information about the Bf-blender-cvs mailing list