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:
authorClément Foucault <foucault.clem@gmail.com>2020-08-11 21:06:32 +0300
committerJeroen Bakker <jeroen@blender.org>2020-08-12 11:39:23 +0300
commit04345dcf897c9404a16588a6bc0f99e26ec39df2 (patch)
tree9aac6676987466384c3c9ce51adfffa988bc23a6
parent200de72d26127685bb6e20ec01dc69a0201653e4 (diff)
Fix T79703 EEVEE: Crash on Macos due to lightcache baking
-rw-r--r--source/blender/gpu/intern/gpu_texture.c7
1 files changed, 7 insertions, 0 deletions
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)) {