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

Update for API changes.

Browse Source
This commit is contained in:
castano 2007-12-17 04:10:58 +00:00
parent cfa4913ae6
commit 9cfbb22d73
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvtt/cuda/CudaCompressDXT.cpp
View File

@ -29,6 +29,7 @@
#include <nvimage/ColorBlock.h> #include <nvimage/ColorBlock.h>
#include <nvimage/BlockDXT.h> #include <nvimage/BlockDXT.h>
#include <nvtt/CompressionOptions.h> #include <nvtt/CompressionOptions.h>
#include <nvtt/OutputOptions.h>
#include <nvtt/FastCompressDXT.h> #include <nvtt/FastCompressDXT.h>
#include "CudaCompressDXT.h" #include "CudaCompressDXT.h"
@ -70,8 +71,6 @@ static void doPrecomputation()
// @@ Free allocated memory. // @@ Free allocated memory.
} }
#endif
// Convert linear image to block linear. // Convert linear image to block linear.
static void convertToBlockLinear(const Image * image, uint * blockLinearImage) static void convertToBlockLinear(const Image * image, uint * blockLinearImage)
{ {
@ -92,11 +91,13 @@ static void convertToBlockLinear(const Image * image, uint * blockLinearImage)
} }
} }
#endif // defined HAVE_CUDA
// @@ This code is very repetitive and needs to be cleaned up. // @@ This code is very repetitive and needs to be cleaned up.
/// Compress image using CUDA. /// Compress image using CUDA.
void nv::cudaCompressDXT1(const Image * image, const OutputOptions & outputOptions, const CompressionOptions::Private & compressionOptions) void nv::cudaCompressDXT1(const Image * image, const OutputOptions::Private & outputOptions, const CompressionOptions::Private & compressionOptions)
{ {
nvDebugCheck(cuda::isHardwarePresent()); nvDebugCheck(cuda::isHardwarePresent());
#if defined HAVE_CUDA #if defined HAVE_CUDA
@ -179,7 +180,7 @@ void nv::cudaCompressDXT1(const Image * image, const OutputOptions & outputOptio
/// Compress image using CUDA. /// Compress image using CUDA.
void nv::cudaCompressDXT3(const Image * image, const OutputOptions & outputOptions, const CompressionOptions::Private & compressionOptions) void nv::cudaCompressDXT3(const Image * image, const OutputOptions::Private & outputOptions, const CompressionOptions::Private & compressionOptions)
{ {
nvDebugCheck(cuda::isHardwarePresent()); nvDebugCheck(cuda::isHardwarePresent());
#if defined HAVE_CUDA #if defined HAVE_CUDA
@ -276,7 +277,7 @@ void nv::cudaCompressDXT3(const Image * image, const OutputOptions & outputOptio
/// Compress image using CUDA. /// Compress image using CUDA.
void nv::cudaCompressDXT5(const Image * image, const OutputOptions & outputOptions, const CompressionOptions::Private & compressionOptions) void nv::cudaCompressDXT5(const Image * image, const OutputOptions::Private & outputOptions, const CompressionOptions::Private & compressionOptions)
{ {
nvDebugCheck(cuda::isHardwarePresent()); nvDebugCheck(cuda::isHardwarePresent());
#if defined HAVE_CUDA #if defined HAVE_CUDA
@ -455,7 +456,7 @@ public:
return blockCount == blockMaxCount; return blockCount == blockMaxCount;
} }
void flush(const OutputOptions & outputOptions) void flush(const OutputOptions::Private & outputOptions)
{ {
if (blockCount == 0) if (blockCount == 0)
{ {
@ -512,7 +513,7 @@ private:
#endif // defined HAVE_CUDA #endif // defined HAVE_CUDA
void nv::cudaCompressDXT1_2(const Image * image, const OutputOptions & outputOptions, const CompressionOptions::Private & compressionOptions) void nv::cudaCompressDXT1_2(const Image * image, const OutputOptions::Private & outputOptions, const CompressionOptions::Private & compressionOptions)
{ {
#if defined HAVE_CUDA #if defined HAVE_CUDA
const uint w = image->width(); const uint w = image->width();

8
src/nvtt/cuda/CudaCompressDXT.h
View File

@ -31,11 +31,11 @@ namespace nv
{ {
class Image; class Image;
void cudaCompressDXT1(const Image * image, const nvtt::OutputOptions & outputOptions, const nvtt::CompressionOptions::Private & compressionOptions); void cudaCompressDXT1(const Image * image, const nvtt::OutputOptions::Private & outputOptions, const nvtt::CompressionOptions::Private & compressionOptions);
void cudaCompressDXT3(const Image * image, const nvtt::OutputOptions & outputOptions, const nvtt::CompressionOptions::Private & compressionOptions); void cudaCompressDXT3(const Image * image, const nvtt::OutputOptions::Private & outputOptions, const nvtt::CompressionOptions::Private & compressionOptions);
void cudaCompressDXT5(const Image * image, const nvtt::OutputOptions & outputOptions, const nvtt::CompressionOptions::Private & compressionOptions); void cudaCompressDXT5(const Image * image, const nvtt::OutputOptions::Private & outputOptions, const nvtt::CompressionOptions::Private & compressionOptions);
void cudaCompressDXT1_2(const Image * image, const nvtt::OutputOptions & outputOptions, const nvtt::CompressionOptions::Private & compressionOptions); void cudaCompressDXT1_2(const Image * image, const nvtt::OutputOptions::Private & outputOptions, const nvtt::CompressionOptions::Private & compressionOptions);
} // nv namespace } // nv namespace