Merge branch 'master' into blender2.8
[blender.git] / source / blender / gpu / intern / gpu_select.c
index 632b0cfee1b687de4fbb84abb98253432cfaa23b..162a605ef3d04e0fdd7da526d4cf000a77c93c69 100644 (file)
@@ -187,12 +187,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);
 }
 
 /* ----------------------------------------------------------------------------