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

Replaced the devil love.image module with love.image.magpie, which can decide which image library to use in a similar manner to love.sound.lullaby. Some rough edges still exist.

Browse Source 
love.filesystem.newFileData now accepts filepaths and File objects.

--HG--
branch : image-CompressedData
This commit is contained in:
Alex Szpakowski
2013-04-07 17:18:34 -03:00
parent 8a8adcce39
commit 88d64954a4
22 changed files with 846 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libraries/ddsparse/ddsparse.cpp
+71 -79
View File
@@ -36,9 +36,9 @@ using namespace dds::dxinfo;
static inline uint32_t FourCC(char a, char b, char c, char d)
{
uint32_t fcc = ((uint32_t) a)
| (((uint32_t) b) << 8)
| (((uint32_t) c) << 16)
| (((uint32_t) d) << 24);
| (((uint32_t) b) << 8)
| (((uint32_t) c) << 16)
| (((uint32_t) d) << 24);
return fcc;
}
@@ -86,46 +86,54 @@ bool Parser::isDDS(const void *data, size_t dataSize)
return true;
}
Parser::Parser(const void *data, size_t dataSize, Options opts)
bool Parser::isCompressedDDS(const void *data, size_t dataSize)
{
if (!isDDS(data, dataSize))
return false;
const uint8_t *readData = (const uint8_t *) data;
ptrdiff_t offset = sizeof(uint32_t);
DDSHeader *header = (DDSHeader *) &readData[offset];
offset += sizeof(DDSHeader);
// Check for DX10 extension.
if ((header->format.flags & DDPF_FOURCC) && (header->format.fourCC == FourCC('D','X','1','0')))
{
DDSHeader10 *header10 = (DDSHeader10 *) &readData[offset];
return parseDX10Format(header10->dxgiFormat) != FORMAT_UNKNOWN;
}
return parseDDSFormat(header->format) != FORMAT_UNKNOWN;
}
Parser::Parser(const void *data, size_t dataSize)
: format(FORMAT_UNKNOWN)
, options(opts)
{
parseData(data, dataSize);
}
Parser::Parser(const Parser &other)
: format(other.format)
, options(other.options)
: texData(other.texData)
, format(other.format)
{
std::vector<Image>::const_iterator it;
for (it = other.texData.begin(); it != other.texData.end(); ++it)
{
Image img = *it;
}
if ((options & OPTIONS_COPY_DATA) && img.dataSize > 0)
{
uint8_t *data = 0;
try
{
data = new uint8_t[img.dataSize];
}
catch (std::exception &)
{
clearData();
throw;
}
memcpy(data, it->data, img.dataSize);
img.data = data;
}
Parser::Parser()
: format(FORMAT_UNKNOWN)
{
}
texData.push_back(img);
}
Parser &Parser::operator = (const Parser &other)
{
texData = other.texData;
format = other.format;
return *this;
}
Parser::~Parser()
{
// Delete any data we created.
clearData();
}
Format Parser::getFormat() const
@@ -146,12 +154,7 @@ size_t Parser::getNumMipmaps() const
return texData.size();
}
bool Parser::ownsData() const
{
return (options & OPTIONS_COPY_DATA) != 0;
}
Format Parser::parseDDSFormat(const DDSPixelFormat &fmt) const
Format Parser::parseDDSFormat(const DDSPixelFormat &fmt)
{
if (fmt.flags & DDPF_FOURCC)
{
@@ -161,8 +164,16 @@ Format Parser::parseDDSFormat(const DDSPixelFormat &fmt) const
return FORMAT_DXT3;
else if (fmt.fourCC == FourCC('D','X','T','5'))
return FORMAT_DXT5;
else if (fmt.fourCC == FourCC('A','T','I','1'))
return FORMAT_BC4;
else if (fmt.fourCC == FourCC('A','T','I','2'))
return FORMAT_BC5;
else if (fmt.fourCC == FourCC('B','C','4','U'))
return FORMAT_BC4;
else if (fmt.fourCC == FourCC('B','C','4','S'))
return FORMAT_BC4s;
else if (fmt.fourCC == FourCC('B','C','5','U'))
return FORMAT_BC5;
else if (fmt.fourCC == FourCC('B','C','5','S'))
return FORMAT_BC5s;
}
@@ -170,7 +181,7 @@ Format Parser::parseDDSFormat(const DDSPixelFormat &fmt) const
return FORMAT_UNKNOWN;
}
Format Parser::parseDX10Format(DXGIFormat fmt) const
Format Parser::parseDX10Format(DXGIFormat fmt)
{
Format f = FORMAT_UNKNOWN;
@@ -191,19 +202,34 @@ Format Parser::parseDX10Format(DXGIFormat fmt) const
case DXGI_FORMAT_BC3_UNORM_SRGB:
f = FORMAT_DXT5;
break;
case DXGI_FORMAT_BC5_SNORM:
f = FORMAT_BC5s;
case DXGI_FORMAT_BC4_TYPELESS:
case DXGI_FORMAT_BC4_UNORM:
f = FORMAT_BC4;
break;
case DXGI_FORMAT_BC4_SNORM:
f = FORMAT_BC4s;
break;
case DXGI_FORMAT_BC5_TYPELESS:
case DXGI_FORMAT_BC5_UNORM:
f = FORMAT_BC5;
break;
case DXGI_FORMAT_BC5_SNORM:
f = FORMAT_BC5s;
break;
case DXGI_FORMAT_BC6H_TYPELESS:
case DXGI_FORMAT_BC6H_UF16:
f = FORMAT_BC6H;
break;
case DXGI_FORMAT_BC6H_SF16:
f = FORAMT_BC6Hs;
break;
case DXGI_FORMAT_BC7_TYPELESS:
case DXGI_FORMAT_BC7_UNORM:
f = FORMAT_BC7;
break;
case DXGI_FORMAT_BC7_UNORM_SRGB:
f = FORMAT_BC7srgb;
break;
default:
break;
}
@@ -248,6 +274,7 @@ size_t Parser::parseImageSize(Format fmt, int width, int height) const
bool Parser::parseTexData(const uint8_t *data, size_t dataSize, Format fmt, int w, int h, int mips)
{
size_t offset = 0;
std::vector<Image> newTexData;
for (int i = 0; i < mips; i++)
{
@@ -259,33 +286,12 @@ bool Parser::parseTexData(const uint8_t *data, size_t dataSize, Format fmt, int
// Make sure the data size is valid.
if (img.dataSize == 0 || (offset + img.dataSize) > dataSize)
{
// Clean up any data we allocated previously.
clearData();
return false;
}
// Create our own copy of the data, if requested.
if (options & OPTIONS_COPY_DATA)
{
uint8_t *newData = 0;
try
{
newData = new uint8_t[img.dataSize];
}
catch (std::exception &)
{
// Clean up before throwing.
clearData();
throw;
}
memcpy(newData, &data[offset], img.dataSize);
img.data = newData;
}
else
img.data = &data[offset];
// Store the memory address of the data representing this mip level.
img.data = &data[offset];
texData.push_back(img);
newTexData.push_back(img);
// Move to the next mip level.
offset += img.dataSize;
@@ -294,6 +300,8 @@ bool Parser::parseTexData(const uint8_t *data, size_t dataSize, Format fmt, int
h = std::max(h / 2, 1);
}
texData = newTexData;
return true;
}
@@ -347,20 +355,4 @@ bool Parser::parseData(const void *data, size_t dataSize)
return parseTexData(&readData[offset], dataSize - offset, format, w, h, mips);
}
void Parser::clearData()
{
if (options & OPTIONS_COPY_DATA)
{
// Delete any data we created.
std::vector<Image>::iterator it;
for (it = texData.begin(); it != texData.end(); ++it)
{
delete[] it->data;
it->data = 0;
}
}
texData.clear();
}
} // dds
src/libraries/ddsparse/ddsparse.h
+33 -28
View File
@@ -37,13 +37,18 @@ namespace dds
{
// Supported DDS formats.
// Formats with an 's' suffix have signed data.
enum Format
{
FORMAT_DXT1,
FORMAT_DXT3,
FORMAT_DXT5,
FORMAT_BC5s, // Signed.
FORMAT_BC5, // Unsigned.
FORMAT_BC4,
FORMAT_BC4s,
FORMAT_BC5,
FORMAT_BC5s,
FORMAT_BC6H,
FORAMT_BC6Hs,
FORMAT_BC7,
FORMAT_BC7srgb, // sRGB color space.
FORMAT_UNKNOWN
@@ -53,12 +58,6 @@ class Parser
{
public:
enum Options
{
OPTIONS_NONE = 0x00,
OPTIONS_COPY_DATA = 0x01 // Copy texture data internally when parsing.
};
// Represents a single mipmap level of a texture.
struct Image
{
@@ -71,20 +70,35 @@ public:
};
/**
* Determines whether the input byte data is a valid DDS representation.
* Determines whether the input byte data represents a valid DDS file.
* Does not take into account whether the texture format is supported.
*
* @param data The byte data to parse.
* @param dataSize The size in bytes of the data.
**/
static bool isDDS(const void *data, size_t dataSize);
/**
* Constructor.
* Attempts to parse byte data as DDS. May throw std::bad_alloc if out of
* memory.
* Determines whether the input byte data represents a valid compressed DDS
* file. Takes into account texture format, but not type (3D textures, etc.)
*
* @param data The byte data to parse.
* @param dataSize The size in bytes of the data.
* @param options Any optional settings (see above.)
**/
Parser(const void *data, size_t dataSize, Options opts = OPTIONS_NONE);
static bool isCompressedDDS(const void *data, size_t dataSize);
/**
* Constructor.
* Attempts to parse byte data as a compressed DDS file.
*
* @param data The byte data to parse.
* @param dataSize The size in bytes of the data.
**/
Parser(const void *data, size_t dataSize);
Parser(const Parser &other);
Parser();
Parser &operator = (const Parser &other);
~Parser();
@@ -96,8 +110,9 @@ public:
/**
* Gets the data of this texture at a mipmap level. Mipmap level 0
* represents the base image.
*
* @param miplevel The mipmap level to get the data of.
* @return Pointer to the image data, or 0 if miplevel is not within the
* @return Pointer to the image data, or NULL if miplevel is not within the
* range of [0, numMipmaps).
**/
const Image *getImageData(size_t miplevel = 0) const;
@@ -108,29 +123,19 @@ public:
**/
size_t getNumMipmaps() const;
/**
* Gets whether this Parser is using an internal copy of the texture data.
* Accessing texture data from a Parser which hasn't internally copied the
* DDS data will result in undefined behaviour if the original data is deleted.
**/
bool ownsData() const;
private:
Format parseDDSFormat(const dxinfo::DDSPixelFormat &fmt) const;
Format parseDX10Format(dxinfo::DXGIFormat fmt) const;
static Format parseDDSFormat(const dxinfo::DDSPixelFormat &fmt);
static Format parseDX10Format(dxinfo::DXGIFormat fmt);
size_t parseImageSize(Format fmt, int width, int height) const;
bool parseTexData(const uint8_t *data, size_t dataSize, Format fmt, int w, int h, int mips);
bool parseData(const void *data, size_t dataSize);
// Delete any heap data created by this object.
void clearData();
std::vector<Image> texData;
Format format;
Options options;
}; // Parser