Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-10-20 16:16:07 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-10-20 16:16:07 +0300
commitaf23b09e72ed6ed2bc68f13a26ac879e0708dbef (patch)
tree1abe334fc052135cdd1cf836f83ef29dd1432f91
parente5916187e808c1c22229589d103f4de4d4411b5b (diff)
Fix T46496: GL Render fails w/ Anti-Aliasing
Needed to check if scaled-multisample-blit is supported.
-rw-r--r--source/blender/gpu/intern/gpu_extensions.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 02e57e4b505..e1dff03d500 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;
}