[Bf-blender-cvs] [f8da7218be1] master: Fix T70187: GPU Driver: Merge Vertices Crashes ATI/Linux/OpenSource
Jeroen Bakker
noreply at git.blender.org
Wed Sep 25 15:58:15 CEST 2019
Commit: f8da7218be130b26eccc33df2ba78004509e4b82
Author: Jeroen Bakker
Date: Wed Sep 25 15:54:55 2019 +0200
Branches: master
https://developer.blender.org/rBf8da7218be130b26eccc33df2ba78004509e4b82
Fix T70187: GPU Driver: Merge Vertices Crashes ATI/Linux/OpenSource
This has been tested with 18.2.2, 19.0.8 and 19.3.0~develop.
Reviewed By: fclem
Differential Revision: https://developer.blender.org/D5886
===================================================================
M source/blender/gpu/intern/gpu_extensions.c
===================================================================
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 8368577a05d..7b6759c44bf 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -401,6 +401,12 @@ void gpu_extensions_init(void)
GG.context_local_shaders_workaround = true;
}
}
+ else if ((GG.device == GPU_DEVICE_ATI) && (GG.os == GPU_OS_UNIX) &&
+ (GG.driver == GPU_DRIVER_OPENSOURCE)) {
+ /* See T70187: merging vertices fail. This has been tested from 18.2.2 till 19.3.0~dev of the
+ * Mesa driver */
+ GG.unused_fb_slot_workaround = true;
+ }
GPU_invalid_tex_init();
}
More information about the Bf-blender-cvs
mailing list