diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/png/SCsub | 3 | ||||
| -rw-r--r-- | drivers/unix/ip_unix.cpp | 2 | ||||
| -rw-r--r-- | drivers/vulkan/vulkan_context.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/png/SCsub b/drivers/png/SCsub index 26508dc612..39d296e7cf 100644 --- a/drivers/png/SCsub +++ b/drivers/png/SCsub @@ -36,7 +36,8 @@ if env["builtin_libpng"]: # Currently .ASM filter_neon.S does not compile on NT. import os - use_neon = "neon_enabled" in env and env["neon_enabled"] and os.name != "nt" + # Enable ARM NEON instructions on 32-bit Android to compile more optimized code. + use_neon = "android_arch" in env and env["android_arch"] == "armv7" and os.name != "nt" if use_neon: env_png.Append(CPPDEFINES=[("PNG_ARM_NEON_OPT", 2)]) else: diff --git a/drivers/unix/ip_unix.cpp b/drivers/unix/ip_unix.cpp index d32592e81a..42b5bbfaf2 100644 --- a/drivers/unix/ip_unix.cpp +++ b/drivers/unix/ip_unix.cpp @@ -110,7 +110,7 @@ void IPUnix::_resolve_hostname(List<IPAddress> &r_addresses, const String &p_hos struct addrinfo *next = result; do { - if (next->ai_addr == NULL) { + if (next->ai_addr == nullptr) { next = next->ai_next; continue; } diff --git a/drivers/vulkan/vulkan_context.cpp b/drivers/vulkan/vulkan_context.cpp index 152efc7807..44fed02f41 100644 --- a/drivers/vulkan/vulkan_context.cpp +++ b/drivers/vulkan/vulkan_context.cpp @@ -525,7 +525,7 @@ Error VulkanContext::_check_capabilities() { // check our extended features VkPhysicalDeviceMultiviewFeatures multiview_features; multiview_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES; - multiview_features.pNext = NULL; + multiview_features.pNext = nullptr; VkPhysicalDeviceFeatures2 device_features; device_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; |