xf86-video-intel: Branch 'xvmc' - 2 commits - src/i915_hwmc.c src/xvmc/intel_xvmc.c src/xvmc/xf86dri.c
Zhenyu Wang
zhen at kemper.freedesktop.org
Tue Mar 11 22:31:59 PDT 2008
src/i915_hwmc.c | 8 ++++++--
src/xvmc/intel_xvmc.c | 2 +-
src/xvmc/xf86dri.c | 3 +--
3 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit cd73c6a5a78eac726b14ef242b8452c559c4c003
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date: Wed Mar 12 20:37:41 2008 +0800
Pass default visual in dri context create
diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c
index 91a050f..489a2c2 100644
--- a/src/xvmc/intel_xvmc.c
+++ b/src/xvmc/intel_xvmc.c
@@ -337,7 +337,7 @@ Status XvMCCreateContext(Display *display, XvPortID port,
pthread_mutex_init(&xvmc_driver->ctxmutex, NULL);
/* context_id is alloc in _xvmc_create_context */
- if (!uniDRICreateContext(display, screen, NULL,
+ if (!uniDRICreateContext(display, screen, DefaultVisual(display, screen),
context->context_id,
&intel_ctx->hw_context)) {
XVMC_ERR("Could not create DRI context for xvmc ctx %d.",
diff --git a/src/xvmc/xf86dri.c b/src/xvmc/xf86dri.c
index 97022e4..798c1a8 100644
--- a/src/xvmc/xf86dri.c
+++ b/src/xvmc/xf86dri.c
@@ -374,8 +374,7 @@ uniDRICreateContext(dpy, screen, visual, context, hHWContext)
drm_context_t *hHWContext;
{
return uniDRICreateContextWithConfig(dpy, screen,
- visual ? visual->visualid : 0,
- context, hHWContext);
+ visual->visualid, context, hHWContext);
}
Bool
commit 21580add63307ca68790bf911243b8675f5f7c64
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date: Wed Mar 12 20:37:17 2008 +0800
disable memory alloc debug
diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c
index a8daf3e..cdcef5a 100644
--- a/src/i915_hwmc.c
+++ b/src/i915_hwmc.c
@@ -342,8 +342,9 @@ static Bool i915_allocate_xvmc_buffers(ScrnInfoPtr pScrn, I915XvMCContextPriv *c
return FALSE;
}
+ if (0)
+ i830_describe_allocations(pScrn, 1, "");
- i830_describe_allocations(pScrn, 1, "");
return TRUE;
}
@@ -577,7 +578,10 @@ static int i915_xvmc_create_surface (ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf,
*num_priv = 0;
return BadAlloc;
}
- i830_describe_allocations(pScrn, 1, "");
+
+ if (0)
+ i830_describe_allocations(pScrn, 1, "");
+
if (drmAddMap(pI830->drmSubFD,
(drm_handle_t)(sfpriv->surface->offset + pI830->LinearAddr),
sfpriv->surface->size, DRM_AGP, 0,
More information about the xorg-commit
mailing list