LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 20:19:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support loading BGRA8 dds files into RGBA8 images.

Browse Source
This commit is contained in:
Alex Szpakowski
2019-09-22 12:47:49 -03:00
parent a5ccfe4394
commit 4f093a0b6b
1 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/image/magpie/ddsHandler.cpp
+31 -4
View File
@@ -32,11 +32,12 @@ namespace image
namespace magpie namespace magpie
{ {
static PixelFormat convertFormat(dds::dxinfo::DXGIFormat dxformat, bool &sRGB) static PixelFormat convertFormat(dds::dxinfo::DXGIFormat dxformat, bool &sRGB, bool &bgra)
{ {
using namespace dds::dxinfo; using namespace dds::dxinfo;
sRGB = false; sRGB = false;
bgra = false;
switch (dxformat) switch (dxformat)
{ {
@@ -133,6 +134,13 @@ static PixelFormat convertFormat(dds::dxinfo::DXGIFormat dxformat, bool &sRGB)
case DXGI_FORMAT_B5G5R5A1_UNORM: case DXGI_FORMAT_B5G5R5A1_UNORM:
return PIXELFORMAT_RGB5A1; return PIXELFORMAT_RGB5A1;
case DXGI_FORMAT_B8G8R8A8_UNORM:
case DXGI_FORMAT_B8G8R8A8_TYPELESS:
case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
sRGB = (dxformat == DXGI_FORMAT_B8G8R8A8_UNORM_SRGB);
bgra = true;
return PIXELFORMAT_RGBA8;
case DXGI_FORMAT_BC6H_TYPELESS: case DXGI_FORMAT_BC6H_TYPELESS:
case DXGI_FORMAT_BC6H_UF16: case DXGI_FORMAT_BC6H_UF16:
return PIXELFORMAT_BC6H; return PIXELFORMAT_BC6H;
@@ -157,7 +165,8 @@ bool DDSHandler::canDecode(Data *data)
DXGIFormat dxformat = dds::getDDSPixelFormat(data->getData(), data->getSize()); DXGIFormat dxformat = dds::getDDSPixelFormat(data->getData(), data->getSize());
bool isSRGB = false; bool isSRGB = false;
PixelFormat format = convertFormat(dxformat, isSRGB); bool bgra = false;
PixelFormat format = convertFormat(dxformat, isSRGB, bgra);
return ImageData::validPixelFormat(format); return ImageData::validPixelFormat(format);
} }
@@ -169,7 +178,8 @@ FormatHandler::DecodedImage DDSHandler::decode(Data *data)
dds::Parser parser(data->getData(), data->getSize()); dds::Parser parser(data->getData(), data->getSize());
bool isSRGB = false; bool isSRGB = false;
img.format = convertFormat(parser.getFormat(), isSRGB); bool bgra = false;
img.format = convertFormat(parser.getFormat(), isSRGB, bgra);
if (!ImageData::validPixelFormat(img.format)) if (!ImageData::validPixelFormat(img.format))
throw love::Exception("Could not parse DDS pixel data: Unsupported format."); throw love::Exception("Could not parse DDS pixel data: Unsupported format.");
@@ -195,6 +205,22 @@ FormatHandler::DecodedImage DDSHandler::decode(Data *data)
img.width = ddsimg->width; img.width = ddsimg->width;
img.height = ddsimg->height; img.height = ddsimg->height;
// Swap red and blue channels for incoming BGRA data.
if (bgra)
{
for (int y = 0; y < img.height; y++)
{
for (int x = 0; x < img.width; x++)
{
size_t offset = (y * img.width + x) * 4;
uint8 b = img.data[offset + 0];
uint8 r = img.data[offset + 2];
img.data[offset + 0] = r;
img.data[offset + 2] = b;
}
}
}
return img; return img;
} }
@@ -210,6 +236,7 @@ StrongRef<CompressedMemory> DDSHandler::parseCompressed(Data *filedata, std::vec
PixelFormat texformat = PIXELFORMAT_UNKNOWN; PixelFormat texformat = PIXELFORMAT_UNKNOWN;
bool isSRGB = false; bool isSRGB = false;
bool bgra = false;
StrongRef<CompressedMemory> memory; StrongRef<CompressedMemory> memory;
size_t dataSize = 0; size_t dataSize = 0;
@@ -219,7 +246,7 @@ StrongRef<CompressedMemory> DDSHandler::parseCompressed(Data *filedata, std::vec
// Attempt to parse the dds file. // Attempt to parse the dds file.
dds::Parser parser(filedata->getData(), filedata->getSize()); dds::Parser parser(filedata->getData(), filedata->getSize());
texformat = convertFormat(parser.getFormat(), isSRGB); texformat = convertFormat(parser.getFormat(), isSRGB, bgra);
if (texformat == PIXELFORMAT_UNKNOWN) if (texformat == PIXELFORMAT_UNKNOWN)
throw love::Exception("Could not parse compressed data: Unsupported format."); throw love::Exception("Could not parse compressed data: Unsupported format.");