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

BC6/7 progress. Work in progress.

Browse Source
pull/216/head
castano 14 years ago
parent f2c581dec1
commit 5c60989043
8 changed files with 83 additions and 25 deletions
Show Stats Download Patch File Download Diff File

21
src/nvtt/CompressorDX11.cpp
Unescape Escape View File

@ -24,10 +24,31 @@
#include "CompressorDX11.h"
#include "nvtt.h"
#include "CompressionOptions.h"
#include "bc6h/zoh.h"
#include "bc6h/utils.h"
using namespace nv;
using namespace nvtt;
void CompressorBC6::compressBlock(Tile & tile, AlphaMode alphaMode, const CompressionOptions::Private & compressionOptions, void * output)
{
NV_UNUSED(alphaMode); // ZOH does not support alpha.
if (compressionOptions.pixelType == PixelType_UnsignedFloat ||
compressionOptions.pixelType == PixelType_UnsignedNorm ||
compressionOptions.pixelType == PixelType_UnsignedInt)
{
Utils::FORMAT = UNSIGNED_F16; // @@ Do not use globals.
}
else
{
Utils::FORMAT = SIGNED_F16;
}
ZOH::compress(tile, (char *)output);
}

8
src/nvtt/CompressorDX11.h
Unescape Escape View File

@ -28,15 +28,15 @@
namespace nv
{
struct CompressorBC6 : public FixedBlockCompressor
struct CompressorBC6 : public TileCompressor
{
virtual void compressBlock(ColorBlock & rgba, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output);
virtual void compressBlock(Tile & tile, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output);
virtual uint blockSize() const { return 16; }
};
struct CompressorBC7 : public FixedBlockCompressor
struct CompressorBC7 : public TileCompressor
{
virtual void compressBlock(ColorBlock & rgba, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output);
virtual void compressBlock(Tile & tile, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output);
virtual uint blockSize() const { return 16; }
};

47
src/nvtt/CompressorDXT.cpp
Unescape Escape View File

@ -49,7 +49,6 @@ void FixedBlockCompressor::compress(nvtt::InputFormat inputFormat, nvtt::AlphaMo
const uint bs = blockSize();
const uint bw = (w + 3) / 4;
const uint bh = (h + 3) / 4;
const uint size = bs * bw * bh;
#if defined(HAVE_OPENMP)
bool singleThreaded = false;
@ -61,9 +60,9 @@ void FixedBlockCompressor::compress(nvtt::InputFormat inputFormat, nvtt::AlphaMo
if (bw * bh < 16) singleThreaded = true;
if (singleThreaded)
{
nvDebugCheck(bs <= 16);
uint8 mem[16];
{
nvDebugCheck(bs <= 16);
uint8 mem[16]; // @@ Output one row at a time!
for (int y = 0; y < int(h); y += 4) {
for (uint x = 0; x < w; x += 4) {
@ -88,7 +87,8 @@ void FixedBlockCompressor::compress(nvtt::InputFormat inputFormat, nvtt::AlphaMo
#if defined(HAVE_OPENMP)
else
{
uint8 * mem = new uint8[size];
const uint size = bs * bw * bh;
uint8 * mem = new uint8[size];
#pragma omp parallel
{
@ -121,3 +121,40 @@ void FixedBlockCompressor::compress(nvtt::InputFormat inputFormat, nvtt::AlphaMo
#endif
}
#include "bc6h/tile.h"
void TileCompressor::compress(InputFormat inputFormat, AlphaMode alphaMode, uint w, uint h, const void * data, const CompressionOptions::Private & compressionOptions, const OutputOptions::Private & outputOptions)
{
const uint bs = blockSize();
const uint bw = (w + 3) / 4;
const uint bh = (h + 3) / 4;
bool singleThreaded = true;
if (singleThreaded)
{
nvDebugCheck(bs <= 16);
uint8 mem[16]; // @@ Output one row at a time!
for (uint y = 0; y < h; y += 4) {
for (uint x = 0; x < w; x += 4) {
Tile tile;
if (inputFormat == nvtt::InputFormat_BGRA_8UB) {
//tile.init((const uint *)data, w, h, x, y);
}
else {
nvDebugCheck(inputFormat == nvtt::InputFormat_RGBA_32F);
//tile.init((const float *)data, w, h, x, y);
}
compressBlock(tile, alphaMode, compressionOptions, mem);
if (outputOptions.outputHandler != NULL) {
outputOptions.outputHandler->writeData(mem, bs);
}
}
}
}
}

3
src/nvtt/CompressorDXT.h
Unescape Escape View File

@ -26,10 +26,11 @@
#include "Compressor.h"
struct Tile;
namespace nv
{
struct ColorBlock;
struct Tile;
struct FixedBlockCompressor : public CompressorInterface
{

2
src/nvtt/bc6h/tile.h
Unescape Escape View File

@ -75,7 +75,7 @@ public:
static const int TILE_H = 4;
static const int TILE_W = 4;
static const int TILE_TOTAL = TILE_H * TILE_W;
Vector3 data[TILE_H][TILE_W];
nv::Vector3 data[TILE_H][TILE_W];
float importance_map[TILE_H][TILE_W];
int size_x, size_y; // actual size of tile
};

11
src/nvtt/bc6h/utils.h
Unescape Escape View File

@ -17,7 +17,6 @@ See the License for the specific language governing permissions and limitations
#include "nvmath/Vector.h"
using namespace nv; // @@ Move everything to nv namespace instead.
#define PALETTE_LERP(a, b, i, denom) Utils::lerp(a, b, i, denom)
@ -45,18 +44,18 @@ enum Format { UNSIGNED_F16, SIGNED_F16 };
class Utils
{
public:
static Format FORMAT; // this is a global -- we're either handling unsigned or unsigned half values
static ::Format FORMAT; // this is a global -- we're either handling unsigned or unsigned half values
// error metrics
static double norm(const Vector3 &a, const Vector3 &b);
static double mpsnr_norm(const Vector3 &a, int exposure, const Vector3 &b);
static double norm(const nv::Vector3 &a, const nv::Vector3 &b);
static double mpsnr_norm(const nv::Vector3 &a, int exposure, const nv::Vector3 &b);
// conversion & clamp
static int ushort_to_format(unsigned short input);
static unsigned short format_to_ushort(int input);
// clamp to format
static void clamp(Vector3 &v);
static void clamp(nv::Vector3 &v);
// quantization and unquantization
static int finish_unquantize(int q, int prec);
@ -67,7 +66,7 @@ public:
// lerping
static int lerp(int a, int b, int i, int denom);
static Vector3 lerp(const Vector3 & a, const Vector3 & b, int i, int denom);
static nv::Vector3 lerp(const nv::Vector3 & a, const nv::Vector3 & b, int i, int denom);
};
#endif // _UTILS_H

4
src/nvtt/bc6h/zoh.h
Unescape Escape View File

@ -29,8 +29,8 @@ See the License for the specific language governing permissions and limitations
struct FltEndpts
{
Vector3 A;
Vector3 B;
nv::Vector3 A;
nv::Vector3 B;
};
struct IntEndpts

12
src/nvtt/tools/CMakeLists.txt
Unescape Escape View File

@ -19,12 +19,12 @@ TARGET_LINK_LIBRARIES(nvzoom nvcore nvmath nvimage)
SET(TOOLS nvcompress nvdecompress nvddsinfo nvassemble nvzoom)
IF(GLEW_FOUND AND GLUT_FOUND)
INCLUDE_DIRECTORIES(${GLEW_INCLUDE_PATH} ${GLUT_INCLUDE_DIR})
ADD_EXECUTABLE(nvddsview ddsview.cpp cmdline.h)
TARGET_LINK_LIBRARIES(nvddsview nvcore nvmath nvimage ${GLEW_LIBRARY} ${GLUT_LIBRARY})
SET(TOOLS ${TOOLS} nvddsview)
ENDIF(GLEW_FOUND AND GLUT_FOUND)
#IF(GLEW_FOUND AND GLUT_FOUND)
# INCLUDE_DIRECTORIES(${GLEW_INCLUDE_PATH} ${GLUT_INCLUDE_DIR})
# ADD_EXECUTABLE(nvddsview ddsview.cpp cmdline.h)
# TARGET_LINK_LIBRARIES(nvddsview nvcore nvmath nvimage ${GLEW_LIBRARY} ${GLUT_LIBRARY})
# SET(TOOLS ${TOOLS} nvddsview)
#ENDIF(GLEW_FOUND AND GLUT_FOUND)
ADD_EXECUTABLE(nv-gnome-thumbnailer thumbnailer.cpp cmdline.h)

Write Preview
Loading…
Cancel
Save