mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-01-27 23:44:04 +00:00
112 lines
3.7 KiB
Diff
112 lines
3.7 KiB
Diff
From b04725198656129abd511ba4c98a57d823eb8620 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Agner <stefan@agner.ch>
|
|
Date: Thu, 16 Aug 2018 16:26:30 +0000
|
|
Subject: [PATCH 1/2] Remove 24bbp support
|
|
|
|
24bbp support has been removed in X.Org Server 1.20 so
|
|
remove it from this driver as well.
|
|
|
|
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|
---
|
|
common/unaccel.c | 9 ---------
|
|
etnaviv/etnaviv.c | 26 --------------------------
|
|
vivante/vivante.c | 26 --------------------------
|
|
3 files changed, 61 deletions(-)
|
|
|
|
diff --git a/common/unaccel.c b/common/unaccel.c
|
|
index 15cc7d5..6a776ac 100644
|
|
--- a/common/unaccel.c
|
|
+++ b/common/unaccel.c
|
|
@@ -192,15 +192,6 @@ static void unaccel_fixup_tile(DrawablePtr pDraw, PixmapPtr *ppPix)
|
|
{
|
|
PixmapPtr pNew, pPixmap = *ppPix;
|
|
|
|
- if (pPixmap->drawable.bitsPerPixel != pDraw->bitsPerPixel) {
|
|
- prepare_cpu_drawable(&pPixmap->drawable, CPU_ACCESS_RO);
|
|
- pNew = fb24_32ReformatTile(pPixmap, pDraw->bitsPerPixel);
|
|
- finish_cpu_drawable(&pPixmap->drawable, CPU_ACCESS_RO);
|
|
-
|
|
- pDraw->pScreen->DestroyPixmap(pPixmap);
|
|
- *ppPix = pPixmap = pNew;
|
|
- }
|
|
-
|
|
if (FbEvenTile(pPixmap->drawable.width * pPixmap->drawable.bitsPerPixel)) {
|
|
prepare_cpu_drawable(&pPixmap->drawable, CPU_ACCESS_RW);
|
|
fbPadPixmap(pPixmap);
|
|
diff --git a/etnaviv/etnaviv.c b/etnaviv/etnaviv.c
|
|
index c7ec66b..c04477b 100644
|
|
--- a/etnaviv/etnaviv.c
|
|
+++ b/etnaviv/etnaviv.c
|
|
@@ -387,32 +387,6 @@ etnaviv_ValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
|
|
{
|
|
struct etnaviv *etnaviv = etnaviv_get_screen_priv(pDrawable->pScreen);
|
|
|
|
-#ifdef FB_24_32BIT
|
|
- if (changes & GCTile && fbGetRotatedPixmap(pGC)) {
|
|
- pGC->pScreen->DestroyPixmap(fbGetRotatedPixmap(pGC));
|
|
- fbGetRotatedPixmap(pGC) = NULL;
|
|
- }
|
|
- if (pGC->fillStyle == FillTiled) {
|
|
- PixmapPtr pOldTile = pGC->tile.pixmap;
|
|
- PixmapPtr pNewTile;
|
|
-
|
|
- if (pOldTile->drawable.bitsPerPixel != pDrawable->bitsPerPixel) {
|
|
- pNewTile = fbGetRotatedPixmap(pGC);
|
|
- if (!pNewTile || pNewTile->drawable.bitsPerPixel != pDrawable->bitsPerPixel) {
|
|
- if (pNewTile)
|
|
- pGC->pScreen->DestroyPixmap(pNewTile);
|
|
- prepare_cpu_drawable(&pOldTile->drawable, CPU_ACCESS_RO);
|
|
- pNewTile = fb24_32ReformatTile(pOldTile, pDrawable->bitsPerPixel);
|
|
- finish_cpu_drawable(&pOldTile->drawable, CPU_ACCESS_RO);
|
|
- }
|
|
- if (pNewTile) {
|
|
- fbGetRotatedPixmap(pGC) = pOldTile;
|
|
- pGC->tile.pixmap = pNewTile;
|
|
- changes |= GCTile;
|
|
- }
|
|
- }
|
|
- }
|
|
-#endif
|
|
if (changes & GCTile) {
|
|
if (!pGC->tileIsPixel &&
|
|
FbEvenTile(pGC->tile.pixmap->drawable.width *
|
|
diff --git a/vivante/vivante.c b/vivante/vivante.c
|
|
index 8e65c13..834bc30 100644
|
|
--- a/vivante/vivante.c
|
|
+++ b/vivante/vivante.c
|
|
@@ -253,32 +253,6 @@ static GCOps vivante_unaccel_GCOps = {
|
|
static void
|
|
vivante_ValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
|
|
{
|
|
-#ifdef FB_24_32BIT
|
|
- if (changes & GCTile && fbGetRotatedPixmap(pGC)) {
|
|
- pGC->pScreen->DestroyPixmap(fbGetRotatedPixmap(pGC));
|
|
- fbGetRotatedPixmap(pGC) = NULL;
|
|
- }
|
|
- if (pGC->fillStyle == FillTiled) {
|
|
- PixmapPtr pOldTile = pGC->tile.pixmap;
|
|
- PixmapPtr pNewTile;
|
|
-
|
|
- if (pOldTile->drawable.bitsPerPixel != pDrawable->bitsPerPixel) {
|
|
- pNewTile = fbGetRotatedPixmap(pGC);
|
|
- if (!pNewTile || pNewTile->drawable.bitsPerPixel != pDrawable->bitsPerPixel) {
|
|
- if (pNewTile)
|
|
- pGC->pScreen->DestroyPixmap(pNewTile);
|
|
- prepare_cpu_drawable(&pOldTile->drawable, CPU_ACCESS_RO);
|
|
- pNewTile = fb24_32ReformatTile(pOldTile, pDrawable->bitsPerPixel);
|
|
- finish_cpu_drawable(&pOldTile->drawable, CPU_ACCESS_RO);
|
|
- }
|
|
- if (pNewTile) {
|
|
- fbGetRotatedPixmap(pGC) = pOldTile;
|
|
- pGC->tile.pixmap = pNewTile;
|
|
- changes |= GCTile;
|
|
- }
|
|
- }
|
|
- }
|
|
-#endif
|
|
if (changes & GCTile) {
|
|
if (!pGC->tileIsPixel &&
|
|
FbEvenTile(pGC->tile.pixmap->drawable.width *
|
|
--
|
|
2.18.0
|
|
|