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

Add support for loading DDS files that contain raw/uncompressed pixel data. Resolves issue #1097.

Browse Source
This commit is contained in:
Alex Szpakowski
2019-09-17 22:40:11 -03:00
parent a6f8e7dac6
commit d6e37ec4aa
5 changed files with 578 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libraries/ddsparse/ddsparse.h
+13 -33
View File
@@ -1,7 +1,7 @@
/**
* Simple DDS data parser for compressed 2D textures.
*
* Copyright (c) 2013-2017 Alex Szpakowski
* Copyright (c) 2013-2019 Alex Szpakowski
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
@@ -28,40 +28,18 @@
#include <vector>
#include "ddsinfo.h"
namespace dds
{
// Supported DDS formats.
// Formats with an 's' suffix have signed data.
enum Format
{
FORMAT_DXT1,
FORMAT_DXT1srgb,
FORMAT_DXT3,
FORMAT_DXT3srgb,
FORMAT_DXT5,
FORMAT_DXT5srgb,
FORMAT_BC4,
FORMAT_BC4s,
FORMAT_BC5,
FORMAT_BC5s,
FORMAT_BC6H,
FORMAT_BC6Hs,
FORMAT_BC7,
FORMAT_BC7srgb, // sRGB color space.
FORMAT_UNKNOWN
};
// Represents a single mipmap level of a texture.
struct Image
{
int width;
int height;
size_t dataSize;
const uint8_t *data;
Image() : width(0), height(0), dataSize(0), data(0)
{}
int width = 0;
int height = 0;
size_t dataSize = 0;
const uint8_t *data = nullptr;
};
/**
@@ -82,6 +60,8 @@ bool isDDS(const void *data, size_t dataSize);
**/
bool isCompressedDDS(const void *data, size_t dataSize);
dxinfo::DXGIFormat getDDSPixelFormat(const void *data, size_t dataSize);
class Parser
{
public:
@@ -104,7 +84,7 @@ public:
/**
* Gets the format of this texture.
**/
Format getFormat() const;
dxinfo::DXGIFormat getFormat() const;
/**
* Gets the data of this texture at a mipmap level. Mipmap level 0
@@ -124,12 +104,12 @@ public:
private:
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);
size_t parseImageSize(dxinfo::DXGIFormat fmt, int width, int height) const;
bool parseTexData(const uint8_t *data, size_t dataSize, dxinfo::DXGIFormat fmt, int w, int h, int mips);
bool parseData(const void *data, size_t dataSize);
std::vector<Image> texData;
Format format;
dxinfo::DXGIFormat format;
}; // Parser