b7846242bfd3866ad5f540a035590c40f8d5ae95..b596f3145d423cca8893f82711d03a84ce7105da
2015-04-30 Turo Lamminen
Fix LDFLAGS support in Makefile
b596f3 diff | tree
2015-04-30 Turo Lamminen
Cube maps must be square
14b2b0 diff | tree
2015-04-30 Turo Lamminen
Print textureType
bf8ddb diff | tree
2015-04-30 Turo Lamminen
Set blockSize when reading luminance-alpha format
d3d39e diff | tree
3 files modified
32 ■■■■■ changed files
Makefile 6 ●●●● patch | view | raw | blame | history
ddsinfo.c 20 ●●●●● patch | view | raw | blame | history
mojodds.c 6 ●●●●● patch | view | raw | blame | history
Makefile
@@ -23,12 +23,12 @@
ddsinfo: ddsinfo.o mojodds.o
    $(CC) -o $@ $^
    $(CC) $(LDFLAGS) -o $@ $^
glddstest: glddstest.o mojodds.o
    $(CC) -o $@ $^ $(LDLIBS)
    $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
afl-mojodds: afl-mojodds.o mojodds.o
    $(CC) -o $@ $^
    $(CC) $(LDFLAGS) -o $@ $^
ddsinfo.c
@@ -59,6 +59,26 @@
        printf("glfmt: 0x%x\n", glfmt);
        printf("width x height: %u x %u\n", w, h);
        printf("miplevels: %d\n", miplevels);
        printf("textureType: ");
        switch (textureType) {
        case MOJODDS_TEXTURE_NONE:
            printf("none (bug?)\n");
            return 4;
            break;
        case MOJODDS_TEXTURE_2D:
            printf("2D\n");
            break;
        case MOJODDS_TEXTURE_CUBE:
            printf("cube\n");
            break;
        case MOJODDS_TEXTURE_VOLUME:
            printf("volume\n");
            break;
        }
        printf("\n");
        for (unsigned int miplevel = 0; miplevel < miplevels; miplevel++) {
mojodds.c
@@ -269,6 +269,7 @@
        *_glfmt = GL_LUMINANCE_ALPHA;
        calcSizeFlag = DDSD_PITCH;
        blockSize = 2;
        calcSize = ((width * header->ddspf.dwRGBBitCount) + 7) / 8;
    }
@@ -317,6 +318,11 @@
    {
        uint32 wd = header->dwWidth;
        uint32 ht = header->dwHeight;
        if (wd != ht)
        {
            // cube maps must be square
            return 0;
        }
        *_cubemapfacelen = 0;
        for (i = 0; i < (int)*_miplevels; i++)
        {