mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-16 19:32:26 +00:00
Make more extensions optional in build (for kdrive). Fix kdrive build for
actual hardware. Fix kdrive pointer signed/unsigned types. Add
kdrive-required YX rotation functions. Replace rgb text file loading
with static rgb color table.
This commit is contained in:
parent
c8acb34269
commit
8987b2c1ef
39 changed files with 351 additions and 49 deletions
|
|
@ -1773,6 +1773,7 @@ DamageSetup (ScreenPtr pScreen)
|
|||
if (!pScrPriv)
|
||||
return FALSE;
|
||||
|
||||
#ifdef XFree86Server
|
||||
#ifdef COMPOSITE
|
||||
/* This is a kludge to ensure wrapping order with the composite wrapper.
|
||||
* If it's done from compinit.c, then DamageSetup may be called before the
|
||||
|
|
@ -1781,6 +1782,7 @@ DamageSetup (ScreenPtr pScreen)
|
|||
*/
|
||||
if (!noCompositeExtension)
|
||||
miInitializeCompositeWrapper (pScreen);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
pScrPriv->internalLevel = 0;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,9 @@ libshadow_la_SOURCES = \
|
|||
shplanar.c \
|
||||
shrot16pack_180.c \
|
||||
shrot16pack_270.c \
|
||||
shrot16pack_270YX.c \
|
||||
shrot16pack_90.c \
|
||||
shrot16pack_90YX.c \
|
||||
shrot16pack.c \
|
||||
shrot32pack_180.c \
|
||||
shrot32pack_270.c \
|
||||
|
|
@ -28,4 +30,5 @@ libshadow_la_SOURCES = \
|
|||
shrot8pack_90.c \
|
||||
shrot8pack.c \
|
||||
shrotate.c \
|
||||
shrotpack.h
|
||||
shrotpack.h \
|
||||
shrotpackYX.h
|
||||
|
|
|
|||
|
|
@ -128,6 +128,10 @@ void
|
|||
shadowUpdateRotate16_90 (ScreenPtr pScreen,
|
||||
shadowBufPtr pBuf);
|
||||
|
||||
void
|
||||
shadowUpdateRotate16_90YX (ScreenPtr pScreen,
|
||||
shadowBufPtr pBuf);
|
||||
|
||||
void
|
||||
shadowUpdateRotate32_90 (ScreenPtr pScreen,
|
||||
shadowBufPtr pBuf);
|
||||
|
|
@ -152,10 +156,18 @@ void
|
|||
shadowUpdateRotate16_270 (ScreenPtr pScreen,
|
||||
shadowBufPtr pBuf);
|
||||
|
||||
void
|
||||
shadowUpdateRotate16_270YX (ScreenPtr pScreen,
|
||||
shadowBufPtr pBuf);
|
||||
|
||||
void
|
||||
shadowUpdateRotate32_270 (ScreenPtr pScreen,
|
||||
shadowBufPtr pBuf);
|
||||
|
||||
void
|
||||
shadowUpdateRotate16 (ScreenPtr pScreen,
|
||||
shadowBufPtr pBuf);
|
||||
|
||||
typedef void (* shadowUpdateProc)(ScreenPtr, shadowBufPtr);
|
||||
|
||||
shadowUpdateProc shadowUpdatePackedWeak(void);
|
||||
|
|
|
|||
33
miext/shadow/shrot16pack_270YX.c
Normal file
33
miext/shadow/shrot16pack_270YX.c
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
/*
|
||||
* $Id$
|
||||
*
|
||||
* Copyright 2000 Keith Packard
|
||||
*
|
||||
* Permission to use, copy, modify, distribute, and sell this software and its
|
||||
* documentation for any purpose is hereby granted without fee, provided that
|
||||
* the above copyright notice appear in all copies and that both that
|
||||
* copyright notice and this permission notice appear in supporting
|
||||
* documentation, and that the name of Keith Packard not be used in
|
||||
* advertising or publicity pertaining to distribution of the software without
|
||||
* specific, written prior permission. Keith Packard makes no
|
||||
* representations about the suitability of this software for any purpose. It
|
||||
* is provided "as is" without express or implied warranty.
|
||||
*
|
||||
* KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
* EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
||||
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
||||
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#define FUNC shadowUpdateRotate16_270YX
|
||||
#define Data CARD16
|
||||
#define ROTATE 270
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include "shrotpackYX.h"
|
||||
33
miext/shadow/shrot16pack_90YX.c
Normal file
33
miext/shadow/shrot16pack_90YX.c
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
/*
|
||||
* $Id$
|
||||
*
|
||||
* Copyright 2000 Keith Packard
|
||||
*
|
||||
* Permission to use, copy, modify, distribute, and sell this software and its
|
||||
* documentation for any purpose is hereby granted without fee, provided that
|
||||
* the above copyright notice appear in all copies and that both that
|
||||
* copyright notice and this permission notice appear in supporting
|
||||
* documentation, and that the name of Keith Packard not be used in
|
||||
* advertising or publicity pertaining to distribution of the software without
|
||||
* specific, written prior permission. Keith Packard makes no
|
||||
* representations about the suitability of this software for any purpose. It
|
||||
* is provided "as is" without express or implied warranty.
|
||||
*
|
||||
* KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
* EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
||||
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
||||
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#define FUNC shadowUpdateRotate16_90YX
|
||||
#define Data CARD16
|
||||
#define ROTATE 90
|
||||
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include "shrotpackYX.h"
|
||||
Loading…
Reference in a new issue