[Bf-blender-cvs] [e2d18eda755] temp-vulkan-shader: Merge branch 'temp-vulkan-memory-allocator' into temp-vulkan-shader

[Jeroen Bakker]

Commit: e2d18eda7559327631fb3bc91e0179b47c5edf9f
Author: Jeroen Bakker
Date:   Tue Nov 22 16:38:41 2022 +0100
Branches: temp-vulkan-shader
https://developer.blender.org/rBe2d18eda7559327631fb3bc91e0179b47c5edf9f

Merge branch 'temp-vulkan-memory-allocator' into temp-vulkan-shader

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



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

diff --cc source/blender/gpu/CMakeLists.txt
index 5a2c7e95411,2708b0fe084..f0e5fef26a0
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@@ -279,10 -271,26 +273,28 @@@ endif(
  
  set(LIB
    ${Epoxy_LIBRARIES}
 +  ${VULKAN_LIBRARIES}
 +  ${MOLTENVK_LIBRARIES}
  )
  
+ if(WITH_VULKAN_BACKEND)
+   list(APPEND SRC ${VULKAN_SRC})
+ 
+   add_definitions(-DWITH_VULKAN_BACKEND)
+ 
+   list(APPEND INC_SYS
+     ${VULKAN_INCLUDE_DIRS}
+   )
+ 
+   list(APPEND INC
+     ../../../extern/vulkan_memory_allocator/
+   )
+ 
+   list(APPEND LIB
+     extern_vulkan_memory_allocator
+   )
+ endif()
+ 
  set(MSL_SRC
    shaders/metal/mtl_shader_defines.msl
    shaders/metal/mtl_shader_common.msl