diff options
| author | Keith Packard <keithp@keithp.com> | 2014-04-25 13:24:25 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-06-15 22:49:39 +0100 |
| commit | cd1d942f20943bab48859be78bc87a5801d3d01e (patch) | |
| tree | 006692ae240333a9c0ec8bd82724434afa808b3f | |
| parent | 70530abb4a478045f67361997a06fcf7fb1ad167 (diff) | |
uxa: Move non-glamor code past the glamor check in uxa_get_image
Having these statements above the glamor check makes it hard to tell
that glamor is being called with unmodified parameters.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | src/uxa/uxa-accel.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/uxa/uxa-accel.c b/src/uxa/uxa-accel.c index 49f8407f..3efc1847 100644 --- a/src/uxa/uxa-accel.c +++ b/src/uxa/uxa-accel.c @@ -1318,13 +1318,6 @@ uxa_get_image(DrawablePtr pDrawable, int x, int y, int w, int h, int xoff, yoff; Bool ok; - uxa_get_drawable_deltas(pDrawable, pPix, &xoff, &yoff); - - Box.x1 = pDrawable->y + x + xoff; - Box.y1 = pDrawable->y + y + yoff; - Box.x2 = Box.x1 + w; - Box.y2 = Box.y1 + h; - if (uxa_screen->info->flags & UXA_USE_GLAMOR) { ok = 0; if (uxa_prepare_access(pDrawable, UXA_GLAMOR_ACCESS_RW)) { @@ -1339,6 +1332,13 @@ uxa_get_image(DrawablePtr pDrawable, int x, int y, int w, int h, return; } + uxa_get_drawable_deltas(pDrawable, pPix, &xoff, &yoff); + + Box.x1 = pDrawable->y + x + xoff; + Box.y1 = pDrawable->y + y + yoff; + Box.x2 = Box.x1 + w; + Box.y2 = Box.y1 + h; + if (uxa_screen->force_fallback) goto fallback; |