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

Fix build on MIPS

Browse Source 
On MIPS toolchains, the 'mips' keyword is a macro defined to 1.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
This commit is contained in:
Paul Cercueil
2019-12-19 11:30:38 +01:00
parent 6a552d5a6f
commit 0bac89e00f
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libraries/ddsparse/ddsparse.cpp
+4 -4
View File
@@ -555,12 +555,12 @@ size_t Parser::parseImageSize(DXGIFormat fmt, int width, int height) const
return bytes;
}
bool Parser::parseTexData(const uint8_t *data, size_t dataSize, DXGIFormat fmt, int w, int h, int mips)
bool Parser::parseTexData(const uint8_t *data, size_t dataSize, DXGIFormat fmt, int w, int h, int nb_mips)
{
size_t offset = 0;
std::vector<Image> newTexData;
for (int i = 0; i < mips; i++)
for (int i = 0; i < nb_mips; i++)
{
Image img;
img.width = w;
@@ -631,9 +631,9 @@ bool Parser::parseData(const void *data, size_t dataSize)
int w = header->width;
int h = header->height;
int mips = std::max((int) header->mipMapCount, 1);
int nb_mips = std::max((int) header->mipMapCount, 1);
return parseTexData(&readData[offset], dataSize - offset, format, w, h, mips);
return parseTexData(&readData[offset], dataSize - offset, format, w, h, nb_mips);
}
} // dds
src/libraries/ddsparse/ddsparse.h
+1 -1
View File
@@ -105,7 +105,7 @@ public:
private:
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 parseTexData(const uint8_t *data, size_t dataSize, dxinfo::DXGIFormat fmt, int w, int h, int nb_mips);
bool parseData(const void *data, size_t dataSize);
std::vector<Image> texData;