xf86-video-intel: 2 commits - configure.ac src/sna/gen5_render.c src/sna/gen6_render.c src/sna/gen7_render.c src/sna/sna_accel.c src/sna/sna_damage.c src/sna/sna_trapezoids.c src/sna/sna_video_overlay.c src/sna/sna_video_textured.c
Chris Wilson
ickle at kemper.freedesktop.org
Mon Jul 22 11:43:16 PDT 2013
configure.ac | 25 ++++++++++++++++---------
src/sna/gen5_render.c | 2 +-
src/sna/gen6_render.c | 2 +-
src/sna/gen7_render.c | 2 +-
src/sna/sna_accel.c | 4 ++--
src/sna/sna_damage.c | 4 ++--
src/sna/sna_trapezoids.c | 2 +-
src/sna/sna_video_overlay.c | 2 +-
src/sna/sna_video_textured.c | 2 +-
9 files changed, 26 insertions(+), 19 deletions(-)
New commits:
commit 0498e0c38d0b04d89020e61c13b250150ec19c3a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Jul 22 19:20:16 2013 +0100
sna: Fix DBG compilation
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index 85ef653..557013e 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -2263,7 +2263,7 @@ gen5_render_copy_boxes(struct sna *sna, uint8_t alu,
{
struct sna_composite_op tmp;
- DBG(("%s alu=%d, src=%d:handle=%d, dst=%d:handle=%d boxes=%d x [((%d, %d), (%d, %d))...], flags=%x\n",
+ DBG(("%s alu=%d, src=%ld:handle=%d, dst=%ld:handle=%d boxes=%d x [((%d, %d), (%d, %d))...], flags=%x\n",
__FUNCTION__, alu,
src->drawable.serialNumber, src_bo->handle,
dst->drawable.serialNumber, dst_bo->handle,
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 9b45d79..09fdb67 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -1596,7 +1596,7 @@ gen6_render_video(struct sna *sna,
DBG(("%s: src=(%d, %d), dst=(%d, %d), %ldx[(%d, %d), (%d, %d)...]\n",
__FUNCTION__,
src_width, src_height, dst_width, dst_height,
- REGION_NUM_RECTS(dstRegion),
+ (long)REGION_NUM_RECTS(dstRegion),
REGION_EXTENTS(NULL, dstRegion)->x1,
REGION_EXTENTS(NULL, dstRegion)->y1,
REGION_EXTENTS(NULL, dstRegion)->x2,
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 7d4d85f..b602fe3 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -1764,7 +1764,7 @@ gen7_render_video(struct sna *sna,
DBG(("%s: src=(%d, %d), dst=(%d, %d), %ldx[(%d, %d), (%d, %d)...]\n",
__FUNCTION__,
src_width, src_height, dst_width, dst_height,
- REGION_NUM_RECTS(dstRegion),
+ (long)REGION_NUM_RECTS(dstRegion),
REGION_EXTENTS(NULL, dstRegion)->x1,
REGION_EXTENTS(NULL, dstRegion)->y1,
REGION_EXTENTS(NULL, dstRegion)->x2,
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 70d51c2..6ac93bb 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1794,7 +1794,7 @@ static inline bool operate_inplace(struct sna_pixmap *priv, unsigned flags)
if (priv->create & KGEM_CAN_CREATE_LARGE) {
DBG(("%s: large object, has GPU? %d\n",
- __FUNCTION__, priv->gpu_bo));
+ __FUNCTION__, priv->gpu_bo ? priv->gpu_bo->handle : 0));
return priv->gpu_bo != NULL;
}
@@ -4016,7 +4016,7 @@ try_upload_tiled_x(PixmapPtr pixmap, RegionRec *region,
DBG(("%s: bo? %d, can map? %d\n", __FUNCTION__,
priv->gpu_bo != NULL,
- priv->gpu_bo ? kgem_bo_can_map__cpu(kgem, priv->gpu_bo, true) : 0));
+ priv->gpu_bo ? kgem_bo_can_map__cpu(&sna->kgem, priv->gpu_bo, true) : 0));
replaces = region->data == NULL &&
w >= pixmap->drawable.width &&
diff --git a/src/sna/sna_damage.c b/src/sna/sna_damage.c
index cd478f4..8bfe8f9 100644
--- a/src/sna/sna_damage.c
+++ b/src/sna/sna_damage.c
@@ -415,7 +415,7 @@ static void __sna_damage_reduce(struct sna_damage *damage)
assert(damage->mode != DAMAGE_ALL);
assert(damage->dirty);
- DBG((" reduce: before region.n=%ld\n", REGION_NUM_RECTS(region)));
+ DBG((" reduce: before region.n=%ld\n", (long)REGION_NUM_RECTS(region)));
nboxes = damage->embedded_box.size;
list_for_each_entry(iter, &damage->embedded_box.list, list)
@@ -529,7 +529,7 @@ done:
free_list(&damage->embedded_box.list);
reset_embedded_box(damage);
- DBG((" reduce: after region.n=%ld\n", REGION_NUM_RECTS(region)));
+ DBG((" reduce: after region.n=%ld\n", (long)REGION_NUM_RECTS(region)));
}
static void damage_union(struct sna_damage *damage, const BoxRec *box)
diff --git a/src/sna/sna_trapezoids.c b/src/sna/sna_trapezoids.c
index cc8375f..feb1d40 100644
--- a/src/sna/sna_trapezoids.c
+++ b/src/sna/sna_trapezoids.c
@@ -102,7 +102,7 @@ static void apply_damage(struct sna_composite_op *op, RegionPtr region)
{
DBG(("%s: damage=%p, region=%ldx[(%d, %d), (%d, %d)]\n",
__FUNCTION__, op->damage,
- REGION_NUM_RECTS(region),
+ (long)REGION_NUM_RECTS(region),
region->extents.x1, region->extents.y1,
region->extents.x2, region->extents.y2));
diff --git a/src/sna/sna_video_overlay.c b/src/sna/sna_video_overlay.c
index 848c471..9020b9b 100644
--- a/src/sna/sna_video_overlay.c
+++ b/src/sna/sna_video_overlay.c
@@ -494,7 +494,7 @@ sna_video_overlay_put_image(ClientPtr client,
format->id, width, height, sync));
DBG(("%s: region %ld:(%d, %d), (%d, %d)\n", __FUNCTION__,
- RegionNumRects(&clip),
+ (long)RegionNumRects(&clip),
clip.extents.x1, clip.extents.y1,
clip.extents.x2, clip.extents.y2));
diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c
index cd5300f..1d19923 100644
--- a/src/sna/sna_video_textured.c
+++ b/src/sna/sna_video_textured.c
@@ -193,7 +193,7 @@ sna_video_textured_put_image(ClientPtr client,
format->id, width, height, sync));
DBG(("%s: region %ld:(%d, %d), (%d, %d)\n", __FUNCTION__,
- RegionNumRects(&clip),
+ (long)RegionNumRects(&clip),
clip.extents.x1, clip.extents.y1,
clip.extents.x2, clip.extents.y2));
commit e8cd5b5ff6f6e78260fb57f4b8171682d857e880
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Jul 22 18:47:36 2013 +0100
configure: Use --enable-dri to control both DRI/DRI2 enabling
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/configure.ac b/configure.ac
index 2c41f20..0fcde50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,8 +169,6 @@ AC_ARG_WITH(xorg-module-dir,
AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
[Disable DRI support [[default=auto]]]))
-dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri`
-AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI driver path])
AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--disable-xvmc],
[Disable XvMC support [[default=yes]]]),
@@ -377,8 +375,6 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Obtain compiler/linker options for the driver dependencies
PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.20]) # libdrm_intel is checked separately
-PKG_CHECK_MODULES(DRI, [xf86driproto], , DRI=no)
-PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6],, DRI2=no)
PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
LIBS=""
@@ -388,6 +384,7 @@ AC_SUBST(CLOCK_GETTIME_LIBS)
sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
if test "x$enable_dri" != "xno"; then
+ PKG_CHECK_MODULES(DRI, [xf86driproto], , DRI=no)
save_CFLAGS="$CFLAGS"
save_CPPFLAGS="$CPPFLAGS"
CFLAGS="$CFLAGS $XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS"
@@ -425,11 +422,21 @@ else
fi
fi
-if test "x$DRI2" != "xno"; then
- save_CFLAGS=$CFLAGS
- CFLAGS="$XORG_CFLAGS $DRM_CFLAGS $DRI_CFLAGS $DRI2_CFLAGS"
- AC_CHECK_HEADERS([dri2.h], DRI2=yes, DRI2=no, [#include <dixstruct.h>])
- CFLAGS=$save_CFLAGS
+DRI2=no
+if test "x$enable_dri" != "xno"; then
+ PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6],, DRI2=no)
+ dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri`
+ if test "x$dridriverdir" != "x"; then
+ AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI driver path])
+ else
+ DRI2=no
+ fi
+ if test "x$DRI2" != "xno"; then
+ save_CFLAGS=$CFLAGS
+ CFLAGS="$XORG_CFLAGS $DRM_CFLAGS $DRI_CFLAGS $DRI2_CFLAGS"
+ AC_CHECK_HEADERS([dri2.h], DRI2=yes, DRI2=no, [#include <dixstruct.h>])
+ CFLAGS=$save_CFLAGS
+ fi
fi
AC_MSG_CHECKING([whether to include DRI2 support])
AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes)
More information about the xorg-commit
mailing list