xf86-video-r128: Branch 'master'
Connor Behan
cbehan at kemper.freedesktop.org
Wed Aug 29 16:24:33 PDT 2012
src/r128.h | 4 +---
src/r128_exa.c | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 7f279e9d4e329ccb95de16f205ea4cd0ab37a65b
Author: Connor Behan <connor.behan at gmail.com>
Date: Wed Aug 29 16:06:39 2012 -0700
Remove nested preprocessor checks
When checking for R128DRI and RENDER, it is better to use two lines
instead of four.
Signed-off-by: Connor Behan <connor.behan at gmail.com>
diff --git a/src/r128.h b/src/r128.h
index 9b2556f..9c0ecb6 100644
--- a/src/r128.h
+++ b/src/r128.h
@@ -284,8 +284,7 @@ struct r128_2d_state {
uint32_t dp_src_frgd_clr;
uint32_t dp_src_bkgd_clr;
uint32_t default_sc_bottom_right;
-#ifdef R128DRI
-#ifdef RENDER
+#if defined(R128DRI) && defined(RENDER)
Bool has_mask;
int x_offset;
int y_offset;
@@ -296,7 +295,6 @@ struct r128_2d_state {
PixmapPtr src_pix;
PixmapPtr msk_pix;
#endif
-#endif
};
#endif
diff --git a/src/r128_exa.c b/src/r128_exa.c
index b3e2406..2a628a8 100644
--- a/src/r128_exa.c
+++ b/src/r128_exa.c
@@ -335,8 +335,7 @@ R128Done(PixmapPtr pPixmap)
R128InfoPtr info = R128PTR(pScrn);
info->state_2d.in_use = FALSE;
-#ifdef R128DRI
-#ifdef RENDER
+#if defined(R128DRI) && defined(RENDER)
if (info->state_2d.src_pix) {
pScreen->DestroyPixmap(info->state_2d.src_pix);
info->state_2d.src_pix = NULL;
@@ -346,7 +345,6 @@ R128Done(PixmapPtr pPixmap)
info->state_2d.msk_pix = NULL;
}
#endif
-#endif
}
#ifdef R128DRI
More information about the xorg-commit
mailing list