Skip to content
Permalink
Browse files

- fixed bad texture canvas checks when in truecolor software rendering.

  • Loading branch information...
coelckers committed Aug 9, 2019
1 parent 53c2d7e commit 1e4a32004b7d89d797d3b2c1dbb68c9189b46440
Showing with 7 additions and 11 deletions.
  1. +7 −11 src/rendering/swrenderer/textures/swcanvastexture.cpp
@@ -153,23 +153,15 @@ void FSWCanvasTexture::Unload ()
void FSWCanvasTexture::UpdatePixels(bool truecolor)
{

if (Canvas->IsBgra())
{
ImageHelpers::FlipNonSquareBlock(PixelsBgra.Data(), (const uint32_t*)Canvas->GetPixels(), GetWidth(), GetHeight(), Canvas->GetPitch());
}
else
{
ImageHelpers::FlipNonSquareBlockRemap(Pixels.Data(), Canvas->GetPixels(), GetWidth(), GetHeight(), Canvas->GetPitch(), GPalette.Remap);
}

if (truecolor)
{
ImageHelpers::FlipNonSquareBlock(PixelsBgra.Data(), (const uint32_t*)CanvasBgra->GetPixels(), GetWidth(), GetHeight(), CanvasBgra->GetPitch());
// True color render still sometimes uses palette textures (for sprites, mostly).
// We need to make sure that both pixel buffers contain data:
int width = GetWidth();
int height = GetHeight();
uint8_t *palbuffer = const_cast<uint8_t*>(GetPixels(0));
const uint32_t *bgrabuffer = GetPixelsBgra();
uint8_t* palbuffer = const_cast<uint8_t*>(GetPixels(0));
const uint32_t* bgrabuffer = GetPixelsBgra();
for (int x = 0; x < width; x++)
{
for (int y = 0; y < height; y++)
@@ -184,6 +176,10 @@ void FSWCanvasTexture::UpdatePixels(bool truecolor)
bgrabuffer += height;
}
}
else
{
ImageHelpers::FlipNonSquareBlockRemap(Pixels.Data(), Canvas->GetPixels(), GetWidth(), GetHeight(), Canvas->GetPitch(), GPalette.Remap);
}

static_cast<FCanvasTexture*>(mTexture)->SetUpdated(false);
}

0 comments on commit 1e4a320

Please sign in to comment.
You can’t perform that action at this time.