diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c index 3a00caddfb..c69d0d08ff 100644 --- a/src/vulkan/wsi/wsi_common_x11.c +++ b/src/vulkan/wsi/wsi_common_x11.c @@ -168,7 +168,7 @@ wsi_x11_connection_create(const VkAllocationCallbacks *alloc, } wsi_conn->has_dri3 = dri3_reply->present != 0; -#ifdef HAVE_DRI3_MODIFIERS +#if 0 if (wsi_conn->has_dri3) { xcb_dri3_query_version_cookie_t ver_cookie; xcb_dri3_query_version_reply_t *ver_reply; @@ -182,7 +182,7 @@ wsi_x11_connection_create(const VkAllocationCallbacks *alloc, #endif wsi_conn->has_present = pres_reply->present != 0; -#ifdef HAVE_DRI3_MODIFIERS +#if 0 if (wsi_conn->has_present) { xcb_present_query_version_cookie_t ver_cookie; xcb_present_query_version_reply_t *ver_reply; @@ -763,7 +763,7 @@ x11_handle_dri3_present_event(struct x11_swapchain *chain, /* The winsys is now trying to flip directly and cannot due to our * configuration. Request the user reallocate. */ -#ifdef HAVE_DRI3_MODIFIERS +#if 0 if (complete->mode == XCB_PRESENT_COMPLETE_MODE_SUBOPTIMAL_COPY && chain->last_present_mode != XCB_PRESENT_COMPLETE_MODE_SUBOPTIMAL_COPY) result = VK_SUBOPTIMAL_KHR; @@ -914,7 +914,7 @@ x11_present_to_x11(struct x11_swapchain *chain, uint32_t image_index, if (chain->base.present_mode == VK_PRESENT_MODE_IMMEDIATE_KHR) options |= XCB_PRESENT_OPTION_ASYNC; -#ifdef HAVE_DRI3_MODIFIERS +#if 0 if (chain->has_dri3_modifiers) options |= XCB_PRESENT_OPTION_SUBOPTIMAL; #endif @@ -1054,7 +1054,7 @@ x11_image_init(VkDevice device_h, struct x11_swapchain *chain, image->pixmap = xcb_generate_id(chain->conn); -#ifdef HAVE_DRI3_MODIFIERS +#if 0 if (image->base.drm_modifier != DRM_FORMAT_MOD_INVALID) { /* If the image has a modifier, we must have DRI3 v1.2. */ assert(chain->has_dri3_modifiers); @@ -1162,7 +1162,7 @@ wsi_x11_get_dri3_modifiers(struct wsi_x11_connection *wsi_conn, if (!wsi_conn->has_dri3_modifiers) goto out; -#ifdef HAVE_DRI3_MODIFIERS +#if 0 xcb_generic_error_t *error = NULL; xcb_dri3_get_supported_modifiers_cookie_t mod_cookie = xcb_dri3_get_supported_modifiers(conn, window, depth, bpp);