drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add support for R16 in DDS headers.

Browse Source 
Cleanup DDS header output code.
Temporary testing code added to nvcompress.
This commit is contained in:
castano 2009-07-28 08:05:23 +00:00
parent 573cc1b371
commit cb62c3c461
3 changed files with 87 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvtt/CompressionOptions.h
View File

@ -59,6 +59,12 @@ namespace nvtt
bool enableAlphaDithering; bool enableAlphaDithering;
bool binaryAlpha; bool binaryAlpha;
int alphaThreshold; // reference value used for binary alpha quantization. int alphaThreshold; // reference value used for binary alpha quantization.
uint getBitCount() const
{
if (bitcount != 0) return bitcount;
else return rsize + gsize + bsize + asize;
}
}; };
} // nvtt namespace } // nvtt namespace

115
src/nvtt/Context.cpp
View File

@ -392,13 +392,25 @@ bool Compressor::Private::outputHeader(const InputOptions::Private & inputOption
{ {
if (compressionOptions.format == Format_RGBA) if (compressionOptions.format == Format_RGBA)
{ {
if (compressionOptions.bitcount == 16) int bitcount = compressionOptions.bitcount;
{ if (bitcount == 0) {
// B5G6R5_UNORM bitcount = compressionOptions.rsize + compressionOptions.gsize + compressionOptions.bsize + compressionOptions.asize;
// B5G5R5A1_UNORM
supported = false;
} }
else if (compressionOptions.bitcount == 32)
if (bitcount == 16)
{
if (compressionOptions.rsize == 16)
{
header.setDX10Format(56); // R16_UNORM
}
else
{
// B5G6R5_UNORM
// B5G5R5A1_UNORM
supported = false;
}
}
else if (bitcount == 32)
{ {
// B8G8R8A8_UNORM // B8G8R8A8_UNORM
// B8G8R8X8_UNORM // B8G8R8X8_UNORM
@ -443,44 +455,63 @@ bool Compressor::Private::outputHeader(const InputOptions::Private & inputOption
{ {
if (compressionOptions.format == Format_RGBA) if (compressionOptions.format == Format_RGBA)
{ {
header.setPitch(computePitch(inputOptions.targetWidth, compressionOptions.bitcount)); // Get output bit count.
header.setPitch(computePitch(inputOptions.targetWidth, compressionOptions.getBitCount()));
if (compressionOptions.bitcount != 0) if (compressionOptions.pixelType == PixelType_Float)
{ {
header.setPixelFormat(compressionOptions.bitcount, compressionOptions.rmask, compressionOptions.gmask, compressionOptions.bmask, compressionOptions.amask); if (compressionOptions.rsize == 16 && compressionOptions.gsize == 0 && compressionOptions.bsize == 0 && compressionOptions.asize == 0)
}
else
{
if (compressionOptions.pixelType == PixelType_Float)
{ {
if (compressionOptions.rsize == 16 && compressionOptions.gsize == 0 && compressionOptions.bsize == 0 && compressionOptions.asize == 0) header.setFormatCode(111); // D3DFMT_R16F
{ }
header.setFormatCode(111); // D3DFMT_R16F else if (compressionOptions.rsize == 16 && compressionOptions.gsize == 16 && compressionOptions.bsize == 0 && compressionOptions.asize == 0)
} {
else if (compressionOptions.rsize == 16 && compressionOptions.gsize == 16 && compressionOptions.bsize == 0 && compressionOptions.asize == 0) header.setFormatCode(112); // D3DFMT_G16R16F
{ }
header.setFormatCode(112); // D3DFMT_G16R16F else if (compressionOptions.rsize == 16 && compressionOptions.gsize == 16 && compressionOptions.bsize == 16 && compressionOptions.asize == 16)
} {
else if (compressionOptions.rsize == 16 && compressionOptions.gsize == 16 && compressionOptions.bsize == 16 && compressionOptions.asize == 16) header.setFormatCode(113); // D3DFMT_A16B16G16R16F
{ }
header.setFormatCode(113); // D3DFMT_A16B16G16R16F else if (compressionOptions.rsize == 32 && compressionOptions.gsize == 0 && compressionOptions.bsize == 0 && compressionOptions.asize == 0)
} {
else if (compressionOptions.rsize == 32 && compressionOptions.gsize == 0 && compressionOptions.bsize == 0 && compressionOptions.asize == 0) header.setFormatCode(114); // D3DFMT_R32F
{ }
header.setFormatCode(114); // D3DFMT_R32F else if (compressionOptions.rsize == 32 && compressionOptions.gsize == 32 && compressionOptions.bsize == 0 && compressionOptions.asize == 0)
} {
else if (compressionOptions.rsize == 32 && compressionOptions.gsize == 32 && compressionOptions.bsize == 0 && compressionOptions.asize == 0) header.setFormatCode(115); // D3DFMT_G32R32F
{ }
header.setFormatCode(115); // D3DFMT_G32R32F else if (compressionOptions.rsize == 32 && compressionOptions.gsize == 32 && compressionOptions.bsize == 32 && compressionOptions.asize == 32)
} {
else if (compressionOptions.rsize == 32 && compressionOptions.gsize == 32 && compressionOptions.bsize == 32 && compressionOptions.asize == 32) header.setFormatCode(116); // D3DFMT_A32B32G32R32F
{ }
header.setFormatCode(116); // D3DFMT_A32B32G32R32F else
} {
else supported = false;
{ }
supported = false; }
} else // Fixed point
{
const uint bitcount = compressionOptions.getBitCount();
if (compressionOptions.bitcount != 0)
{
// Masks already computed.
header.setPixelFormat(compressionOptions.bitcount, compressionOptions.rmask, compressionOptions.gmask, compressionOptions.bmask, compressionOptions.amask);
}
else if (bitcount <= 32)
{
// Compute pixel format masks.
const uint ashift = 0;
const uint bshift = ashift + compressionOptions.asize;
const uint gshift = bshift + compressionOptions.bsize;
const uint rshift = gshift + compressionOptions.gsize;
const uint rmask = ((1 << compressionOptions.rsize) - 1) << rshift;
const uint gmask = ((1 << compressionOptions.gsize) - 1) << gshift;
const uint bmask = ((1 << compressionOptions.bsize) - 1) << bshift;
const uint amask = ((1 << compressionOptions.asize) - 1) << ashift;
header.setPixelFormat(bitcount, rmask, gmask, bmask, amask);
} }
else else
{ {
@ -590,7 +621,7 @@ bool Compressor::Private::compressMipmaps(uint f, const InputOptions::Private &
{ {
if (outputOptions.outputHandler) if (outputOptions.outputHandler)
{ {
int size = computeImageSize(w, h, d, compressionOptions.bitcount, compressionOptions.format); int size = computeImageSize(w, h, d, compressionOptions.getBitCount(), compressionOptions.format);
outputOptions.outputHandler->beginImage(size, w, h, d, f, m); outputOptions.outputHandler->beginImage(size, w, h, d, f, m);
} }

13
src/nvtt/tools/compress.cpp
View File

@ -308,7 +308,8 @@ int main(int argc, char *argv[])
printf(" -repeat \tRepeat wrapping mode.\n"); printf(" -repeat \tRepeat wrapping mode.\n");
printf(" -nomips \tDisable mipmap generation.\n"); printf(" -nomips \tDisable mipmap generation.\n");
printf(" -premula \tPremultiply alpha into color channel.\n"); printf(" -premula \tPremultiply alpha into color channel.\n");
printf(" -mipfilter \tMipmap filter. One of the following: box, triangle, kaiser.\n\n"); printf(" -mipfilter \tMipmap filter. One of the following: box, triangle, kaiser.\n");
printf(" -float \tLoad as floating point image.\n\n");
printf("Compression options:\n"); printf("Compression options:\n");
printf(" -fast \tFast compression.\n"); printf(" -fast \tFast compression.\n");
@ -470,11 +471,13 @@ int main(int argc, char *argv[])
nvtt::CompressionOptions compressionOptions; nvtt::CompressionOptions compressionOptions;
compressionOptions.setFormat(format); compressionOptions.setFormat(format);
/*if (format == nvtt::Format_RGBA) if (format == nvtt::Format_RGBA)
{ {
compressionOptions.setPixelType(nvtt::PixelType_Float); // compressionOptions.setPixelType(nvtt::PixelType_Float);
compressionOptions.setPixelFormat(16, 16, 16, 16); // compressionOptions.setPixelFormat(16, 16, 16, 16);
}*/ compressionOptions.setPixelType(nvtt::PixelType_UnsignedNorm);
compressionOptions.setPixelFormat(16, 0, 0, 0);
}
if (fast) if (fast)
{ {