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

Use smaller allocations to prevent errors.

Browse Source 
Check for allocation errors.
This commit is contained in:
castano 2008-02-28 21:45:04 +00:00
parent dafe2b8841
commit ccced843e3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,8 +48,7 @@ using namespace nvtt;
#if defined HAVE_CUDA #if defined HAVE_CUDA
//#define MAX_BLOCKS 32768U // 49152, 65535 #define MAX_BLOCKS 8192U // 32768, 65535
#define MAX_BLOCKS 8192U // 49152, 65535
extern "C" void setupCompressKernel(const float weights[3]); extern "C" void setupCompressKernel(const float weights[3]);
@ -84,12 +83,15 @@ static void convertToBlockLinear(const Image * image, uint * blockLinearImage)
#endif #endif
CudaCompressor::CudaCompressor() CudaCompressor::CudaCompressor() : m_bitmapTable(NULL), m_data(NULL), m_result(NULL)
{ {
#if defined HAVE_CUDA #if defined HAVE_CUDA
// Allocate and upload bitmaps. // Allocate and upload bitmaps.
cudaMalloc((void**) &m_bitmapTable, 992 * sizeof(uint)); cudaMalloc((void**) &m_bitmapTable, 992 * sizeof(uint));
cudaMemcpy(m_bitmapTable, s_bitmapTable, 992 * sizeof(uint), cudaMemcpyHostToDevice); if (m_bitmapTable != NULL)
{
cudaMemcpy(m_bitmapTable, s_bitmapTable, 992 * sizeof(uint), cudaMemcpyHostToDevice);
}
// Allocate scratch buffers. // Allocate scratch buffers.
cudaMalloc((void**) &m_data, MAX_BLOCKS * 64U); cudaMalloc((void**) &m_data, MAX_BLOCKS * 64U);