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

Integrate changes from cfcohen to supress warning.

Browse Source
This commit is contained in:
Ignacio 2015-12-05 15:09:57 -08:00
parent 268e6abd65
commit a20044bccc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1464,13 +1464,13 @@ __global__ void compressDXT1(uint firstBlock, uint blockWidth, const uint * perm
const int minIdx = findMinError(errors); const int minIdx = findMinError(errors);
__shared__ uint s_bestEndPoints; __shared__ uint s_bestEndPoints;
__shared__ uint s_bestPermutation; //__shared__ uint s_bestPermutation;
// Only write the result of the winner thread. // Only write the result of the winner thread.
if (threadIdx.x == minIdx) if (threadIdx.x == minIdx)
{ {
s_bestEndPoints = (bestEnd << 16) | bestStart; s_bestEndPoints = (bestEnd << 16) | bestStart;
s_bestPermutation = (bestStart != bestEnd) ? bestPermutation : 0; //s_bestPermutation = (bestStart != bestEnd) ? bestPermutation : 0;
} }
__syncthreads(); __syncthreads();