Vulkan: Remove MoltenVK
Blender had some support for using MoltenVK. However there are some key issues why MotlenVK cannot be used. Bugs have been reported up-stream. As it doesn't work and holds back regular developments it will be removed from the main branch. Any efforts on making Vulkan run on Apple (including KosmicKrisp) is considered a community effort and can be done in a development branch. Pull Request: https://projects.blender.org/blender/blender/pulls/144602
This commit is contained in:
@@ -90,16 +90,6 @@ if(WITH_OPENGL_BACKEND)
|
||||
endif()
|
||||
|
||||
if(WITH_VULKAN_BACKEND)
|
||||
if(WITH_VULKAN_MOLTENVK)
|
||||
list(APPEND INC_SYS
|
||||
PUBLIC ${MOLTENVK_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
list(APPEND LIB
|
||||
${MOLTENVK_LIBRARIES}
|
||||
)
|
||||
endif()
|
||||
|
||||
list(APPEND SRC
|
||||
intern/GHOST_ContextVK.cc
|
||||
|
||||
|
||||
@@ -12,11 +12,7 @@
|
||||
#include <string>
|
||||
|
||||
#ifdef WITH_VULKAN_BACKEND
|
||||
# ifdef __APPLE__
|
||||
# include <MoltenVK/vk_mvk_moltenvk.h>
|
||||
# else
|
||||
# include <vulkan/vulkan_core.h>
|
||||
# endif
|
||||
# include <vulkan/vulkan_core.h>
|
||||
#endif
|
||||
|
||||
/* This is used by `GHOST_C-api.h` too, cannot use C++ conventions. */
|
||||
|
||||
@@ -10,8 +10,6 @@
|
||||
|
||||
#ifdef _WIN32
|
||||
# include <vulkan/vulkan_win32.h>
|
||||
#elif defined(__APPLE__)
|
||||
# include <MoltenVK/vk_mvk_moltenvk.h>
|
||||
#else /* X11/WAYLAND. */
|
||||
# ifdef WITH_GHOST_X11
|
||||
# include <vulkan/vulkan_xlib.h>
|
||||
@@ -279,11 +277,8 @@ class GHOST_DeviceVK {
|
||||
queue_create_infos.push_back(graphic_queue_create_info);
|
||||
|
||||
VkPhysicalDeviceFeatures device_features = {};
|
||||
#ifndef __APPLE__
|
||||
device_features.geometryShader = VK_TRUE;
|
||||
/* MoltenVK supports logicOp, needs to be build with MVK_USE_METAL_PRIVATE_API. */
|
||||
device_features.logicOp = VK_TRUE;
|
||||
#endif
|
||||
device_features.dualSrcBlend = VK_TRUE;
|
||||
device_features.imageCubeArray = VK_TRUE;
|
||||
device_features.multiDrawIndirect = VK_TRUE;
|
||||
|
||||
Reference in New Issue
Block a user