diff --git a/src/vulkan/runtime/vk_image.c b/src/vulkan/runtime/vk_image.c index 2a8f8d284a1..e6652f3fb74 100644 --- a/src/vulkan/runtime/vk_image.c +++ b/src/vulkan/runtime/vk_image.c @@ -23,7 +23,7 @@ #include "vk_image.h" -#ifndef _WIN32 +#if DETECT_OS_LINUX || DETECT_OS_BSD #include #endif @@ -96,7 +96,7 @@ vk_image_init(struct vk_device *device, vk_find_struct_const(pCreateInfo->pNext, WSI_IMAGE_CREATE_INFO_MESA); image->wsi_legacy_scanout = wsi_info && wsi_info->scanout; -#ifndef _WIN32 +#if DETECT_OS_LINUX || DETECT_OS_BSD image->drm_format_mod = ((1ULL << 56) - 1) /* DRM_FORMAT_MOD_INVALID */; #endif @@ -145,7 +145,7 @@ vk_image_destroy(struct vk_device *device, vk_object_free(device, alloc, image); } -#ifndef _WIN32 +#if DETECT_OS_LINUX || DETECT_OS_BSD VKAPI_ATTR VkResult VKAPI_CALL vk_common_GetImageDrmFormatModifierPropertiesEXT(UNUSED VkDevice device, VkImage _image, diff --git a/src/vulkan/runtime/vk_image.h b/src/vulkan/runtime/vk_image.h index 87d97a6f9d7..c026297b9db 100644 --- a/src/vulkan/runtime/vk_image.h +++ b/src/vulkan/runtime/vk_image.h @@ -25,6 +25,7 @@ #include "vk_object.h" +#include "util/detect_os.h" #include "util/u_math.h" #ifdef __cplusplus @@ -63,7 +64,7 @@ struct vk_image { /* wsi_image_create_info::scanout */ bool wsi_legacy_scanout; -#ifndef _WIN32 +#if DETECT_OS_LINUX || DETECT_OS_BSD /* VK_EXT_drm_format_modifier * * Initialized by vk_image_create/init() to DRM_FORMAT_MOD_INVALID. It's