Apply patch to update C# wraper. Fixes issue 184.
castano
10 years ago
parent
f705b2eaa1
commit
ac87eefa6d
@ -1,79 +1,79 @@
|
|||||||
// Copyright (c) 2009-2011 Ignacio Castano <castano@gmail.com>
|
// Copyright (c) 2009-2011 Ignacio Castano <castano@gmail.com>
|
||||||
// Copyright (c) 2007-2009 NVIDIA Corporation -- Ignacio Castano <icastano@nvidia.com>
|
// Copyright (c) 2007-2009 NVIDIA Corporation -- Ignacio Castano <icastano@nvidia.com>
|
||||||
//
|
//
|
||||||
// Permission is hereby granted, free of charge, to any person
|
// Permission is hereby granted, free of charge, to any person
|
||||||
// obtaining a copy of this software and associated documentation
|
// obtaining a copy of this software and associated documentation
|
||||||
// files (the "Software"), to deal in the Software without
|
// files (the "Software"), to deal in the Software without
|
||||||
// restriction, including without limitation the rights to use,
|
// restriction, including without limitation the rights to use,
|
||||||
// copy, modify, merge, publish, distribute, sublicense, and/or sell
|
// copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
// copies of the Software, and to permit persons to whom the
|
// copies of the Software, and to permit persons to whom the
|
||||||
// Software is furnished to do so, subject to the following
|
// Software is furnished to do so, subject to the following
|
||||||
// conditions:
|
// conditions:
|
||||||
//
|
//
|
||||||
// The above copyright notice and this permission notice shall be
|
// The above copyright notice and this permission notice shall be
|
||||||
// included in all copies or substantial portions of the Software.
|
// included in all copies or substantial portions of the Software.
|
||||||
//
|
//
|
||||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||||
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||||
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||||
// OTHER DEALINGS IN THE SOFTWARE.
|
// OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
#include "CompressorDX10.h"
|
#include "CompressorDX10.h"
|
||||||
#include "QuickCompressDXT.h"
|
#include "QuickCompressDXT.h"
|
||||||
#include "OptimalCompressDXT.h"
|
#include "OptimalCompressDXT.h"
|
||||||
|
|
||||||
#include "nvtt.h"
|
#include "nvtt.h"
|
||||||
|
|
||||||
#include "nvimage/ColorBlock.h"
|
#include "nvimage/ColorBlock.h"
|
||||||
#include "nvimage/BlockDXT.h"
|
#include "nvimage/BlockDXT.h"
|
||||||
|
|
||||||
#include <new> // placement new
|
#include <new> // placement new
|
||||||
|
|
||||||
using namespace nv;
|
using namespace nv;
|
||||||
using namespace nvtt;
|
using namespace nvtt;
|
||||||
|
|
||||||
|
|
||||||
void FastCompressorBC4::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output)
|
void FastCompressorBC4::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output)
|
||||||
{
|
{
|
||||||
BlockATI1 * block = new(output) BlockATI1;
|
BlockATI1 * block = new(output) BlockATI1;
|
||||||
|
|
||||||
rgba.swizzle(0, 1, 2, 0); // Copy red to alpha
|
rgba.swizzle(0, 1, 2, 0); // Copy red to alpha
|
||||||
QuickCompress::compressDXT5A(rgba, &block->alpha);
|
QuickCompress::compressDXT5A(rgba, &block->alpha);
|
||||||
}
|
}
|
||||||
|
|
||||||
void FastCompressorBC5::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output)
|
void FastCompressorBC5::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output)
|
||||||
{
|
{
|
||||||
BlockATI2 * block = new(output) BlockATI2;
|
BlockATI2 * block = new(output) BlockATI2;
|
||||||
|
|
||||||
rgba.swizzle(0, 1, 2, 0); // Copy red to alpha
|
rgba.swizzle(0, 1, 2, 0); // Copy red to alpha
|
||||||
QuickCompress::compressDXT5A(rgba, &block->x);
|
QuickCompress::compressDXT5A(rgba, &block->x);
|
||||||
|
|
||||||
rgba.swizzle(0, 1, 2, 1); // Copy green to alpha
|
rgba.swizzle(0, 1, 2, 1); // Copy green to alpha
|
||||||
QuickCompress::compressDXT5A(rgba, &block->y);
|
QuickCompress::compressDXT5A(rgba, &block->y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ProductionCompressorBC4::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output)
|
void ProductionCompressorBC4::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output)
|
||||||
{
|
{
|
||||||
BlockATI1 * block = new(output) BlockATI1;
|
BlockATI1 * block = new(output) BlockATI1;
|
||||||
|
|
||||||
rgba.swizzle(0, 1, 2, 0); // Copy red to alpha
|
rgba.swizzle(0, 1, 2, 0); // Copy red to alpha
|
||||||
OptimalCompress::compressDXT5A(rgba, &block->alpha);
|
OptimalCompress::compressDXT5A(rgba, &block->alpha);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ProductionCompressorBC5::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output)
|
void ProductionCompressorBC5::compressBlock(ColorBlock & rgba, nvtt::AlphaMode alphaMode, const nvtt::CompressionOptions::Private & compressionOptions, void * output)
|
||||||
{
|
{
|
||||||
BlockATI2 * block = new(output) BlockATI2;
|
BlockATI2 * block = new(output) BlockATI2;
|
||||||
|
|
||||||
rgba.swizzle(0, 1, 2, 0); // Copy red to alpha
|
rgba.swizzle(0, 1, 2, 0); // Copy red to alpha
|
||||||
OptimalCompress::compressDXT5A(rgba, &block->x);
|
OptimalCompress::compressDXT5A(rgba, &block->x);
|
||||||
|
|
||||||
rgba.swizzle(0, 1, 2, 1); // Copy green to alpha
|
rgba.swizzle(0, 1, 2, 1); // Copy green to alpha
|
||||||
OptimalCompress::compressDXT5A(rgba, &block->y);
|
OptimalCompress::compressDXT5A(rgba, &block->y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue