From 25a0acd0a6c8344cfb425f8e9444666dc95d5bf5 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Tue, 9 Jul 2019 11:36:11 +0200 Subject: GPU: ATI Proxy check The AMD PRO driver on linux PROXY check also fails. Now the configuration ATI/Unix/Official driver will also bypass the Proxy test. Reviewed By: fclem Differential Revision: https://developer.blender.org/D5205 --- source/blender/gpu/intern/gpu_texture.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/gpu/intern/gpu_texture.c') diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c index cd98da69469..364bfc80505 100644 --- a/source/blender/gpu/intern/gpu_texture.c +++ b/source/blender/gpu/intern/gpu_texture.c @@ -505,7 +505,8 @@ static float *GPU_texture_rescale_3d( static bool gpu_texture_check_capacity( GPUTexture *tex, GLenum proxy, GLenum internalformat, GLenum data_format, GLenum data_type) { - if (GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_WIN, GPU_DRIVER_ANY)) { + if (GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_WIN, GPU_DRIVER_ANY) || + GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_UNIX, GPU_DRIVER_OFFICIAL)) { /* Some AMD drivers have a faulty `GL_PROXY_TEXTURE_..` check. * (see T55888, T56185, T59351). * Checking with `GL_PROXY_TEXTURE_..` doesn't prevent `Out Of Memory` issue, -- cgit v1.2.3