diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-15 16:55:46 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-15 16:55:46 +0300 |
| commit | e016a29ba019e523de5e7bf271213fee09c470ac (patch) | |
| tree | 68de5c90b484a756c67bdac9702cd1eb7110b27a /source/blender/gpu/intern/gpu_select.c | |
| parent | 6b720dffc91738b3b8cdda8559af6a3749e0632b (diff) | |
Blender 2.8: Always prefer Occlusion Queries when using AUTO selection mode
GL_SELECT is really slow in this branch and will be removed.
For now we simply change AUTO behavior to avoid possible conflicts with merges
and upcoming color-id-based selection.
Diffstat (limited to 'source/blender/gpu/intern/gpu_select.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_select.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/gpu/intern/gpu_select.c b/source/blender/gpu/intern/gpu_select.c index 9496ff137dc..c384fa01fc6 100644 --- a/source/blender/gpu/intern/gpu_select.c +++ b/source/blender/gpu/intern/gpu_select.c @@ -181,12 +181,7 @@ unsigned int GPU_select_end(void) */ 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) || - /* unsupported by nouveau, gallium 0.4, see: T47940 */ - GPU_type_matches(GPU_DEVICE_NVIDIA, GPU_OS_UNIX, GPU_DRIVER_OPENSOURCE)))); - + return ELEM(U.gpu_select_method, USER_SELECT_USE_OCCLUSION_QUERY, USER_SELECT_AUTO); } /* ---------------------------------------------------------------------------- |