Commit: abdaf4159ffb0c862aea7963cf95106ea2e06ae9 Author: Stefan Werner Date: Tue Jun 30 10:47:48 2020 +0200 Branches: blender-v2.83-release https://developer.blender.org/rBabdaf4159ffb0c862aea7963cf95106ea2e06ae9
GPU: Apple/Nvidia Proxy check Apple's Nvidia driverPROXY check also fails. Now the configuration Apple/Nvidia will also bypass the Proxy test. Maniphest Tasks: T78175 Differential Revision: https://developer.blender.org/D8160 =================================================================== M 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 5f8eb383064..2ea93704bc3 100644 --- a/source/blender/gpu/intern/gpu_texture.c +++ b/source/blender/gpu/intern/gpu_texture.c @@ -673,12 +673,14 @@ 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) || + GPU_type_matches(GPU_DEVICE_NVIDIA, GPU_OS_MAC, GPU_DRIVER_OFFICIAL) || 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, * it just states that the OGL implementation can support the texture. - * So manually check the maximum size and maximum number of layers. */ + * So manually check the maximum size and maximum number of layers. + * Same thing happens on Nvidia/macOS 10.15 (T78175). */ switch (proxy) { case GL_PROXY_TEXTURE_2D_ARRAY: if ((tex->d < 0) || (tex->d > GPU_max_texture_layers())) { _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
