From 14766f820069ca987543918bce96410c481e5d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Wed, 29 Feb 2012 15:12:42 +0100 Subject: vl/csc: simplify matrix handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A csc matrix is only 4x3 not 4x4, also define a VDPAU compatible type for it. Signed-off-by: Christian König --- src/gallium/state_trackers/xvmc/attributes.c | 6 +++--- src/gallium/state_trackers/xvmc/context.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/gallium/state_trackers/xvmc') diff --git a/src/gallium/state_trackers/xvmc/attributes.c b/src/gallium/state_trackers/xvmc/attributes.c index da7b649..58bafb1 100644 --- a/src/gallium/state_trackers/xvmc/attributes.c +++ b/src/gallium/state_trackers/xvmc/attributes.c @@ -77,7 +77,7 @@ Status XvMCSetAttribute(Display *dpy, XvMCContext *context, Atom attribute, int { XvMCContextPrivate *context_priv; const char *attr; - float csc[16]; + vl_csc_matrix csc; assert(dpy); @@ -108,9 +108,9 @@ Status XvMCSetAttribute(Display *dpy, XvMCContext *context, Atom attribute, int vl_csc_get_matrix ( context_priv->color_standard, - &context_priv->procamp, true, csc + &context_priv->procamp, true, &csc ); - vl_compositor_set_csc_matrix(&context_priv->cstate, csc); + vl_compositor_set_csc_matrix(&context_priv->cstate, (const vl_csc_matrix *)&csc); XVMC_MSG(XVMC_TRACE, "[XvMC] Set attribute %s to value %d.\n", attr, value); diff --git a/src/gallium/state_trackers/xvmc/context.c b/src/gallium/state_trackers/xvmc/context.c index c598cad..7b97a67 100644 --- a/src/gallium/state_trackers/xvmc/context.c +++ b/src/gallium/state_trackers/xvmc/context.c @@ -192,7 +192,7 @@ Status XvMCCreateContext(Display *dpy, XvPortID port, int surface_type_id, struct vl_screen *vscreen; struct pipe_context *pipe; XvMCContextPrivate *context_priv; - float csc[16]; + vl_csc_matrix csc; XVMC_MSG(XVMC_TRACE, "[XvMC] Creating context %p.\n", context); @@ -289,9 +289,9 @@ Status XvMCCreateContext(Display *dpy, XvPortID port, int surface_type_id, vl_csc_get_matrix ( context_priv->color_standard, - &context_priv->procamp, true, csc + &context_priv->procamp, true, &csc ); - vl_compositor_set_csc_matrix(&context_priv->cstate, csc); + vl_compositor_set_csc_matrix(&context_priv->cstate, (const vl_csc_matrix *)&csc); context_priv->vscreen = vscreen; context_priv->pipe = pipe; -- cgit v1.1