Help porting TFT_eSPI project to Arduino_GFX

[Shadowtrance]

Trying to port a project that uses TFT_eSPI which doesn't support my screen (Neither does LovyanGFX currently). But this lovely library does. JC3248W535EN QSPI...
But I've run into a few things I'm not sure how to change to work with Arduino_GFX regarding the below 2 functions

1. tft.getSwapBytes() and tft.setSwapBytes() ... I've looked through the TFT_eSPI code and i still don't know what the hell these do.
2. tft.pushImage ... again not sure on the correct Arduino_GFX function to use in it's place.

All related to the bmp images used for the button icons.
These are the last bits of red to fix before i can actually test it. 🤣
Pretty sure the button extension may be broken too because I extracted that from TFT_eSPI and made some "hopefully" working changes. 🤞

And I'm working with this "fork" (that isn't really forked???) version.
https://github.com/andrewfernie/FreeTouchDeckWT32/blob/master/src/ScreenHelper.cpp#L144
https://github.com/andrewfernie/FreeTouchDeckWT32/blob/master/src/ScreenHelper.cpp#L226

Thanks 😊

/**
* @brief This function draws a BMP on the TFT screen according
         to the given x and y coordinates.
*
* @param  *filename
* @param x int16_t
* @param y int16_t
* @param transparent uint8_t
*
* @return none
*
* @note If transparent is true then black pixels are not drawn (i.e. they are transparent). If false,
*       black pixels are drawn.
*/
void drawBmp(const char *filename, int16_t x, int16_t y, uint8_t transparent)
{
    if ((x >= gfx->width()) || (y >= gfx->height()))
        return;

    fs::File bmpFS;

    bmpFS = FILESYSTEM.open(filename, "r");

    if (!bmpFS) {
        MSG_WARNLN("[WARNING]: Bitmap not found: ");
        MSG_WARNLN(filename);
        filename = "/logos/question.bmp";
        bmpFS = FILESYSTEM.open(filename, "r");
    }

    uint32_t seekOffset;
    uint16_t w, h, row;
    uint8_t r, g, b;

    if (read16(bmpFS) == 0x4D42) {
        read32(bmpFS);
        read32(bmpFS);
        seekOffset = read32(bmpFS);
        read32(bmpFS);
        w = read32(bmpFS);
        h = read32(bmpFS);

        if ((read16(bmpFS) == 1) && (read16(bmpFS) == 24) && (read32(bmpFS) == 0)) {
            y += h - 1;

            bool oldSwapBytes = tft.getSwapBytes();
            tft.setSwapBytes(true);
            bmpFS.seek(seekOffset);

            uint16_t padding = (4 - ((w * 3) & 3)) & 3;
            uint8_t lineBuffer[w * 3 + padding];

            for (row = 0; row < h; row++) {
                bmpFS.read(lineBuffer, sizeof(lineBuffer));
                uint8_t *bptr = lineBuffer;
                uint16_t *tptr = (uint16_t *)lineBuffer;
                // Convert 24 to 16 bit colours
                for (uint16_t col = 0; col < w; col++) {
                    b = *bptr++;
                    g = *bptr++;
                    r = *bptr++;
                    *tptr++ = ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3);
                }

                // Push the pixel row to screen, pushImage will crop the line if needed
                // y is decremented as the BMP image is drawn bottom up

                if (transparent) {
                    tft.pushImage(x, y--, w, 1, (uint16_t *)lineBuffer, RGB565_BLACK);
                }
                else {
                    tft.pushImage(x, y--, w, 1, (uint16_t *)lineBuffer);
                }
            }
           tft.setSwapBytes(oldSwapBytes);
        }
        else
            MSG_ERROR1("[ERROR] BMP format not recognized for file: ", filename);
    }
    bmpFS.close();
}

/**
* @brief This function draws a BMP on the TFT screen according
         to the given x and y coordinates.
*
* @param pImage uint16_t*
* @param x int16_t
* @param y int16_t
* @param transparent uint8_t
*
* @return uint8_t 0 = success, other = error
*
* @note If transparent is true then black pixels are not drawn (i.e. they are transparent). If false,
*       black pixels are drawn.
*/
uint8_t drawLogoFromPSRAM(uint16_t *pImage, int16_t x, int16_t y, uint8_t transparent)
{
    uint16_t *pImagePtr;
    uint16_t w, h, row;

    uint8_t status = ReturnSuccess;

    if ((x >= gfx->width()) || (y >= gfx->height()))
        return ReturnFail;

    if (pImage != nullptr) {
        w = pImage[0];
        h = pImage[1];
        pImagePtr = pImage + 2;

        // y += h - 1;

        bool oldSwapBytes = tft.getSwapBytes();
        tft.setSwapBytes(true);

        if (transparent) {
            tft.pushImage(x, y, w, h, pImagePtr, RGB565_BLACK);
        }
        else {
            tft.pushImage(x, y, w, h, pImagePtr);
        }

        tft.setSwapBytes(oldSwapBytes);
    }

    return status;
}

[Shadowtrance]

Ok i think i figured it out. It's booting and loading images with my hacked together "Arduino GFX Button" extension.

tft.getSwapBytes() and tft.setSwapBytes() don't appear to be needed.
tft.pushImage replaced with draw16bitRGBBitmapWithTranColor if transparent and draw16bitRGBBitmap if not.