[Bf-blender-cvs] [04345dcf897] blender-v2.83-release: Fix T79703 EEVEE: Crash on Macos due to lightcache baking

Clément Foucault noreply at git.blender.org
Wed Aug 12 10:40:37 CEST 2020


Commit: 04345dcf897c9404a16588a6bc0f99e26ec39df2
Author: Clément Foucault
Date:   Tue Aug 11 20:06:32 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB04345dcf897c9404a16588a6bc0f99e26ec39df2

Fix T79703 EEVEE: Crash on Macos due to lightcache baking

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

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 2ea93704bc3..a86b4e7be4e 100644
--- a/source/blender/gpu/intern/gpu_texture.c
+++ b/source/blender/gpu/intern/gpu_texture.c
@@ -672,6 +672,13 @@ 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 (proxy == GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB &&
+      GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_MAC, GPU_DRIVER_ANY)) {
+    /* Special fix for T79703. */
+    /* Depth has already been checked. */
+    return tex->w <= GPU_max_cube_map_size();
+  }
+
   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)) {



More information about the Bf-blender-cvs mailing list