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

reorg.

Browse Source
This commit is contained in:
castano
2010-03-16 22:37:25 +00:00
parent d8ed531e4c
commit a19e25228f
12 changed files with 245 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/nvtt/cuda/Bitmaps.h → src/nvtt/cuda/BitmapTable.h
View File

10
src/nvtt/cuda/CudaCompressDXT.cpp → src/nvtt/cuda/CudaCompressorDXT.cpp
View File

@ -32,7 +32,7 @@
#include <nvtt/QuickCompressDXT.h>
#include <nvtt/OptimalCompressDXT.h>
#include "CudaCompressDXT.h"
#include "CudaCompressorDXT.h"
#include "CudaUtils.h"
@ -62,8 +62,7 @@ extern "C" void compressKernelDXT3(uint firstBlock, uint blockNum, uint w, uint
//extern "C" void compressKernelCTX1(uint blockNum, uint * d_data, uint * d_result, uint * d_bitmaps);
#pragma message(NV_FILE_LINE "TODO: Rename Bitmaps.h to BitmapTable.h")
#include "Bitmaps.h"
#include "BitmapTable.h"
/*
// Convert linear image to block linear.
@ -141,13 +140,14 @@ bool CudaContext::isValid() const
}
#if defined HAVE_CUDA
CudaCompressor::CudaCompressor(CudaContext & ctx) : m_ctx(ctx)
{
}
void CudaCompressor::compress(nvtt::InputFormat inputFormat, nvtt::AlphaMode alphaMode, uint w, uint h, void * data, const nvtt::CompressionOptions::Private & compressionOptions, const nvtt::OutputOptions::Private & outputOptions)
void CudaCompressor::compress(nvtt::InputFormat inputFormat, nvtt::AlphaMode alphaMode, uint w, uint h, const void * data, const nvtt::CompressionOptions::Private & compressionOptions, const nvtt::OutputOptions::Private & outputOptions)
{
nvDebugCheck(cuda::isHardwarePresent());
@ -645,3 +645,5 @@ void CudaCompressor::compressDXT5n(const nvtt::CompressionOptions::Private & com
}
#endif // 0
#endif // defined HAVE_CUDA

17
src/nvtt/cuda/CudaCompressDXT.h → src/nvtt/cuda/CudaCompressorDXT.h
View File

@ -21,20 +21,16 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
// OTHER DEALINGS IN THE SOFTWARE.
#ifndef NV_TT_CUDACOMPRESSDXT_H
#define NV_TT_CUDACOMPRESSDXT_H
#ifndef NV_TT_CUDACOMPRESSORDXT_H
#define NV_TT_CUDACOMPRESSORDXT_H
#include <nvimage/nvimage.h>
#include <nvtt/nvtt.h>
#include "nvtt/CompressDXT.h"
#include "nvtt/nvtt.h"
#include "../Compressor.h" // CompressorInterface
struct cudaArray;
namespace nv
{
class Image;
class CudaContext
{
public:
@ -51,12 +47,13 @@ namespace nv
uint * result;
};
#if defined HAVE_CUDA
struct CudaCompressor : public CompressorInterface
{
CudaCompressor(CudaContext & ctx);
virtual void compress(nvtt::InputFormat inputFormat, nvtt::AlphaMode alphaMode, uint w, uint h, void * data, const nvtt::CompressionOptions::Private & compressionOptions, const nvtt::OutputOptions::Private & outputOptions);
virtual void compress(nvtt::InputFormat inputFormat, nvtt::AlphaMode alphaMode, uint w, uint h, const void * data, const nvtt::CompressionOptions::Private & compressionOptions, const nvtt::OutputOptions::Private & outputOptions);
virtual void setup(cudaArray * image, const nvtt::CompressionOptions::Private & compressionOptions) = 0;
virtual void compressBlocks(uint first, uint count, uint w, uint h, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output) = 0;
@ -107,6 +104,8 @@ namespace nv
virtual uint blockSize() const { return 8; };
};*/
#endif // defined HAVE_CUDA
} // nv namespace