[Bf-blender-cvs] [adba79a04fb] tmp-vulkan: Merge commit 'master@{11-weeks-ago}' into tmp-vulkan

[Jeroen Bakker]

Commit: adba79a04fb6f2cea947e78f5db7d7fdffabe301
Author: Jeroen Bakker
Date:   Mon Jun 28 13:15:10 2021 +0200
Branches: tmp-vulkan
https://developer.blender.org/rBadba79a04fb6f2cea947e78f5db7d7fdffabe301

Merge commit 'master@{11-weeks-ago}' into tmp-vulkan

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



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

diff --cc source/blender/gpu/CMakeLists.txt
index 5ca7678f33e,923426c21a6..b508f68f2a5
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@@ -425,12 -382,9 +425,12 @@@ endif(
  blender_add_lib(bf_gpu "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
  
  if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
 +  target_compile_options(bf_gpu
 +    PRIVATE "-Wno-nullability-completeness"
 +  )
+   target_compile_options(bf_gpu PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-Wsuggest-override>)
  endif()
  
- 
  if(WITH_GTESTS)
    if(WITH_OPENGL_DRAW_TESTS)
      set(TEST_SRC