OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- removed the FGLBitmap class and replaced all uses with the regular FBitmap.

Browse source 
The only reason this ever existed is that the GL renderer used RGBA instead of BGRA but there's no reason why this is even necessary.
This commit is contained in:
Christoph Oelckers 2017-06-18 09:13:35 +02:00
commit a1694a79c6
12 changed files with 59 additions and 220 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/textures/bitmap.cpp
View file

@ -444,10 +444,17 @@ void FBitmap::CopyPixelData(int originx, int originy, const uint8_t * patch, int
PalEntry penew[256];
memset(penew, 0, sizeof(penew));
if (inf && inf->blend)
if (inf)
{
iCopyColors<cPalEntry, cBGRA, bCopy>((uint8_t*)penew, (const uint8_t*)palette, 256, 4, inf, 0, 0, 0);
palette = penew;
if (inf->blend)
{
iCopyColors<cPalEntry, cBGRA, bCopy>((uint8_t*)penew, (const uint8_t*)palette, 256, 4, inf, 0, 0, 0);
palette = penew;
}
else if (inf->palette)
{
palette = inf->palette;
}
}
copypalettedfuncs[inf==NULL? OP_COPY : inf->op](buffer, patch, srcwidth, srcheight, Pitch,