diff options
author | Thomas Hellstrom <thellstrom@vmware.com> | 2010-11-26 10:12:32 +0100 |
---|---|---|
committer | Thomas Hellstrom <thellstrom@vmware.com> | 2010-11-26 10:28:01 +0100 |
commit | 5822484510b45cac2e16d3b220fd33cef6c41a66 (patch) | |
tree | cb698106bd3008f6981e3ece8a7531da95516f72 /src/gallium/targets | |
parent | 28ee7561f9e9bac8a76d5f96fe55b890a61a7d04 (diff) |
xorg/vmwgfx: Don't clip video to viewport
Since the viewport is not updated on RandR12 mode switches anymore,
clipping to viewport may incorrectly clip away the video.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Diffstat (limited to 'src/gallium/targets')
-rw-r--r-- | src/gallium/targets/xorg-vmwgfx/vmw_video.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/gallium/targets/xorg-vmwgfx/vmw_video.c b/src/gallium/targets/xorg-vmwgfx/vmw_video.c index 3d907575ec..7979209993 100644 --- a/src/gallium/targets/xorg-vmwgfx/vmw_video.c +++ b/src/gallium/targets/xorg-vmwgfx/vmw_video.c @@ -450,7 +450,16 @@ vmw_video_init_adaptor(ScrnInfoPtr pScrn, struct vmw_customizer *vmw) vmw->video_priv = video; adaptor->type = XvInputMask | XvImageMask | XvWindowMask; - adaptor->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT; + + /** + * Note: CLIP_TO_VIEWPORT was removed from the flags, since with the + * crtc/output based modesetting, the viewport is not updated on + * RandR modeswitches. Hence the video may incorrectly be clipped away. + * The correct approach, (if needed) would be to clip against the + * scanout area union of all active crtcs. Revisit if needed. + */ + + adaptor->flags = VIDEO_OVERLAID_IMAGES; adaptor->name = "VMware Video Engine"; adaptor->nEncodings = VMWARE_VID_NUM_ENCODINGS; adaptor->pEncodings = vmwareVideoEncodings; |