Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

HUB75 color re-ordering optimization

Browse Source 
only perform color re-ordering when needed.
This allows for better optimization by the compiler.
This commit is contained in:
Frank
2026-03-26 12:14:49 +01:00
parent d948ec667e
commit 453c5e6023
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
wled00/bus_manager.cpp
View File

@@ -1171,12 +1171,14 @@ void __attribute__((hot)) IRAM_ATTR BusHub75Matrix::show(void) {
if (_ledBuffer) { if (_ledBuffer) {
// write out buffered LEDs // write out buffered LEDs
// cache values, to avoid repeated global access inside the hot path
VirtualMatrixPanel* fourScanPanel = BusHub75Matrix::activeFourScanPanel; VirtualMatrixPanel* fourScanPanel = BusHub75Matrix::activeFourScanPanel;
bool isFourScan = (fourScanPanel != nullptr); const bool isFourScan = (fourScanPanel != nullptr);
//if (isFourScan) fourScanPanel->setRotation(0); //if (isFourScan) fourScanPanel->setRotation(0);
unsigned height = isFourScan ? fourScanPanel->height() : display->height(); const unsigned height = isFourScan ? fourScanPanel->height() : display->height();
unsigned width = _panelWidth; const unsigned width = _panelWidth;
const uint_fast8_t colOrder = _colorOrder & 0x0F;
const bool needReorder = colOrder != COL_ORDER_RGB; // fast path when no color re-ordering needed
// Cache pointers to LED array and bitmask array, to avoid repeated accesses // Cache pointers to LED array and bitmask array, to avoid repeated accesses
const byte* ledsDirty = _ledsDirty; const byte* ledsDirty = _ledsDirty;
const CRGB* ledBuffer = _ledBuffer; const CRGB* ledBuffer = _ledBuffer;
@@ -1197,19 +1199,22 @@ void __attribute__((hot)) IRAM_ATTR BusHub75Matrix::show(void) {
uint8_t g = c.g; uint8_t g = c.g;
uint8_t b = c.b; uint8_t b = c.b;
#endif #endif
// apply color order mapping (COL_ORDER_* values from const.h) if (needReorder) {
uint8_t r2=r, g2=g, b2=b; // apply color order mapping (COL_ORDER_* values from const.h)
switch (_colorOrder & 0x0F) { uint8_t r2=r, g2=g, b2=b;
case COL_ORDER_RGB: /* 1 */ break; // no swap (HUB75 default) switch (colOrder) {
case COL_ORDER_GRB: /* 0 */ r2=g; g2=r; break; // swap R and G case COL_ORDER_RGB: /* 1 */ break; // no swap (HUB75 default)
case COL_ORDER_BRG: /* 2 */ r2=b; g2=r; b2=g; break; case COL_ORDER_GRB: /* 0 */ r2=g; g2=r; break; // swap R and G
case COL_ORDER_RBG: /* 3 */ g2=b; b2=g; break; // swap G and B case COL_ORDER_BRG: /* 2 */ r2=b; g2=r; b2=g; break;
case COL_ORDER_BGR: /* 4 */ r2=b; b2=r; break; // swap R and B case COL_ORDER_RBG: /* 3 */ g2=b; b2=g; break; // swap G and B
case COL_ORDER_GBR: /* 5 */ r2=g; g2=b; b2=r; break; case COL_ORDER_BGR: /* 4 */ r2=b; b2=r; break; // swap R and B
default: break; case COL_ORDER_GBR: /* 5 */ r2=g; g2=b; b2=r; break;
default: break;
}
r=r2; g=g2; b=b2;
} }
if (isFourScan) fourScanPanel->drawPixelRGB888(int16_t(x), int16_t(y), r2, g2, b2); if (isFourScan) fourScanPanel->drawPixelRGB888(int16_t(x), int16_t(y), r, g, b);
else display->drawPixelRGB888(int16_t(x), int16_t(y), r2, g2, b2); else display->drawPixelRGB888(int16_t(x), int16_t(y), r, g, b);
} }
pix ++; pix ++;
} }