Skip to content

Commit

Permalink
Rootless: Removed safeAlphaXXXX() in favor of using fb/pixman
Browse files Browse the repository at this point in the history
(cherry picked from commit f03202a)
  • Loading branch information
Jeremy Huddleston committed Mar 18, 2008
1 parent 37be23e commit 7aacc7b
Show file tree
Hide file tree
Showing 8 changed files with 2 additions and 458 deletions.
1 change: 0 additions & 1 deletion configure.ac
Expand Up @@ -1947,7 +1947,6 @@ miext/damage/Makefile
miext/shadow/Makefile
miext/cw/Makefile
miext/rootless/Makefile
miext/rootless/safeAlpha/Makefile
miext/rootless/accel/Makefile
os/Makefile
randr/Makefile
Expand Down
4 changes: 1 addition & 3 deletions hw/xquartz/xpr/Makefile.am
Expand Up @@ -4,8 +4,7 @@ AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
AM_CPPFLAGS = \
-I$(srcdir) -I$(srcdir)/.. \
-I$(top_srcdir)/miext \
-I$(top_srcdir)/miext/rootless \
-I$(top_srcdir)/miext/rootless/safeAlpha
-I$(top_srcdir)/miext/rootless

Xquartz_SOURCES = \
appledri.c \
Expand Down Expand Up @@ -40,7 +39,6 @@ Xquartz_LDADD = \
$(top_builddir)/record/librecord.la \
$(top_builddir)/XTrap/libxtrap.la \
$(top_builddir)/miext/rootless/librootless.la \
$(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \
$(top_builddir)/miext/rootless/accel/librlAccel.la \
$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin

Expand Down
12 changes: 0 additions & 12 deletions hw/xquartz/xpr/xprScreen.c
Expand Up @@ -37,7 +37,6 @@
#include "pseudoramiX.h"
#include "darwin.h"
#include "rootless.h"
#include "safeAlpha/safeAlpha.h"
#include "dri.h"
#include "globals.h"
#include "Xplugin.h"
Expand Down Expand Up @@ -341,17 +340,6 @@ xprAddScreen(int index, ScreenPtr pScreen)
static Bool
xprSetupScreen(int index, ScreenPtr pScreen)
{
// Add alpha protecting replacements for fb screen functions
pScreen->PaintWindowBackground = SafeAlphaPaintWindow;
pScreen->PaintWindowBorder = SafeAlphaPaintWindow;

#ifdef RENDER
{
PictureScreenPtr ps = GetPictureScreen(pScreen);
ps->Composite = SafeAlphaComposite;
}
#endif /* RENDER */

// Initialize accelerated rootless drawing
// Note that this must be done before DamageSetup().
RootlessAccelInit(pScreen);
Expand Down
2 changes: 1 addition & 1 deletion miext/rootless/Makefile.am
@@ -1,7 +1,7 @@
AM_CFLAGS = $(DIX_CFLAGS) $(XSERVER_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/hw/xfree86/os-support

SUBDIRS = safeAlpha accel
SUBDIRS = accel

noinst_LTLIBRARIES = librootless.la
librootless_la_SOURCES = \
Expand Down
9 changes: 0 additions & 9 deletions miext/rootless/safeAlpha/Makefile.am

This file was deleted.

44 changes: 0 additions & 44 deletions miext/rootless/safeAlpha/safeAlpha.h

This file was deleted.

211 changes: 0 additions & 211 deletions miext/rootless/safeAlpha/safeAlphaPicture.c

This file was deleted.

0 comments on commit 7aacc7b

Please sign in to comment.