mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2026-04-14 08:22:25 -04:00
002659e6f4
On some NVIDIA systems, the DRI3 modifier list only advertises DRM_FORMAT_MOD_INVALID while the renderer requires a specific modifier (e.g. BLOCK_LINEAR). As a result, the X11 backend cannot import renderer buffers via DRI3 and output commits fail. Allow the renderer to allocate buffers with its preferred modifier when DRI3 doesn't expose explicit modifiers. If buffer import fails, fall back to CPU readback: read pixels from the rendered texture into shared memory and upload the result to a pixmap via xcb_shm_put_image before presenting it. This ensures the X11 backend can still produce output even when the X server cannot import the renderer's buffers. While implementing this fallback, split the existing SHM capability flag into two: have_shm: SHM extension available (required for readback fallback) have_shm_pixmaps: server supports shared pixmaps Also fix the SHM version check which incorrectly used || instead of a proper >= 1.2 comparison. Tested with labwc 0.9.5 (WLR_BACKENDS=x11) on Ubuntu 24.04 with an NVIDIA GeForce GTX 1650 (driver 580.126.18), where output commits previously failed with "Failed to commit frame".
158 lines
3.5 KiB
C
158 lines
3.5 KiB
C
#ifndef BACKEND_X11_H
|
|
#define BACKEND_X11_H
|
|
|
|
#include <wlr/config.h>
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include <wayland-server-core.h>
|
|
#include <xcb/xcb.h>
|
|
#include <xcb/present.h>
|
|
#include <xcb/shm.h>
|
|
|
|
#include <pixman.h>
|
|
#include <wlr/backend/x11.h>
|
|
#include <wlr/interfaces/wlr_keyboard.h>
|
|
#include <wlr/interfaces/wlr_output.h>
|
|
#include <wlr/interfaces/wlr_touch.h>
|
|
#include <wlr/types/wlr_pointer.h>
|
|
#include <wlr/render/drm_format_set.h>
|
|
|
|
#include "config.h"
|
|
|
|
#if HAVE_XCB_ERRORS
|
|
#include <xcb/xcb_errors.h>
|
|
#endif
|
|
|
|
#define XCB_EVENT_RESPONSE_TYPE_MASK 0x7f
|
|
|
|
struct wlr_x11_backend;
|
|
|
|
struct wlr_x11_output {
|
|
struct wlr_output wlr_output;
|
|
struct wlr_x11_backend *x11;
|
|
struct wl_list link; // wlr_x11_backend.outputs
|
|
|
|
xcb_window_t win;
|
|
xcb_present_event_t present_event_id;
|
|
|
|
int32_t win_width, win_height;
|
|
|
|
struct wlr_pointer pointer;
|
|
|
|
struct wlr_touch touch;
|
|
struct wl_list touchpoints; // wlr_x11_touchpoint.link
|
|
|
|
struct wl_list buffers; // wlr_x11_buffer.link
|
|
|
|
pixman_region32_t exposed;
|
|
|
|
uint64_t last_msc;
|
|
|
|
struct {
|
|
xcb_shm_seg_t seg;
|
|
uint8_t *data;
|
|
size_t size;
|
|
int width, height;
|
|
xcb_pixmap_t pixmap;
|
|
xcb_gcontext_t gc;
|
|
} readback;
|
|
|
|
struct {
|
|
struct wlr_swapchain *swapchain;
|
|
xcb_render_picture_t pic;
|
|
} cursor;
|
|
};
|
|
|
|
struct wlr_x11_touchpoint {
|
|
uint32_t x11_id;
|
|
int wayland_id;
|
|
struct wl_list link; // wlr_x11_output.touch_points
|
|
};
|
|
|
|
struct wlr_x11_backend {
|
|
struct wlr_backend backend;
|
|
struct wl_event_loop *event_loop;
|
|
bool started;
|
|
|
|
xcb_connection_t *xcb;
|
|
xcb_screen_t *screen;
|
|
xcb_depth_t *depth;
|
|
xcb_visualid_t visualid;
|
|
xcb_colormap_t colormap;
|
|
xcb_cursor_t transparent_cursor;
|
|
xcb_render_pictformat_t argb32;
|
|
|
|
bool have_shm;
|
|
bool have_shm_pixmaps;
|
|
bool have_dri3;
|
|
uint32_t dri3_major_version, dri3_minor_version;
|
|
|
|
size_t requested_outputs;
|
|
struct wl_list outputs; // wlr_x11_output.link
|
|
|
|
struct wlr_keyboard keyboard;
|
|
|
|
int drm_fd;
|
|
struct wlr_drm_format_set dri3_formats;
|
|
struct wlr_drm_format_set shm_formats;
|
|
const struct wlr_x11_format *x11_format;
|
|
struct wlr_drm_format_set primary_dri3_formats;
|
|
struct wlr_drm_format_set primary_shm_formats;
|
|
struct wl_event_source *event_source;
|
|
|
|
struct {
|
|
xcb_atom_t wm_protocols;
|
|
xcb_atom_t wm_delete_window;
|
|
xcb_atom_t net_wm_name;
|
|
xcb_atom_t utf8_string;
|
|
xcb_atom_t variable_refresh;
|
|
} atoms;
|
|
|
|
// The time we last received an event
|
|
xcb_timestamp_t time;
|
|
|
|
#if HAVE_XCB_ERRORS
|
|
xcb_errors_context_t *errors_context;
|
|
#endif
|
|
|
|
uint8_t present_opcode;
|
|
uint8_t xinput_opcode;
|
|
|
|
struct wl_listener event_loop_destroy;
|
|
};
|
|
|
|
struct wlr_x11_buffer {
|
|
struct wlr_x11_backend *x11;
|
|
struct wlr_buffer *buffer;
|
|
xcb_pixmap_t pixmap;
|
|
struct wl_list link; // wlr_x11_output.buffers
|
|
struct wl_listener buffer_destroy;
|
|
size_t n_busy;
|
|
};
|
|
|
|
struct wlr_x11_format {
|
|
uint32_t drm;
|
|
uint8_t depth, bpp;
|
|
};
|
|
|
|
struct wlr_x11_backend *get_x11_backend_from_backend(
|
|
struct wlr_backend *wlr_backend);
|
|
struct wlr_x11_output *get_x11_output_from_window_id(
|
|
struct wlr_x11_backend *x11, xcb_window_t window);
|
|
|
|
extern const struct wlr_keyboard_impl x11_keyboard_impl;
|
|
extern const struct wlr_pointer_impl x11_pointer_impl;
|
|
extern const struct wlr_touch_impl x11_touch_impl;
|
|
|
|
void handle_x11_xinput_event(struct wlr_x11_backend *x11,
|
|
xcb_ge_generic_event_t *event);
|
|
void update_x11_pointer_position(struct wlr_x11_output *output,
|
|
xcb_timestamp_t time);
|
|
|
|
void handle_x11_configure_notify(struct wlr_x11_output *output,
|
|
xcb_configure_notify_event_t *event);
|
|
void handle_x11_present_event(struct wlr_x11_backend *x11,
|
|
xcb_ge_generic_event_t *event);
|
|
|
|
#endif
|