From 25b9dbb15f0dc98cfc6b5585e7efebf3250f64d3 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 7 Dec 2010 15:49:06 +0000 Subject: xserver pixman git update 7-12-2010 --- xorg-server/dix/eventconvert.c | 8 -------- xorg-server/dix/privates.c | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'xorg-server/dix') diff --git a/xorg-server/dix/eventconvert.c b/xorg-server/dix/eventconvert.c index e9297149c..dff1a5631 100644 --- a/xorg-server/dix/eventconvert.c +++ b/xorg-server/dix/eventconvert.c @@ -326,14 +326,6 @@ countValuators(DeviceEvent *ev, int *first) { if (BitIsOn(ev->valuators.mask, i)) { - /* Assume mode of first_valuator matches XI1 device mode. Stop when the - * event mode changes since XI1 can't handle mixed mode devices. - */ - if (first_valuator > -1 && - BitIsOn(ev->valuators.mode, i) != - BitIsOn(ev->valuators.mode, first_valuator)) - break; - if (first_valuator == -1) first_valuator = i; last_valuator = i; diff --git a/xorg-server/dix/privates.c b/xorg-server/dix/privates.c index 1500dabb1..583b9f1f5 100644 --- a/xorg-server/dix/privates.c +++ b/xorg-server/dix/privates.c @@ -447,6 +447,7 @@ static const char *key_names[PRIVATE_LAST] = { [PRIVATE_GLYPH] = "GLYPH", [PRIVATE_GLYPHSET] = "GLYPHSET", [PRIVATE_PICTURE] = "PICTURE", + [PRIVATE_SYNC_FENCE] = "SYNC_FENCE", }; void -- cgit v1.2.3