summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2012-07-25 07:23:35 +0300
committerMart Raudsepp <leio@gentoo.org>2012-07-25 07:23:35 +0300
commitcb0e67bbc019b170194b3b51e2a47fca8d3aeac1 (patch)
tree65208bc58d6cd0602c83013f99c35e1ff988b1a6
parentdc0dbd41745f99dcd9ca3fda05acf5a5f11a6960 (diff)
lx_exa: Fix EXA minor version checks
The old version of just checking for EXA_MINOR_VERSION >= 2 would stop working if ever EXA gets a new major version, as minor would be reset to 0, and start unexpectedly working again when minor gets bumped gradually up to 2 again. Other drivers also assume that a new major would still have the vfunc we use.
-rw-r--r--src/lx_exa.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lx_exa.c b/src/lx_exa.c
index 57fd8e1..1f01717 100644
--- a/src/lx_exa.c
+++ b/src/lx_exa.c
@@ -1503,7 +1503,7 @@ lx_upload_to_screen(PixmapPtr pxDst, int x, int y, int w, int h,
}
#endif
-#if EXA_VERSION_MINOR >= 2
+#if EXA_VERSION_MAJOR > 2 || (EXA_VERSION_MAJOR == 2 && EXA_VERSION_MINOR >= 2)
static Bool
lx_exa_pixmap_is_offscreen(PixmapPtr pPixmap)
@@ -1551,7 +1551,7 @@ LXExaInit(ScreenPtr pScreen)
pExa->DoneComposite = lx_done;
//pExa->UploadToScreen = lx_upload_to_screen;
-#if EXA_VERSION_MINOR >= 2
+#if EXA_VERSION_MAJOR > 2 || (EXA_VERSION_MAJOR == 2 && EXA_VERSION_MINOR >= 2)
pExa->PixmapIsOffscreen = lx_exa_pixmap_is_offscreen;
#endif