diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-03-30 16:55:48 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-03-30 16:59:04 +0300 |
commit | ee364b63582c606977cc7dc54435d02fb9e1981c (patch) | |
tree | c232844872849e638b3fd608044a6e5cac146883 /source/blender/gpu | |
parent | 74d3f3746c644546f583587fc8d38f9538a0595f (diff) |
Fix T47940: Custom bone shapes, select error w/ Open NVidia drivers
Latest nouveau drivers have a bug here, use occlusion queries.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/intern/gpu_select.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_select.c b/source/blender/gpu/intern/gpu_select.c index d7b197756f9..58582232cd5 100644 --- a/source/blender/gpu/intern/gpu_select.c +++ b/source/blender/gpu/intern/gpu_select.c @@ -255,5 +255,8 @@ bool GPU_select_query_check_active(void) { return ((U.gpu_select_method == USER_SELECT_USE_OCCLUSION_QUERY) || ((U.gpu_select_method == USER_SELECT_AUTO) && - GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_ANY, GPU_DRIVER_ANY))); + (GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_ANY, GPU_DRIVER_ANY) || + /* unsupported by nouveau, gallium 0.4, see: T47940 */ + GPU_type_matches(GPU_DEVICE_NVIDIA, GPU_OS_UNIX, GPU_DRIVER_OPENSOURCE)))); + } |