diff options
| author | Emil Velikov <[email protected]> | 2015-07-10 21:27:13 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-07-13 20:43:11 +0100 |
| commit | 7a50bf6c7f7729f5eee3ddf7aa9b38a81873f2c6 (patch) | |
| tree | de8f67a4a4bafe0ef9dc28ed4194ac5cee2cfa13 /src/gallium/auxiliary/vl | |
| parent | 10a7b579fdc0e3f3b38920ae5c103c058cc63eec (diff) | |
auxiliary/vl: use the correct screen index
Inspired (copied) from Marek's commit for egl/x11
commit 0b56e23e7f3(egl/dri2: use the correct screen index)
v2: Fix copy/pasta errors.
Cc: 10.6 <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/vl')
| -rw-r--r-- | src/gallium/auxiliary/vl/vl_winsys_dri.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri.c b/src/gallium/auxiliary/vl/vl_winsys_dri.c index b445f68a1c7..3b1b87f9523 100644 --- a/src/gallium/auxiliary/vl/vl_winsys_dri.c +++ b/src/gallium/auxiliary/vl/vl_winsys_dri.c @@ -295,6 +295,16 @@ vl_screen_get_private(struct vl_screen *vscreen) return vscreen; } +static xcb_screen_t * +get_xcb_screen(xcb_screen_iterator_t iter, int screen) +{ + for (; iter.rem; --screen, xcb_screen_next(&iter)) + if (screen == 0) + return iter.data; + + return NULL; +} + struct vl_screen* vl_screen_create(Display *display, int screen) { @@ -336,8 +346,7 @@ vl_screen_create(Display *display, int screen) goto free_query; s = xcb_setup_roots_iterator(xcb_get_setup(scrn->conn)); - while (screen--) - xcb_screen_next(&s); + driverType = XCB_DRI2_DRIVER_TYPE_DRI; #ifdef DRI2DriverPrimeShift { @@ -353,7 +362,7 @@ vl_screen_create(Display *display, int screen) } #endif - connect_cookie = xcb_dri2_connect_unchecked(scrn->conn, s.data->root, driverType); + connect_cookie = xcb_dri2_connect_unchecked(scrn->conn, get_xcb_screen(s, screen)->root, driverType); connect = xcb_dri2_connect_reply(scrn->conn, connect_cookie, NULL); if (connect == NULL || connect->driver_name_length + connect->device_name_length == 0) goto free_connect; @@ -372,7 +381,7 @@ vl_screen_create(Display *display, int screen) if (drmGetMagic(fd, &magic)) goto free_connect; - authenticate_cookie = xcb_dri2_authenticate_unchecked(scrn->conn, s.data->root, magic); + authenticate_cookie = xcb_dri2_authenticate_unchecked(scrn->conn, get_xcb_screen(s, screen)->root, magic); authenticate = xcb_dri2_authenticate_reply(scrn->conn, authenticate_cookie, NULL); if (authenticate == NULL || !authenticate->authenticated) |