Display Server support
This commit is contained in:
parent
af424b1c7c
commit
e167af3737
14 changed files with 953 additions and 748 deletions
|
|
@ -7,7 +7,12 @@ env.add_source_files(env.drivers_sources, "*.cpp")
|
|||
if env["platform"] == "android":
|
||||
# Use NDK Vulkan headers
|
||||
thirdparty_dir = env["ANDROID_NDK_ROOT"] + "/sources/third_party/vulkan/src"
|
||||
thirdparty_includes = [thirdparty_dir, thirdparty_dir + "/include", thirdparty_dir + "/layers", thirdparty_dir + "/layers/generated"]
|
||||
thirdparty_includes = [
|
||||
thirdparty_dir,
|
||||
thirdparty_dir + "/include",
|
||||
thirdparty_dir + "/layers",
|
||||
thirdparty_dir + "/layers/generated",
|
||||
]
|
||||
env.Prepend(CPPPATH=thirdparty_includes)
|
||||
elif env["builtin_vulkan"]:
|
||||
# Use bundled Vulkan headers
|
||||
|
|
|
|||
|
|
@ -1564,7 +1564,10 @@ RID RenderingDeviceVulkan::texture_create(const TextureFormat &p_format, const T
|
|||
image_create_info.pNext = nullptr;
|
||||
image_create_info.flags = 0;
|
||||
|
||||
// TODO: vkCreateImage fails with format list on Android (VK_ERROR_OUT_OF_HOST_MEMORY)
|
||||
#ifndef _MSC_VER
|
||||
#warning TODO check for support via RenderingDevice to enable on mobile when possible
|
||||
#endif
|
||||
// vkCreateImage fails with format list on Android (VK_ERROR_OUT_OF_HOST_MEMORY)
|
||||
#ifndef ANDROID_ENABLED
|
||||
if (p_format.shareable_formats.size()) {
|
||||
image_create_info.flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT;
|
||||
|
|
|
|||
|
|
@ -37,8 +37,10 @@
|
|||
#include "servers/rendering/rendering_device.h"
|
||||
|
||||
#ifdef DEBUG_ENABLED
|
||||
#ifndef _DEBUG
|
||||
#define _DEBUG
|
||||
#endif
|
||||
#endif
|
||||
#include "vk_mem_alloc.h"
|
||||
#include <vulkan/vulkan.h>
|
||||
//todo:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue