aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-09-23 09:49:27 +0200
committermarha <marha@users.sourceforge.net>2013-09-23 09:49:27 +0200
commitb299d73bb416e2a26a642a54d5a15ea9fa30df33 (patch)
tree4cff827d4348e99d516ee2f1051f92ad5fa3ef8d /xorg-server
parenta5179a42a3376f0d8c1d01456235b044854d8bdc (diff)
parente4d5a2996e4a03f55bc7d21c493ba1bcbef35aae (diff)
downloadvcxsrv-b299d73bb416e2a26a642a54d5a15ea9fa30df33.tar.gz
vcxsrv-b299d73bb416e2a26a642a54d5a15ea9fa30df33.tar.bz2
vcxsrv-b299d73bb416e2a26a642a54d5a15ea9fa30df33.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa xserver git update 23 Sep 2013 Conflicts: mesalib/src/glsl/ast.h mesalib/src/glsl/glsl_parser_extras.h mesalib/src/glsl/glsl_symbol_table.cpp mesalib/src/glsl/ir_constant_expression.cpp mesalib/src/glsl/list.h
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/damageext/damageext.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/xorg-server/damageext/damageext.c b/xorg-server/damageext/damageext.c
index 8f4a72795..c852005ef 100644
--- a/xorg-server/damageext/damageext.c
+++ b/xorg-server/damageext/damageext.c
@@ -219,7 +219,9 @@ ProcDamageCreate(ClientPtr client)
if (pDrawable->type == DRAWABLE_WINDOW) {
pRegion = &((WindowPtr) pDrawable)->borderClip;
+ RegionTranslate(pRegion, -pDrawable->x, -pDrawable->y);
DamageReportDamage(pDamageExt->pDamage, pRegion);
+ RegionTranslate(pRegion, pDrawable->x, pDrawable->y);
}
return Success;