From c69edfa16ed04137f3fda54bbf71685621b2ac39 Mon Sep 17 00:00:00 2001 From: castano Date: Thu, 10 Jun 2010 02:30:01 +0000 Subject: [PATCH] Fix errors when cuda is not enabled. --- trunk/src/nvtt/cuda/CudaCompressorDXT.cpp | 3 ++- trunk/src/nvtt/cuda/CudaCompressorDXT.h | 2 +- trunk/src/nvtt/cuda/CudaUtils.cpp | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/trunk/src/nvtt/cuda/CudaCompressorDXT.cpp b/trunk/src/nvtt/cuda/CudaCompressorDXT.cpp index 8488d56..4451228 100644 --- a/trunk/src/nvtt/cuda/CudaCompressorDXT.cpp +++ b/trunk/src/nvtt/cuda/CudaCompressorDXT.cpp @@ -219,6 +219,7 @@ void CudaCompressor::compress(nvtt::InputFormat inputFormat, nvtt::AlphaMode alp } +#if defined HAVE_CUDA void CudaCompressorDXT1::setup(cudaArray * image, const nvtt::CompressionOptions::Private & compressionOptions) { @@ -290,7 +291,7 @@ void CudaCompressorDXT5::compressBlocks(uint first, uint count, uint w, uint h, } - +#endif // defined HAVE_CUDA diff --git a/trunk/src/nvtt/cuda/CudaCompressorDXT.h b/trunk/src/nvtt/cuda/CudaCompressorDXT.h index 66cc77d..1afaff0 100644 --- a/trunk/src/nvtt/cuda/CudaCompressorDXT.h +++ b/trunk/src/nvtt/cuda/CudaCompressorDXT.h @@ -25,7 +25,7 @@ #define NV_TT_CUDACOMPRESSORDXT_H #include "nvtt/nvtt.h" -#include "../Compressor.h" // CompressorInterface +#include "nvtt/Compressor.h" // CompressorInterface struct cudaArray; diff --git a/trunk/src/nvtt/cuda/CudaUtils.cpp b/trunk/src/nvtt/cuda/CudaUtils.cpp index 7bb2b09..d815090 100644 --- a/trunk/src/nvtt/cuda/CudaUtils.cpp +++ b/trunk/src/nvtt/cuda/CudaUtils.cpp @@ -21,8 +21,8 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. -#include -#include +#include "nvcore/Debug.h" +#include "nvcore/Library.h" #include "CudaUtils.h" #if defined HAVE_CUDA