From 8ffb76138731d6241a6ac5bfc17bb764cfa59053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Tue, 17 Oct 2017 03:06:04 +0200 Subject: GPUFramebuffer: Fix recursive downsample exiting early. I should really proof read my commits a bit more. --- source/blender/gpu/intern/gpu_framebuffer.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'source/blender') diff --git a/source/blender/gpu/intern/gpu_framebuffer.c b/source/blender/gpu/intern/gpu_framebuffer.c index 1d157ecb14c..de5dff1b69c 100644 --- a/source/blender/gpu/intern/gpu_framebuffer.c +++ b/source/blender/gpu/intern/gpu_framebuffer.c @@ -576,23 +576,24 @@ void GPU_framebuffer_recursive_downsample( for (i = 1; i < num_iter + 1; i++) { + /* calculate next viewport size */ + current_dim[0] /= 2; + current_dim[1] /= 2; + if (GPU_type_matches(GPU_DEVICE_AMD_VEGA, GPU_OS_UNIX, GPU_DRIVER_OPENSOURCE)) { /* NOTE : here 16 is because of a bug on AMD Vega GPU + non-pro drivers, that prevents us * from sampling mipmaps that are smaller or equal to 16px. (9) */ - if (current_dim[0] / 2 > 16 && current_dim[1] / 2 > 16) { + if (current_dim[0] <= 16 && current_dim[1] <= 16) { break; } } else { - if (current_dim[0] / 2 > 1 && current_dim[1] / 2 > 1) { + if (current_dim[0] <= 2 && current_dim[1] <= 2) { + /* Cannot reduce further. */ break; } } - /* calculate next viewport size */ - current_dim[0] /= 2; - current_dim[1] /= 2; - /* ensure that the viewport size is always at least 1x1 */ CLAMP_MIN(current_dim[0], 1); CLAMP_MIN(current_dim[1], 1); -- cgit v1.2.3