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

Fix VC10 project files. Fix code to build with CUDA 5.5 (the cudaMemcpyToSymbol overload that takes the symbol name as a string was removed).

Browse Source
This commit is contained in:
nathaniel.reed@gmail.com
2013-10-16 21:18:16 +00:00
parent 57b99a1595
commit 77188a42ac
13 changed files with 151 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvtt/cuda/CompressKernel.cu
View File

@ -1920,6 +1920,13 @@ __global__ void compressDXT5n(uint blockNum, uint2 * d_result)
// Setup kernel
////////////////////////////////////////////////////////////////////////////////
extern "C" void setupOMatchTables(const void * OMatch5Src, size_t OMatch5Size, const void * OMatch6Src, size_t OMatch6Size)
{
// Init single color lookup contant tables.
cudaMemcpyToSymbol(OMatch5, OMatch5Src, OMatch5Size, 0, cudaMemcpyHostToDevice);
cudaMemcpyToSymbol(OMatch6, OMatch6Src, OMatch6Size, 0, cudaMemcpyHostToDevice);
}
extern "C" void setupCompressKernel(const float weights[3])
{
// Set constants.

5
src/nvtt/cuda/CudaCompressorDXT.cpp
View File

@ -44,6 +44,7 @@
#define MAX_BLOCKS 8192U // 32768, 65535 // @@ Limit number of blocks on slow devices to prevent hitting the watchdog timer.
extern "C" void setupOMatchTables(const void * OMatch5Src, size_t OMatch5Size, const void * OMatch6Src, size_t OMatch6Size);
extern "C" void setupCompressKernel(const float weights[3]);
extern "C" void bindTextureToArray(cudaArray * d_data);
@ -88,9 +89,7 @@ CudaContext::CudaContext() :
cudaMalloc((void**) &result, MAX_BLOCKS * 8U);
// Init single color lookup contant tables.
cudaMemcpyToSymbol("OMatch5", OMatch5, sizeof(OMatch5), 0, cudaMemcpyHostToDevice);
cudaMemcpyToSymbol("OMatch6", OMatch6, sizeof(OMatch6), 0, cudaMemcpyHostToDevice);
setupOMatchTables(OMatch5, sizeof(OMatch5), OMatch6, sizeof(OMatch6));
#endif
}