diff options
| author | Christian König <[email protected]> | 2012-02-25 13:53:29 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2012-03-02 13:14:21 +0100 |
| commit | d645dc65b6c5e7d46538e98208a703f0f7a5d20b (patch) | |
| tree | e6c1c8ebf578775dd2c8524a6394602235fd674c /src/gallium/state_trackers/xvmc | |
| parent | 32c4381d4a0479b3d9bfe305ce701be6b5ac8e18 (diff) | |
vl/compositor: replace pipe_video_rect with u_rect
So we support things like flipping also.
Signed-off-by: Christian König <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/xvmc')
| -rw-r--r-- | src/gallium/state_trackers/xvmc/subpicture.c | 4 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xvmc/surface.c | 4 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xvmc/xvmc_private.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/state_trackers/xvmc/subpicture.c b/src/gallium/state_trackers/xvmc/subpicture.c index 6b1b091cf89..058c56816ac 100644 --- a/src/gallium/state_trackers/xvmc/subpicture.c +++ b/src/gallium/state_trackers/xvmc/subpicture.c @@ -437,8 +437,8 @@ Status XvMCBlendSubpicture(Display *dpy, XvMCSurface *target_surface, XvMCSubpic short subx, short suby, unsigned short subw, unsigned short subh, short surfx, short surfy, unsigned short surfw, unsigned short surfh) { - struct pipe_video_rect src_rect = {subx, suby, subw, subh}; - struct pipe_video_rect dst_rect = {surfx, surfy, surfw, surfh}; + struct u_rect src_rect = {subx, subx + subw, suby, suby + subh}; + struct u_rect dst_rect = {surfx, surfx + surfw, surfy, surfy + surfh}; XvMCSurfacePrivate *surface_priv; XvMCSubpicturePrivate *subpicture_priv; diff --git a/src/gallium/state_trackers/xvmc/surface.c b/src/gallium/state_trackers/xvmc/surface.c index 47853cf6924..33b7dc2b164 100644 --- a/src/gallium/state_trackers/xvmc/surface.c +++ b/src/gallium/state_trackers/xvmc/surface.c @@ -355,8 +355,8 @@ Status XvMCPutSurface(Display *dpy, XvMCSurface *surface, Drawable drawable, XvMCContextPrivate *context_priv; XvMCSubpicturePrivate *subpicture_priv; XvMCContext *context; - struct pipe_video_rect src_rect = {srcx, srcy, srcw, srch}; - struct pipe_video_rect dst_rect = {destx, desty, destw, desth}; + struct u_rect src_rect = {srcx, srcx + srcw, srcy, srcy + srch}; + struct u_rect dst_rect = {destx, destx + destw, desty, desty + desth}; struct pipe_resource *tex; struct pipe_surface surf_templ, *surf; diff --git a/src/gallium/state_trackers/xvmc/xvmc_private.h b/src/gallium/state_trackers/xvmc/xvmc_private.h index 26f874ad87a..014d83f0516 100644 --- a/src/gallium/state_trackers/xvmc/xvmc_private.h +++ b/src/gallium/state_trackers/xvmc/xvmc_private.h @@ -90,8 +90,8 @@ typedef struct /* optional palette for this subpicture */ struct pipe_sampler_view *palette; - struct pipe_video_rect src_rect; - struct pipe_video_rect dst_rect; + struct u_rect src_rect; + struct u_rect dst_rect; /* The surface this subpicture is currently associated with, if any. */ XvMCSurface *surface; |