aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/exa
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/exa')
-rw-r--r--xorg-server/exa/exa.c24
-rw-r--r--xorg-server/exa/exa_classic.c3
-rw-r--r--xorg-server/exa/exa_driver.c3
-rw-r--r--xorg-server/exa/exa_mixed.c3
-rw-r--r--xorg-server/exa/exa_priv.h6
-rw-r--r--xorg-server/exa/exa_render.c2
-rw-r--r--xorg-server/exa/exa_unaccel.c10
7 files changed, 12 insertions, 39 deletions
diff --git a/xorg-server/exa/exa.c b/xorg-server/exa/exa.c
index 590d9a500..da3797237 100644
--- a/xorg-server/exa/exa.c
+++ b/xorg-server/exa/exa.c
@@ -753,9 +753,7 @@ static Bool
exaCloseScreen(int i, ScreenPtr pScreen)
{
ExaScreenPriv(pScreen);
-#ifdef RENDER
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
-#endif
if (ps->Glyphs == exaGlyphs)
exaGlyphsFini(pScreen);
@@ -778,16 +776,12 @@ exaCloseScreen(int i, ScreenPtr pScreen)
unwrap(pExaScr, pScreen, ChangeWindowAttributes);
unwrap(pExaScr, pScreen, BitmapToRegion);
unwrap(pExaScr, pScreen, CreateScreenResources);
-#ifdef RENDER
- if (ps) {
- unwrap(pExaScr, ps, Composite);
- if (pExaScr->SavedGlyphs)
- unwrap(pExaScr, ps, Glyphs);
- unwrap(pExaScr, ps, Trapezoids);
- unwrap(pExaScr, ps, Triangles);
- unwrap(pExaScr, ps, AddTraps);
- }
-#endif
+ unwrap(pExaScr, ps, Composite);
+ if (pExaScr->SavedGlyphs)
+ unwrap(pExaScr, ps, Glyphs);
+ unwrap(pExaScr, ps, Trapezoids);
+ unwrap(pExaScr, ps, Triangles);
+ unwrap(pExaScr, ps, AddTraps);
xfree (pExaScr);
@@ -825,9 +819,7 @@ exaDriverInit (ScreenPtr pScreen,
ExaDriverPtr pScreenInfo)
{
ExaScreenPrivPtr pExaScr;
-#ifdef RENDER
PictureScreenPtr ps;
-#endif
if (!pScreenInfo)
return FALSE;
@@ -895,9 +887,7 @@ exaDriverInit (ScreenPtr pScreen,
pScreenInfo->maxPitchPixels = pScreenInfo->maxX;
}
-#ifdef RENDER
ps = GetPictureScreenIfSet(pScreen);
-#endif
pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1);
if (!pExaScr) {
@@ -940,7 +930,6 @@ exaDriverInit (ScreenPtr pScreen,
wrap(pExaScr, pScreen, BitmapToRegion, exaBitmapToRegion);
wrap(pExaScr, pScreen, CreateScreenResources, exaCreateScreenResources);
-#ifdef RENDER
if (ps) {
wrap(pExaScr, ps, Composite, exaComposite);
if (pScreenInfo->PrepareComposite)
@@ -949,7 +938,6 @@ exaDriverInit (ScreenPtr pScreen,
wrap(pExaScr, ps, Triangles, exaTriangles);
wrap(pExaScr, ps, AddTraps, ExaCheckAddTraps);
}
-#endif
#ifdef MITSHM
/*
diff --git a/xorg-server/exa/exa_classic.c b/xorg-server/exa/exa_classic.c
index c31e2d4b3..e1ead6c0d 100644
--- a/xorg-server/exa/exa_classic.c
+++ b/xorg-server/exa/exa_classic.c
@@ -148,7 +148,7 @@ Bool
exaModifyPixmapHeader_classic(PixmapPtr pPixmap, int width, int height, int depth,
int bitsPerPixel, int devKind, pointer pPixData)
{
- ScreenPtr pScreen = pPixmap->drawable.pScreen;
+ ScreenPtr pScreen;
ExaScreenPrivPtr pExaScr;
ExaPixmapPrivPtr pExaPixmap;
Bool ret;
@@ -156,6 +156,7 @@ exaModifyPixmapHeader_classic(PixmapPtr pPixmap, int width, int height, int dept
if (!pPixmap)
return FALSE;
+ pScreen = pPixmap->drawable.pScreen;
pExaScr = ExaGetScreenPriv(pScreen);
pExaPixmap = ExaGetPixmapPriv(pPixmap);
diff --git a/xorg-server/exa/exa_driver.c b/xorg-server/exa/exa_driver.c
index dcf1a9860..abe79baad 100644
--- a/xorg-server/exa/exa_driver.c
+++ b/xorg-server/exa/exa_driver.c
@@ -126,7 +126,7 @@ Bool
exaModifyPixmapHeader_driver(PixmapPtr pPixmap, int width, int height, int depth,
int bitsPerPixel, int devKind, pointer pPixData)
{
- ScreenPtr pScreen = pPixmap->drawable.pScreen;
+ ScreenPtr pScreen;
ExaScreenPrivPtr pExaScr;
ExaPixmapPrivPtr pExaPixmap;
Bool ret;
@@ -134,6 +134,7 @@ exaModifyPixmapHeader_driver(PixmapPtr pPixmap, int width, int height, int depth
if (!pPixmap)
return FALSE;
+ pScreen = pPixmap->drawable.pScreen;
pExaScr = ExaGetScreenPriv(pScreen);
pExaPixmap = ExaGetPixmapPriv(pPixmap);
diff --git a/xorg-server/exa/exa_mixed.c b/xorg-server/exa/exa_mixed.c
index 21cc3bd13..49e04f22a 100644
--- a/xorg-server/exa/exa_mixed.c
+++ b/xorg-server/exa/exa_mixed.c
@@ -124,7 +124,7 @@ Bool
exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
int bitsPerPixel, int devKind, pointer pPixData)
{
- ScreenPtr pScreen = pPixmap->drawable.pScreen;
+ ScreenPtr pScreen;
ExaScreenPrivPtr pExaScr;
ExaPixmapPrivPtr pExaPixmap;
Bool ret, has_gpu_copy;
@@ -132,6 +132,7 @@ exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
if (!pPixmap)
return FALSE;
+ pScreen = pPixmap->drawable.pScreen;
pExaScr = ExaGetScreenPriv(pScreen);
pExaPixmap = ExaGetPixmapPriv(pPixmap);
diff --git a/xorg-server/exa/exa_priv.h b/xorg-server/exa/exa_priv.h
index 21d964683..ed8be31f6 100644
--- a/xorg-server/exa/exa_priv.h
+++ b/xorg-server/exa/exa_priv.h
@@ -50,10 +50,8 @@
#include "dix.h"
#include "fb.h"
#include "fboverlay.h"
-#ifdef RENDER
#include "fbpict.h"
#include "glyphstr.h"
-#endif
#include "damage.h"
#define DEBUG_TRACE_FALL 0
@@ -166,13 +164,11 @@ typedef struct {
CreateScreenResourcesProcPtr SavedCreateScreenResources;
ModifyPixmapHeaderProcPtr SavedModifyPixmapHeader;
SourceValidateProcPtr SavedSourceValidate;
-#ifdef RENDER
CompositeProcPtr SavedComposite;
TrianglesProcPtr SavedTriangles;
GlyphsProcPtr SavedGlyphs;
TrapezoidsProcPtr SavedTrapezoids;
AddTrapsProcPtr SavedAddTraps;
-#endif
void (*do_migration) (ExaMigrationPtr pixmaps, int npixmaps, Bool can_accel);
Bool (*pixmap_has_gpu_copy) (PixmapPtr pPixmap);
void (*do_move_in_pixmap) (PixmapPtr pPixmap);
@@ -499,7 +495,6 @@ exaCopyNtoN (DrawablePtr pSrcDrawable,
extern const GCOps exaOps;
-#ifdef RENDER
void
ExaCheckComposite (CARD8 op,
PicturePtr pSrc,
@@ -513,7 +508,6 @@ ExaCheckComposite (CARD8 op,
INT16 yDst,
CARD16 width,
CARD16 height);
-#endif
/* exa_offscreen.c */
void
diff --git a/xorg-server/exa/exa_render.c b/xorg-server/exa/exa_render.c
index 1b68e1cdc..b7f383f38 100644
--- a/xorg-server/exa/exa_render.c
+++ b/xorg-server/exa/exa_render.c
@@ -30,7 +30,6 @@
#include "exa_priv.h"
-#ifdef RENDER
#include "mipict.h"
#if DEBUG_TRACE_FALL
@@ -1072,7 +1071,6 @@ done:
if (pMask)
pMask->repeat = saveMaskRepeat;
}
-#endif
/**
* Same as miCreateAlphaPicture, except it uses ExaCheckPolyFillRect instead
diff --git a/xorg-server/exa/exa_unaccel.c b/xorg-server/exa/exa_unaccel.c
index b4ead7ff2..db9ce9f56 100644
--- a/xorg-server/exa/exa_unaccel.c
+++ b/xorg-server/exa/exa_unaccel.c
@@ -23,9 +23,7 @@
#include "exa_priv.h"
-#ifdef RENDER
#include "mipict.h"
-#endif
/*
* These functions wrap the low-level fb rendering functions and
@@ -617,9 +615,7 @@ ExaCheckComposite (CARD8 op,
CARD16 height)
{
ScreenPtr pScreen = pDst->pDrawable->pScreen;
-#ifdef RENDER
PictureScreenPtr ps = GetPictureScreen(pScreen);
-#endif /* RENDER */
EXA_PRE_FALLBACK(pScreen);
if (pExaScr->prepare_access_reg) {
@@ -652,7 +648,6 @@ ExaCheckComposite (CARD8 op,
exaPrepareAccess (pMask->pDrawable, EXA_PREPARE_MASK);
}
-#ifdef RENDER
swap(pExaScr, ps, Composite);
ps->Composite (op,
pSrc,
@@ -667,7 +662,6 @@ ExaCheckComposite (CARD8 op,
width,
height);
swap(pExaScr, ps, Composite);
-#endif /* RENDER */
if (pMask && pMask->pDrawable != NULL)
exaFinishAccess (pMask->pDrawable, EXA_PREPARE_MASK);
if (pSrc->pDrawable != NULL)
@@ -692,19 +686,15 @@ ExaCheckAddTraps (PicturePtr pPicture,
xTrap *traps)
{
ScreenPtr pScreen = pPicture->pDrawable->pScreen;
-#ifdef RENDER
PictureScreenPtr ps = GetPictureScreen(pScreen);
-#endif /* RENDER */
EXA_PRE_FALLBACK(pScreen);
EXA_FALLBACK(("to pict %p (%c)\n",
exaDrawableLocation(pPicture->pDrawable)));
exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
-#ifdef RENDER
swap(pExaScr, ps, AddTraps);
ps->AddTraps (pPicture, x_off, y_off, ntrap, traps);
swap(pExaScr, ps, AddTraps);
-#endif /* RENDER */
exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST);
EXA_POST_FALLBACK(pScreen);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 16:15:59 +0000