[Nouveau] [PATCH] Remove nonexistant glamor flags from glamor_init

Ian T. Jacobsen ian at itjac.me
Sat Apr 11 06:56:13 PDT 2015


Glamor removed some flags.
This is my first time contributing via mailing list,
but I hope I'm doing it correctly

diff --git a/src/nouveau_glamor.c b/src/nouveau_glamor.c
index b8bca17..ca84df6 100644
--- a/src/nouveau_glamor.c
+++ b/src/nouveau_glamor.c
@@ -217,10 +217,14 @@ nouveau_glamor_init(ScreenPtr screen)
     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
     NVPtr pNv = NVPTR(scrn);

+#ifndef GLAMOR_USE_SCREEN
+    if (!glamor_init(screen, GLAMOR_USE_EGL_SCREEN)) {
+#else
     if (!glamor_init(screen, GLAMOR_INVERTED_Y_AXIS |
                  GLAMOR_USE_EGL_SCREEN |
                  GLAMOR_USE_SCREEN |
                  GLAMOR_USE_PICTURE_SCREEN)) {
+#endif
         xf86DrvMsg(scrn->scrnIndex, X_ERROR,
                "[GLAMOR] failed to initialise\n");
         return FALSE;


More information about the Nouveau mailing list