diff options
author | Keith Packard <keithp@keithp.com> | 2001-07-20 19:35:30 +0000 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2001-07-20 19:35:30 +0000 |
commit | 79486b3b5c792a990cb73b4efa453218262e605f (patch) | |
tree | 7b50d9189e822f4767483a792b8a06e9f7511b17 /hw/kdrive/fbdev/fbdev.c | |
parent | 9826d5a1339570c037ae1ef29c9a237874a6ffa2 (diff) |
Too many changes, but all in kdrive:
Add support for global screen origins (-origin option), handles both
Xinerama and mouse crossings.
Fix XV enable/disable sequences -- can't use card wrappers as cards have
more than one screen.
Change vesa/fbdev to use new depth-independent rotation shadow update
Fix vesa to allow starting rotation value (again)
Make vesa driver write all colormap changes in one INT10 call
Diffstat (limited to 'hw/kdrive/fbdev/fbdev.c')
-rw-r--r-- | hw/kdrive/fbdev/fbdev.c | 41 |
1 files changed, 5 insertions, 36 deletions
diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c index 104d76582..4bd800e6b 100644 --- a/hw/kdrive/fbdev/fbdev.c +++ b/hw/kdrive/fbdev/fbdev.c @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.25 2001/07/16 19:48:00 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.26 2001/07/19 08:46:30 keithp Exp $ */ #include "fbdev.h" @@ -400,41 +400,10 @@ fbdevLayerCreate (ScreenPtr pScreen) else #endif /* FAKE24_ON_16 */ { - switch (scrpriv->rotation) { - case 0: + if (scrpriv->rotation) + update = shadowUpdateRotatePacked; + else update = shadowUpdatePacked; - break; - case 90: - switch (pScreenPriv->screen->fb[0].bitsPerPixel) { - case 8: - update = shadowUpdateRotate8_90; break; - case 16: - update = shadowUpdateRotate16_90; break; - case 32: - update = shadowUpdateRotate32_90; break; - } - break; - case 180: - switch (pScreenPriv->screen->fb[0].bitsPerPixel) { - case 8: - update = shadowUpdateRotate8_180; break; - case 16: - update = shadowUpdateRotate16_180; break; - case 32: - update = shadowUpdateRotate32_180; break; - } - break; - case 270: - switch (pScreenPriv->screen->fb[0].bitsPerPixel) { - case 8: - update = shadowUpdateRotate8_270; break; - case 16: - update = shadowUpdateRotate16_270; break; - case 32: - update = shadowUpdateRotate32_270; break; - } - break; - } } if (!update) abort (); @@ -449,7 +418,7 @@ fbdevLayerCreate (ScreenPtr pScreen) window = 0; } return LayerCreate (pScreen, kind, screen->fb[0].depth, - pPixmap, update, window, 0); + pPixmap, update, window, scrpriv->rotation, 0); } |