[Bf-blender-cvs] [e016a29ba0] blender2.8: Blender 2.8: Always prefer Occlusion Queries when using AUTO selection mode

Sergey Sharybin noreply at git.blender.org
Wed Mar 15 14:57:22 CET 2017


Commit: e016a29ba019e523de5e7bf271213fee09c470ac
Author: Sergey Sharybin
Date:   Wed Mar 15 14:55:46 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBe016a29ba019e523de5e7bf271213fee09c470ac

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.

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

M	source/blender/gpu/intern/gpu_select.c

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

diff --git a/source/blender/gpu/intern/gpu_select.c b/source/blender/gpu/intern/gpu_select.c
index 9496ff137d..c384fa01fc 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);
 }
 
 /* ----------------------------------------------------------------------------




More information about the Bf-blender-cvs mailing list