diff options
| author | Maarten Lankhorst <maarten.lankhorst@ubuntu.com> | 2014-10-22 15:52:22 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@ubuntu.com> | 2014-10-22 15:52:22 +0200 |
| commit | 485902e61b18aff864226db62ba10399aab40128 (patch) | |
| tree | 4dc8e588b5ef61bea6dd37575ecebbe844720f0d | |
| parent | 79d438ec4d23280a242d36c2d81f2f43f6e90ada (diff) | |
fix !DRI3 case
| -rw-r--r-- | src/nouveau_dri2.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c index 6c1260c..6876f9c 100644 --- a/src/nouveau_dri2.c +++ b/src/nouveau_dri2.c @@ -1112,10 +1112,12 @@ static dri3_screen_info_rec nouveau_dri3_screen_info = { .pixmap_from_fd = nouveau_dri3_pixmap_from_fd, .fd_from_pixmap = nouveau_dri3_fd_from_pixmap }; +#endif Bool nouveau_dri3_screen_init(ScreenPtr screen) { +#ifdef DRI3 ScrnInfoPtr pScrn = xf86ScreenToScrn(screen); NVPtr pNv = NVPTR(pScrn); struct stat master, render; @@ -1131,9 +1133,9 @@ nouveau_dri3_screen_init(ScreenPtr screen) (render.st_rdev & ~0x80) == master.st_rdev) pNv->render_node = strdup(buf); - if (!pNv->render_node) - return TRUE; + if (pNv->render_node) + return dri3_screen_init(screen, &nouveau_dri3_screen_info); +#endif - return dri3_screen_init(screen, &nouveau_dri3_screen_info); + return TRUE; } -#endif |