xf86-video-intel: 2 commits - configure.ac src/Makefile.am src/sna/brw src/sna/fb src/sna/Makefile.am src/sna/sna_blt.c src/sna/sna_damage.c src/sna/sna_render.c
Chris Wilson
ickle at kemper.freedesktop.org
Tue Jul 30 01:07:12 PDT 2013
configure.ac | 5 +++++
src/Makefile.am | 8 +++++++-
src/sna/Makefile.am | 1 +
src/sna/brw/Makefile.am | 1 +
src/sna/fb/Makefile.am | 2 +-
src/sna/sna_blt.c | 3 +++
src/sna/sna_damage.c | 4 ++--
src/sna/sna_render.c | 3 ++-
8 files changed, 22 insertions(+), 5 deletions(-)
New commits:
commit c507f621c932393a8b87912f71a86e29a8c1c190
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Jul 29 23:54:31 2013 +0100
sna: Suppress a few harmless warnings
Mostly of the only used in debugging path variety.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
index b4ef083..af4a92a 100644
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -1721,6 +1721,7 @@ blt_put_composite(struct sna *sna,
data, pitch, src_x, src_y,
&box, 1);
assert(ok);
+ (void)ok;
}
}
@@ -1757,6 +1758,7 @@ fastcall static void blt_put_composite_box(struct sna *sna,
op->u.blt.sx, op->u.blt.sy,
box, 1);
assert(ok);
+ (void)ok;
}
}
@@ -1794,6 +1796,7 @@ static void blt_put_composite_boxes(struct sna *sna,
op->u.blt.sx, op->u.blt.sy,
box, n);
assert(ok);
+ (void)ok;
}
}
diff --git a/src/sna/sna_damage.c b/src/sna/sna_damage.c
index 8bfe8f9..8d5b4d6 100644
--- a/src/sna/sna_damage.c
+++ b/src/sna/sna_damage.c
@@ -1342,13 +1342,13 @@ bool _sna_damage_contains_box__no_reduce(const struct sna_damage *damage,
const BoxRec *box)
{
int n, count;
- BoxPtr b;
+ const BoxRec *b;
assert(damage && damage->mode != DAMAGE_ALL);
if (!box_contains(&damage->extents, box))
return false;
- n = pixman_region_contains_rectangle(&damage->region, (BoxPtr)box);
+ n = pixman_region_contains_rectangle((pixman_region16_t *)&damage->region, (BoxPtr)box);
if (!damage->dirty)
return n == PIXMAN_REGION_IN;
diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
index ebb1d30..1bf11ea 100644
--- a/src/sna/sna_render.c
+++ b/src/sna/sna_render.c
@@ -1486,7 +1486,7 @@ sna_render_picture_approximate_gradient(struct sna *sna,
return -1;
}
- channel->is_opaque = sna_gradient_is_opaque(picture->pSourcePict);
+ channel->is_opaque = sna_gradient_is_opaque((PictGradient*)picture->pSourcePict);
channel->pict_format =
channel->is_opaque ? PIXMAN_x8r8g8b8 : PIXMAN_a8r8g8b8;
DBG(("%s: gradient is opaque? %d, selecting format %08x\n",
@@ -2077,6 +2077,7 @@ sna_render_composite_redirect_done(struct sna *sna,
op->dst.pixmap->drawable.bitsPerPixel,
&t->box, 1);
assert(ok);
+ (void)ok;
}
if (t->damage) {
DBG(("%s: combining damage (all? %d), offset=(%d, %d)\n",
commit cf7d36455fc43e88697f4fb8fd865f3259ba0d1a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Jul 29 23:49:08 2013 +0100
intel: Suppress some extremely noisy warnings
Warning about redundant declarations within the xorg headers hides
genuine warnings in our own code - disable them until the headers are
cleaned up.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/configure.ac b/configure.ac
index a004ef3..6b2c161 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,11 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
+# And disable a few very noisy warnings
+XORG_TESTSET_CFLAG([NOWARNFLAGS], [-Wno-cast-qual])
+XORG_TESTSET_CFLAG([NOWARNFLAGS], [-Wno-redundant-decls])
+AC_SUBST(NOWARNFLAGS)
+
# Require X.Org server macros (i.e. XORG_DRIVER_CHECK_EXT) to check for required modules
m4_ifndef([XORG_DRIVER_CHECK_EXT],
[m4_fatal([must install xorg-server macros before running autoconf/autogen.
diff --git a/src/Makefile.am b/src/Makefile.am
index 9df0915..16b6967 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,13 @@ SUBDIRS = render_program legacy
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @PCIACCESS_CFLAGS@
+AM_CFLAGS = \
+ @CWARNFLAGS@ \
+ @XORG_CFLAGS@ \
+ @DRM_CFLAGS@ \
+ @PCIACCESS_CFLAGS@ \
+ @NOWARNFLAGS@ \
+ $(NULL)
intel_drv_la_LTLIBRARIES = intel_drv.la
intel_drv_la_LDFLAGS = -module -avoid-version
diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am
index 1551d31..5d5417e 100644
--- a/src/sna/Makefile.am
+++ b/src/sna/Makefile.am
@@ -27,6 +27,7 @@ AM_CFLAGS = \
@XORG_CFLAGS@ \
@UDEV_CFLAGS@ \
@DRM_CFLAGS@ \
+ @NOWARNFLAGS@
$(NULL)
if VALGRIND
diff --git a/src/sna/brw/Makefile.am b/src/sna/brw/Makefile.am
index b3513cf..61deb71 100644
--- a/src/sna/brw/Makefile.am
+++ b/src/sna/brw/Makefile.am
@@ -29,6 +29,7 @@ AM_CFLAGS = \
@XORG_CFLAGS@ \
@UDEV_CFLAGS@ \
@DRM_CFLAGS@ \
+ @NOWARNFLAGS@ \
$(NULL)
if DEBUG
diff --git a/src/sna/fb/Makefile.am b/src/sna/fb/Makefile.am
index 72d9bbf..b676812 100644
--- a/src/sna/fb/Makefile.am
+++ b/src/sna/fb/Makefile.am
@@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libfb.la
-libfb_la_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@
+libfb_la_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @NOWARNFLAGS@
libfb_la_LIBADD = $(PIXMAN_LIBS)
libfb_la_SOURCES = \
More information about the xorg-commit
mailing list