mirror of
https://github.com/yuzu-emu/FasTC.git
synced 2024-11-24 05:35:51 +01:00
Some formatting and rearrange the BPTC code to be more structured like the others
This commit is contained in:
Pavel Krajcevski
parent
f2c153feba
commit
f12ee09f7e
@ -47,7 +47,7 @@ INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/BPTCEncoder/include)
|
||||
|
||||
IF(NOT "" STREQUAL "${AVPCLLIB_ROOT}")
|
||||
INCLUDE_DIRECTORIES(${AVPCLLIB_INCLUDE_DIR})
|
||||
SET(FOUND_NVTT_BC7_EXPORT TRUE)
|
||||
SET(FOUND_NVTT_BPTC_EXPORT TRUE)
|
||||
ENDIF()
|
||||
|
||||
INCLUDE(CheckCXXSourceRuns)
|
||||
@ -57,9 +57,11 @@ IF( NOT HAS_INLINE_ASSEMBLY AND NOT HAS_INLINE_ASSEMBLY_WITH_FLAGS )
|
||||
ENDIF()
|
||||
|
||||
# Check to see whether or not our compiler supports atomic operations
|
||||
IF( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" )
|
||||
IF( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
|
||||
"${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" )
|
||||
SET( COMPILER_CLANG True )
|
||||
ELSEIF( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" )
|
||||
ELSEIF( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
|
||||
"${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" )
|
||||
SET( COMPILER_GNU True )
|
||||
ENDIF()
|
||||
|
||||
@ -96,19 +98,21 @@ IF( HAS_MSVC_ATOMICS OR HAS_GCC_ATOMICS )
|
||||
ENDIF()
|
||||
|
||||
CONFIGURE_FILE(
|
||||
"config/BC7Config.h.in"
|
||||
"include/BC7Config.h"
|
||||
"config/BPTCConfig.h.in"
|
||||
"include/BPTCConfig.h"
|
||||
)
|
||||
|
||||
SET( HEADERS
|
||||
src/BC7CompressionMode.h
|
||||
config/BPTCConfig.h.in
|
||||
include/BPTCCompressor.h
|
||||
src/CompressionMode.h
|
||||
src/BitStream.h
|
||||
src/RGBAEndpoints.h
|
||||
src/ParallelStage.h
|
||||
)
|
||||
|
||||
SET( SOURCES
|
||||
src/BC7Compressor.cpp
|
||||
src/Compressor.cpp
|
||||
src/RGBAEndpoints.cpp
|
||||
src/ParallelStage.cpp
|
||||
)
|
||||
@ -132,12 +136,12 @@ IF( HAS_SSE_41 )
|
||||
SET( HEADERS
|
||||
${HEADERS}
|
||||
src/RGBAEndpointsSIMD.h
|
||||
src/BC7CompressionModeSIMD.h
|
||||
src/CompressionModeSIMD.h
|
||||
)
|
||||
|
||||
SET( SOURCES
|
||||
${SOURCES}
|
||||
src/BC7CompressorSIMD.cpp
|
||||
src/CompressorSIMD.cpp
|
||||
src/RGBAEndpointsSIMD.cpp
|
||||
)
|
||||
ENDIF( HAS_SSE_41 )
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
/* FasTC
|
||||
* Copyright (c) 2012 University of North Carolina at Chapel Hill. All rights reserved.
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software and its documentation for educational,
|
||||
* research, and non-profit purposes, without fee, and without a written agreement is hereby granted,
|
||||
* provided that the above copyright notice, this paragraph, and the following four paragraphs appear
|
||||
* in all copies.
|
||||
*
|
||||
* Permission to incorporate this software into commercial products may be obtained by contacting the
|
||||
* authors or the Office of Technology Development at the University of North Carolina at Chapel Hill <otd@unc.edu>.
|
||||
*
|
||||
* This software program and documentation are copyrighted by the University of North Carolina at Chapel Hill.
|
||||
* The software program and documentation are supplied "as is," without any accompanying services from the
|
||||
* University of North Carolina at Chapel Hill or the authors. The University of North Carolina at Chapel Hill
|
||||
* and the authors do not warrant that the operation of the program will be uninterrupted or error-free. The
|
||||
* end-user understands that the program was developed for research purposes and is advised not to rely
|
||||
* exclusively on the program for any reason.
|
||||
*
|
||||
* IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE AUTHORS BE LIABLE TO ANY PARTY FOR
|
||||
* DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE
|
||||
* USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE
|
||||
* AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING,
|
||||
* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY
|
||||
* STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY
|
||||
* OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
|
||||
* ENHANCEMENTS, OR MODIFICATIONS.
|
||||
*
|
||||
* Please send all BUG REPORTS to <pavel@cs.unc.edu>.
|
||||
*
|
||||
* The authors may be contacted via:
|
||||
*
|
||||
* Pavel Krajcevski
|
||||
* Dept of Computer Science
|
||||
* 201 S Columbia St
|
||||
* Frederick P. Brooks, Jr. Computer Science Bldg
|
||||
* Chapel Hill, NC 27599-3175
|
||||
* USA
|
||||
*
|
||||
* <http://gamma.cs.unc.edu/FasTC/>
|
||||
*/
|
||||
|
||||
// BC7Config.h.in -- This file contains variables that are introduced
|
||||
// explicitly by the CMake build process.
|
||||
|
||||
// Do we have the proper popcnt instruction defined?
|
||||
#cmakedefine NO_INLINE_ASSEMBLY
|
||||
#cmakedefine HAS_SSE_POPCNT
|
||||
#cmakedefine HAS_SSE_41
|
||||
|
||||
#cmakedefine HAS_ATOMICS
|
||||
#cmakedefine HAS_GCC_ATOMICS
|
||||
#cmakedefine HAS_MSVC_ATOMICS
|
||||
|
||||
#cmakedefine FOUND_NVTT_BC7_EXPORT
|
||||
65
BPTCEncoder/config/BPTCConfig.h.in
Normal file
65
BPTCEncoder/config/BPTCConfig.h.in
Normal file
@ -0,0 +1,65 @@
|
||||
/* FasTC
|
||||
* Copyright (c) 2014 University of North Carolina at Chapel Hill.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software and its
|
||||
* documentation for educational, research, and non-profit purposes, without
|
||||
* fee, and without a written agreement is hereby granted, provided that the
|
||||
* above copyright notice, this paragraph, and the following four paragraphs
|
||||
* appear in all copies.
|
||||
*
|
||||
* Permission to incorporate this software into commercial products may be
|
||||
* obtained by contacting the authors or the Office of Technology Development
|
||||
* at the University of North Carolina at Chapel Hill <otd@unc.edu>.
|
||||
*
|
||||
* This software program and documentation are copyrighted by the University of
|
||||
* North Carolina at Chapel Hill. The software program and documentation are
|
||||
* supplied "as is," without any accompanying services from the University of
|
||||
* North Carolina at Chapel Hill or the authors. The University of North
|
||||
* Carolina at Chapel Hill and the authors do not warrant that the operation of
|
||||
* the program will be uninterrupted or error-free. The end-user understands
|
||||
* that the program was developed for research purposes and is advised not to
|
||||
* rely exclusively on the program for any reason.
|
||||
*
|
||||
* IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE
|
||||
* AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL,
|
||||
* OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF
|
||||
* THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA
|
||||
* AT CHAPEL HILL OR THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
*
|
||||
* THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY
|
||||
* DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY
|
||||
* STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON
|
||||
* AN "AS IS" BASIS, AND THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND
|
||||
* THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
|
||||
* ENHANCEMENTS, OR MODIFICATIONS.
|
||||
*
|
||||
* Please send all BUG REPORTS to <pavel@cs.unc.edu>.
|
||||
*
|
||||
* The authors may be contacted via:
|
||||
*
|
||||
* Pavel Krajcevski
|
||||
* Dept of Computer Science
|
||||
* 201 S Columbia St
|
||||
* Frederick P. Brooks, Jr. Computer Science Bldg
|
||||
* Chapel Hill, NC 27599-3175
|
||||
* USA
|
||||
*
|
||||
* <http://gamma.cs.unc.edu/FasTC/>
|
||||
*/
|
||||
|
||||
// BPTCConfig.h.in -- This file contains variables that are introduced
|
||||
// explicitly by the CMake build process.
|
||||
|
||||
// Do we have the proper popcnt instruction defined?
|
||||
#cmakedefine NO_INLINE_ASSEMBLY
|
||||
#cmakedefine HAS_SSE_POPCNT
|
||||
#cmakedefine HAS_SSE_41
|
||||
|
||||
#cmakedefine HAS_ATOMICS
|
||||
#cmakedefine HAS_GCC_ATOMICS
|
||||
#cmakedefine HAS_MSVC_ATOMICS
|
||||
|
||||
#cmakedefine FOUND_NVTT_BC7_EXPORT
|
||||
@ -1,5 +1,5 @@
|
||||
/* FasTC
|
||||
* Copyright (c) 2012 University of North Carolina at Chapel Hill.
|
||||
* Copyright (c) 2014 University of North Carolina at Chapel Hill.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software and its
|
||||
@ -73,15 +73,15 @@
|
||||
//
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
#ifndef BPTCENCODER_INCLUDE_BC7COMPRESSOR_H_
|
||||
#define BPTCENCODER_INCLUDE_BC7COMPRESSOR_H_
|
||||
#ifndef BPTCENCODER_INCLUDE_BPTCCOMPRESSOR_H_
|
||||
#define BPTCENCODER_INCLUDE_BPTCCOMPRESSOR_H_
|
||||
|
||||
#include "BC7Config.h"
|
||||
#include "BPTCConfig.h"
|
||||
#include "CompressionJob.h"
|
||||
|
||||
#include <iosfwd>
|
||||
|
||||
namespace BC7C {
|
||||
namespace BPTCC {
|
||||
// This is the error metric that is applied to our error measurement algorithm
|
||||
// in order to bias calculation towards results that are more in-line with
|
||||
// how the Human Visual System works. Uniform error means that each color
|
||||
@ -112,7 +112,7 @@ namespace BC7C {
|
||||
void SetQualityLevel(int q);
|
||||
int GetQualityLevel();
|
||||
|
||||
// Compress the image given as RGBA data to BC7 format. Width and Height are
|
||||
// Compress the image given as RGBA data to BPTC format. Width and Height are
|
||||
// the dimensions of the image in pixels.
|
||||
void Compress(const FasTC::CompressionJob &);
|
||||
|
||||
@ -123,10 +123,10 @@ namespace BC7C {
|
||||
void CompressWithStats(const FasTC::CompressionJob &, std::ostream *logStream);
|
||||
|
||||
#ifdef HAS_SSE_41
|
||||
// Compress the image given as RGBA data to BC7 format using an algorithm
|
||||
// Compress the image given as RGBA data to BPTC format using an algorithm
|
||||
// optimized for SIMD enabled platforms. Width and Height are the dimensions
|
||||
// of the image in pixels.
|
||||
void CompressImageBC7SIMD(const unsigned char* inBuf, unsigned char* outBuf,
|
||||
void CompressImageBPTCSIMD(const unsigned char* inBuf, unsigned char* outBuf,
|
||||
unsigned int width, unsigned int height);
|
||||
#endif
|
||||
|
||||
@ -138,7 +138,7 @@ namespace BC7C {
|
||||
void CompressAtomic(FasTC::CompressionJobList &);
|
||||
#endif
|
||||
|
||||
#ifdef FOUND_NVTT_BC7_EXPORT
|
||||
#ifdef FOUND_NVTT_BPTC_EXPORT
|
||||
// These functions take the same arguments as Compress and CompressWithStats,
|
||||
// but they use the NVTT compressor if it was supplied to CMake.
|
||||
void CompressNVTT(const FasTC::CompressionJob &);
|
||||
@ -146,9 +146,9 @@ namespace BC7C {
|
||||
std::ostream *logStream);
|
||||
#endif
|
||||
|
||||
// Decompress the image given as BC7 data to R8G8B8A8 format. Width and Height
|
||||
// Decompress the image given as BPTC data to R8G8B8A8 format. Width and Height
|
||||
// are the dimensions of the image in pixels.
|
||||
void Decompress(const FasTC::DecompressionJob &);
|
||||
} // namespace BC7C
|
||||
} // namespace BPTCC
|
||||
|
||||
#endif // BPTCENCODER_INCLUDE_BC7COMPRESSOR_H_
|
||||
#endif // BPTCENCODER_INCLUDE_BPTCCOMPRESSOR_H_
|
||||
@ -1,5 +1,5 @@
|
||||
/* FasTC
|
||||
* Copyright (c) 2012 University of North Carolina at Chapel Hill.
|
||||
* Copyright (c) 2014 University of North Carolina at Chapel Hill.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software and its
|
||||
@ -73,13 +73,16 @@
|
||||
//
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
#ifndef BPTCENCODER_SRC_BC7COMPRESSIONMODE_H_
|
||||
#define BPTCENCODER_SRC_BC7COMPRESSIONMODE_H_
|
||||
#ifndef BPTCENCODER_SRC_BPTCCOMPRESSIONMODE_H_
|
||||
#define BPTCENCODER_SRC_BPTCCOMPRESSIONMODE_H_
|
||||
|
||||
#include "RGBAEndpoints.h"
|
||||
|
||||
// Forward Declarations
|
||||
class BitStream;
|
||||
|
||||
namespace BPTCC {
|
||||
|
||||
// Forward Declarations
|
||||
struct VisitedState;
|
||||
const int kMaxEndpoints = 3;
|
||||
|
||||
@ -90,7 +93,7 @@ static const int kPBits[4][2] = {
|
||||
{ 1, 1 }
|
||||
};
|
||||
|
||||
class BC7CompressionMode {
|
||||
class CompressionMode {
|
||||
|
||||
public:
|
||||
|
||||
@ -100,13 +103,13 @@ class BC7CompressionMode {
|
||||
// This initializes the compression variables used in order to compress a list
|
||||
// of clusters. We can increase the speed a tad by specifying whether or not
|
||||
// the block is opaque or not.
|
||||
explicit BC7CompressionMode(int mode, bool opaque = true)
|
||||
explicit CompressionMode(int mode, bool opaque = true)
|
||||
: m_IsOpaque(opaque)
|
||||
, m_Attributes(&(kModeAttributes[mode]))
|
||||
, m_RotateMode(0)
|
||||
, m_IndexMode(0)
|
||||
{ }
|
||||
~BC7CompressionMode() { }
|
||||
~CompressionMode() { }
|
||||
|
||||
// This function compresses a group of clusters into the passed bitstream. The
|
||||
// size of the clusters array is determined by the BC7 compression mode.
|
||||
@ -195,7 +198,7 @@ class BC7CompressionMode {
|
||||
|
||||
// This returns the proper error metric even if we have rotation bits set
|
||||
RGBAVector GetErrorMetric() const {
|
||||
const float *w = BC7C::GetErrorMetric();
|
||||
const float *w = BPTCC::GetErrorMetric();
|
||||
switch(GetRotationMode()) {
|
||||
default:
|
||||
case 0: return RGBAVector(w[0], w[1], w[2], w[3]);
|
||||
@ -307,6 +310,7 @@ class BC7CompressionMode {
|
||||
int &bestPBitCombo) const;
|
||||
};
|
||||
|
||||
extern const uint32 kBC7InterpolationValues[4][16][2];
|
||||
extern const uint32 kInterpolationValues[4][16][2];
|
||||
|
||||
#endif // BPTCENCODER_SRC_BC7COMPRESSIONMODE_H_
|
||||
} // namespace BPTCC {
|
||||
#endif // BPTCENCODER_SRC_BPTCCOMPRESSIONMODE_H_
|
||||
@ -73,8 +73,8 @@
|
||||
//
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
#include "BC7Compressor.h"
|
||||
#include "BC7CompressionMode.h"
|
||||
#include "BPTCCompressor.h"
|
||||
#include "CompressionMode.h"
|
||||
|
||||
#include "TexCompTypes.h"
|
||||
#include "BCLookupTables.h"
|
||||
@ -302,7 +302,9 @@ static void insert(T* buf, int bufSz, T newVal, int idx = 0) {
|
||||
template <typename T>
|
||||
static inline void swap(T &a, T &b) { T t = a; a = b; b = t; }
|
||||
|
||||
const uint32 kBC7InterpolationValues[4][16][2] = {
|
||||
namespace BPTCC {
|
||||
|
||||
const uint32 kInterpolationValues[4][16][2] = {
|
||||
{ {64, 0}, {33, 31}, {0, 64}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
|
||||
{0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0} },
|
||||
{ {64, 0}, {43, 21}, {21, 43}, {0, 64}, {0, 0}, {0, 0}, {0, 0}, {0, 0},
|
||||
@ -313,44 +315,44 @@ const uint32 kBC7InterpolationValues[4][16][2] = {
|
||||
{30, 34}, {26, 38}, {21, 43}, {17, 47}, {13, 51}, {9, 55}, {4, 60}, {0, 64}}
|
||||
};
|
||||
|
||||
int BC7CompressionMode::MaxAnnealingIterations = 50; // This is a setting.
|
||||
int CompressionMode::MaxAnnealingIterations = 50; // This is a setting.
|
||||
|
||||
BC7CompressionMode::Attributes
|
||||
BC7CompressionMode::kModeAttributes[kNumModes] = {
|
||||
CompressionMode::Attributes
|
||||
CompressionMode::kModeAttributes[kNumModes] = {
|
||||
// Mode 0
|
||||
{ 0, 4, 3, 3, 0, 4, 0,
|
||||
false, false, BC7CompressionMode::ePBitType_NotShared },
|
||||
false, false, CompressionMode::ePBitType_NotShared },
|
||||
|
||||
// Mode 1
|
||||
{ 1, 6, 2, 3, 0, 6, 0,
|
||||
false, false, BC7CompressionMode::ePBitType_Shared },
|
||||
false, false, CompressionMode::ePBitType_Shared },
|
||||
|
||||
// Mode 2
|
||||
{ 2, 6, 3, 2, 0, 5, 0,
|
||||
false, false, BC7CompressionMode::ePBitType_None },
|
||||
false, false, CompressionMode::ePBitType_None },
|
||||
|
||||
// Mode 3
|
||||
{ 3, 6, 2, 2, 0, 7, 0,
|
||||
false, false, BC7CompressionMode::ePBitType_NotShared },
|
||||
false, false, CompressionMode::ePBitType_NotShared },
|
||||
|
||||
// Mode 4
|
||||
{ 4, 0, 1, 2, 3, 5, 6,
|
||||
true, true, BC7CompressionMode::ePBitType_None },
|
||||
true, true, CompressionMode::ePBitType_None },
|
||||
|
||||
// Mode 5
|
||||
{ 5, 0, 1, 2, 2, 7, 8,
|
||||
true, false, BC7CompressionMode::ePBitType_None },
|
||||
true, false, CompressionMode::ePBitType_None },
|
||||
|
||||
// Mode 6
|
||||
{ 6, 0, 1, 4, 0, 7, 7,
|
||||
false, false, BC7CompressionMode::ePBitType_NotShared },
|
||||
false, false, CompressionMode::ePBitType_NotShared },
|
||||
|
||||
// Mode 7
|
||||
{ 7, 6, 2, 2, 0, 5, 5,
|
||||
false, false, BC7CompressionMode::ePBitType_NotShared },
|
||||
false, false, CompressionMode::ePBitType_NotShared },
|
||||
};
|
||||
|
||||
void BC7CompressionMode::ClampEndpointsToGrid(
|
||||
void CompressionMode::ClampEndpointsToGrid(
|
||||
RGBAVector &p1, RGBAVector &p2, int &bestPBitCombo
|
||||
) const {
|
||||
const int nPbitCombos = GetNumPbitCombos();
|
||||
@ -390,7 +392,7 @@ void BC7CompressionMode::ClampEndpointsToGrid(
|
||||
p2 = bp2;
|
||||
}
|
||||
|
||||
double BC7CompressionMode::CompressSingleColor(
|
||||
double CompressionMode::CompressSingleColor(
|
||||
const RGBAVector &p, RGBAVector &p1, RGBAVector &p2,
|
||||
int &bestPbitCombo
|
||||
) const {
|
||||
@ -449,8 +451,8 @@ double BC7CompressionMode::CompressSingleColor(
|
||||
}
|
||||
|
||||
const uint32 bpi = GetNumberOfBitsPerIndex() - 1;
|
||||
const uint32 interpVal0 = kBC7InterpolationValues[bpi][1][0];
|
||||
const uint32 interpVal1 = kBC7InterpolationValues[bpi][1][1];
|
||||
const uint32 interpVal0 = kInterpolationValues[bpi][1][0];
|
||||
const uint32 interpVal1 = kInterpolationValues[bpi][1][1];
|
||||
|
||||
// Find the closest interpolated val that to the given val...
|
||||
uint32 bestChannelDist = 0xFF;
|
||||
@ -473,7 +475,7 @@ double BC7CompressionMode::CompressSingleColor(
|
||||
dist[ci] = std::max(bestChannelDist, dist[ci]);
|
||||
}
|
||||
|
||||
const float *errorWeights = BC7C::GetErrorMetric();
|
||||
const float *errorWeights = BPTCC::GetErrorMetric();
|
||||
float error = 0.0;
|
||||
for(uint32 i = 0; i < kNumColorChannels; i++) {
|
||||
float e = static_cast<float>(dist[i]) * errorWeights[i];
|
||||
@ -565,7 +567,7 @@ struct VisitedState {
|
||||
int pBitCombo;
|
||||
};
|
||||
|
||||
void BC7CompressionMode::PickBestNeighboringEndpoints(
|
||||
void CompressionMode::PickBestNeighboringEndpoints(
|
||||
const RGBACluster &cluster,
|
||||
const RGBAVector &p1, const RGBAVector &p2, const int curPbitCombo,
|
||||
RGBAVector &np1, RGBAVector &np2, int &nPbitCombo,
|
||||
@ -645,9 +647,6 @@ void BC7CompressionMode::PickBestNeighboringEndpoints(
|
||||
// the bytes interpreted as a float. This prevents two things: 1, a
|
||||
// division, and 2, a cast from an integer to a float.
|
||||
|
||||
#define COMPILE_ASSERT(x) extern int __compile_assert_[static_cast<int>(x)];
|
||||
COMPILE_ASSERT(RAND_MAX == 0x7FFF)
|
||||
|
||||
static inline float frand() {
|
||||
// RAND_MAX is 0x7FFF, which offers 15 bits
|
||||
// of precision. Therefore, we move the bits
|
||||
@ -663,7 +662,10 @@ static inline float frand() {
|
||||
return fltUnion.flt - 1.0f;
|
||||
}
|
||||
|
||||
bool BC7CompressionMode::AcceptNewEndpointError(
|
||||
#define COMPILE_ASSERT(x) extern int __compile_assert_[static_cast<int>(x)];
|
||||
COMPILE_ASSERT(RAND_MAX == 0x7FFF)
|
||||
|
||||
bool CompressionMode::AcceptNewEndpointError(
|
||||
double newError, double oldError, float temp
|
||||
) const {
|
||||
// Always accept better endpoints.
|
||||
@ -677,7 +679,7 @@ bool BC7CompressionMode::AcceptNewEndpointError(
|
||||
return r < p;
|
||||
}
|
||||
|
||||
double BC7CompressionMode::OptimizeEndpointsForCluster(
|
||||
double CompressionMode::OptimizeEndpointsForCluster(
|
||||
const RGBACluster &cluster,
|
||||
RGBAVector &p1, RGBAVector &p2,
|
||||
int *bestIndices,
|
||||
@ -771,7 +773,7 @@ double BC7CompressionMode::OptimizeEndpointsForCluster(
|
||||
return bestError;
|
||||
}
|
||||
|
||||
double BC7CompressionMode::CompressCluster(
|
||||
double CompressionMode::CompressCluster(
|
||||
const RGBACluster &cluster,
|
||||
RGBAVector &p1, RGBAVector &p2,
|
||||
int *bestIndices,
|
||||
@ -851,7 +853,7 @@ double BC7CompressionMode::CompressCluster(
|
||||
typedef tInterpPair tInterpLevel[16];
|
||||
|
||||
const tInterpLevel *interpVals =
|
||||
kBC7InterpolationValues + (GetNumberOfBitsPerAlpha() - 1);
|
||||
kInterpolationValues + (GetNumberOfBitsPerAlpha() - 1);
|
||||
|
||||
const float weight = GetErrorMetric().a;
|
||||
|
||||
@ -1062,7 +1064,7 @@ double BC7CompressionMode::CompressCluster(
|
||||
return rgbError + alphaError;
|
||||
}
|
||||
|
||||
double BC7CompressionMode::CompressCluster(
|
||||
double CompressionMode::CompressCluster(
|
||||
const RGBACluster &cluster,
|
||||
RGBAVector &p1, RGBAVector &p2,
|
||||
int *bestIndices,
|
||||
@ -1244,7 +1246,7 @@ double BC7CompressionMode::CompressCluster(
|
||||
);
|
||||
}
|
||||
|
||||
double BC7CompressionMode::Compress(
|
||||
double CompressionMode::Compress(
|
||||
BitStream &stream, const int shapeIdx, const RGBACluster *clusters
|
||||
) {
|
||||
|
||||
@ -1519,19 +1521,18 @@ double BC7CompressionMode::Compress(
|
||||
return totalErr;
|
||||
}
|
||||
|
||||
namespace BC7C {
|
||||
static ErrorMetric gErrorMetric = eErrorMetric_Uniform;
|
||||
void SetErrorMetric(ErrorMetric e) { gErrorMetric = e; }
|
||||
static ErrorMetric gErrorMetric = eErrorMetric_Uniform;
|
||||
void SetErrorMetric(ErrorMetric e) { gErrorMetric = e; }
|
||||
|
||||
ALIGN_SSE const float kErrorMetrics[kNumErrorMetrics][kNumColorChannels] = {
|
||||
ALIGN_SSE const float kErrorMetrics[kNumErrorMetrics][kNumColorChannels] = {
|
||||
{ 1.0f, 1.0f, 1.0f, 1.0f },
|
||||
{ sqrtf(0.3f), sqrtf(0.56f), sqrtf(0.11f), 1.0f }
|
||||
};
|
||||
};
|
||||
|
||||
const float *GetErrorMetric() { return kErrorMetrics[GetErrorMetricEnum()]; }
|
||||
ErrorMetric GetErrorMetricEnum() { return gErrorMetric; }
|
||||
const float *GetErrorMetric() { return kErrorMetrics[GetErrorMetricEnum()]; }
|
||||
ErrorMetric GetErrorMetricEnum() { return gErrorMetric; }
|
||||
|
||||
class BlockLogger {
|
||||
class BlockLogger {
|
||||
public:
|
||||
BlockLogger(uint64 blockIdx, std::ostream &os)
|
||||
: m_BlockIdx(blockIdx), m_Stream(os) { }
|
||||
@ -1541,32 +1542,32 @@ namespace BC7C {
|
||||
|
||||
uint64 m_BlockIdx;
|
||||
std::ostream &m_Stream;
|
||||
};
|
||||
};
|
||||
|
||||
template<typename T>
|
||||
std::ostream &operator<<(const BlockLogger &bl, const T &v) {
|
||||
template<typename T>
|
||||
std::ostream &operator<<(const BlockLogger &bl, const T &v) {
|
||||
std::stringstream ss;
|
||||
ss << bl.m_BlockIdx << ": " << v;
|
||||
return bl.m_Stream << ss.str();
|
||||
}
|
||||
}
|
||||
|
||||
// Function prototypes
|
||||
static void CompressBC7Block(const uint32 *block, uint8 *outBuf);
|
||||
static void CompressBC7Block(
|
||||
// Function prototypes
|
||||
static void CompressBC7Block(const uint32 *block, uint8 *outBuf);
|
||||
static void CompressBC7Block(
|
||||
const uint32 *block, uint8 *outBuf, const BlockLogger &logStream
|
||||
);
|
||||
);
|
||||
|
||||
static int gQualityLevel = 50;
|
||||
void SetQualityLevel(int q) {
|
||||
static int gQualityLevel = 50;
|
||||
void SetQualityLevel(int q) {
|
||||
gQualityLevel = std::max(0, q);
|
||||
const int kMaxIters = BC7CompressionMode::kMaxAnnealingIterations;
|
||||
BC7CompressionMode::MaxAnnealingIterations =
|
||||
const int kMaxIters = CompressionMode::kMaxAnnealingIterations;
|
||||
CompressionMode::MaxAnnealingIterations =
|
||||
std::min(kMaxIters, GetQualityLevel());
|
||||
}
|
||||
int GetQualityLevel() { return gQualityLevel; }
|
||||
}
|
||||
int GetQualityLevel() { return gQualityLevel; }
|
||||
|
||||
// Returns true if the entire block is a single color.
|
||||
static bool AllOneColor(const uint32 block[16]) {
|
||||
// Returns true if the entire block is a single color.
|
||||
static bool AllOneColor(const uint32 block[16]) {
|
||||
const uint32 pixel = block[0];
|
||||
for(int i = 1; i < 16; i++) {
|
||||
if( block[i] != pixel )
|
||||
@ -1574,18 +1575,18 @@ namespace BC7C {
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
// Write out a transparent block.
|
||||
static void WriteTransparentBlock(BitStream &stream) {
|
||||
// Write out a transparent block.
|
||||
static void WriteTransparentBlock(BitStream &stream) {
|
||||
// Use mode 6
|
||||
stream.WriteBits(1 << 6, 7);
|
||||
stream.WriteBits(0, 128-7);
|
||||
assert(stream.GetBitsWritten() == 128);
|
||||
}
|
||||
}
|
||||
|
||||
// Compresses a single color optimally and outputs the result.
|
||||
static void CompressOptimalColorBC7(uint32 pixel, BitStream &stream) {
|
||||
// Compresses a single color optimally and outputs the result.
|
||||
static void CompressOptimalColorBC7(uint32 pixel, BitStream &stream) {
|
||||
|
||||
stream.WriteBits(1 << 5, 6); // Mode 5
|
||||
stream.WriteBits(0, 2); // No rotation bits.
|
||||
@ -1619,24 +1620,24 @@ namespace BC7C {
|
||||
|
||||
// Alpha indices...
|
||||
stream.WriteBits(kWMValues[gWMVal = (gWMVal+1) % kNumWMVals], 31);
|
||||
}
|
||||
}
|
||||
|
||||
static void DecompressBC7Block(const uint8 block[16], uint32 outBuf[16]);
|
||||
static void DecompressBC7Block(const uint8 block[16], uint32 outBuf[16]);
|
||||
|
||||
void GetBlock(const uint32 x, const uint32 y, const uint32 pixelsWide,
|
||||
void GetBlock(const uint32 x, const uint32 y, const uint32 pixelsWide,
|
||||
const uint32 *inPixels, uint32 block[16]) {
|
||||
memcpy(block, inPixels + y*pixelsWide + x, 4 * sizeof(uint32));
|
||||
memcpy(block + 4, inPixels + (y+1)*pixelsWide + x, 4 * sizeof(uint32));
|
||||
memcpy(block + 8, inPixels + (y+2)*pixelsWide + x, 4 * sizeof(uint32));
|
||||
memcpy(block + 12, inPixels + (y+3)*pixelsWide + x, 4 * sizeof(uint32));
|
||||
}
|
||||
}
|
||||
|
||||
// Compress an image using BC7 compression. Use the inBuf parameter to point
|
||||
// to an image in 4-byte RGBA format. The width and height parameters specify
|
||||
// the size of the image in pixels. The buffer pointed to by outBuf should be
|
||||
// large enough to store the compressed image. This implementation has an 4:1
|
||||
// compression ratio.
|
||||
void Compress(const FasTC::CompressionJob &cj) {
|
||||
// Compress an image using BC7 compression. Use the inBuf parameter to point
|
||||
// to an image in 4-byte RGBA format. The width and height parameters specify
|
||||
// the size of the image in pixels. The buffer pointed to by outBuf should be
|
||||
// large enough to store the compressed image. This implementation has an 4:1
|
||||
// compression ratio.
|
||||
void Compress(const FasTC::CompressionJob &cj) {
|
||||
const uint32 *inPixels = reinterpret_cast<const uint32 *>(cj.InBuf());
|
||||
const uint32 kBlockSz = GetBlockSize(FasTC::eCompressionFormat_BPTC);
|
||||
uint8 *outBuf = cj.OutBuf() + cj.CoordsToBlockIdx(cj.XStart(), cj.YStart()) * kBlockSz;
|
||||
@ -1681,29 +1682,29 @@ namespace BC7C {
|
||||
}
|
||||
startX = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef HAS_ATOMICS
|
||||
#ifdef HAS_MSVC_ATOMICS
|
||||
static uint32 TestAndSet(uint32 *x) {
|
||||
static uint32 TestAndSet(uint32 *x) {
|
||||
return InterlockedExchange(x, 1);
|
||||
}
|
||||
}
|
||||
|
||||
static uint32 FetchAndAdd(uint32 *x) {
|
||||
static uint32 FetchAndAdd(uint32 *x) {
|
||||
return InterlockedIncrement(x)-1;
|
||||
}
|
||||
}
|
||||
#elif defined HAS_GCC_ATOMICS
|
||||
static uint32 TestAndSet(uint32 *x) {
|
||||
static uint32 TestAndSet(uint32 *x) {
|
||||
return __sync_lock_test_and_set(x, 1);
|
||||
}
|
||||
}
|
||||
|
||||
static uint32 FetchAndAdd(uint32 *x) {
|
||||
static uint32 FetchAndAdd(uint32 *x) {
|
||||
return __sync_fetch_and_add(x, 1);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// Variables used for synchronization in threadsafe implementation.
|
||||
void CompressAtomic(FasTC::CompressionJobList &cjl) {
|
||||
// Variables used for synchronization in threadsafe implementation.
|
||||
void CompressAtomic(FasTC::CompressionJobList &cjl) {
|
||||
uint32 jobIdx;
|
||||
while((jobIdx = cjl.m_CurrentJobIndex) < cjl.GetNumJobs()) {
|
||||
// !HACK! ... Microsoft has this defined
|
||||
@ -1735,10 +1736,10 @@ namespace BC7C {
|
||||
// Wait until this texture finishes.
|
||||
while(cjl.m_CurrentJobIndex == jobIdx) { }
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif // HAS_ATOMICS
|
||||
|
||||
void CompressWithStats(const FasTC::CompressionJob &cj, std::ostream *logStream) {
|
||||
void CompressWithStats(const FasTC::CompressionJob &cj, std::ostream *logStream) {
|
||||
const uint32 *inPixels = reinterpret_cast<const uint32 *>(cj.InBuf());
|
||||
const uint32 kBlockSz = GetBlockSize(FasTC::eCompressionFormat_BPTC);
|
||||
uint8 *outBuf = cj.OutBuf() + cj.CoordsToBlockIdx(cj.XStart(), cj.YStart()) * kBlockSz;
|
||||
@ -1782,21 +1783,21 @@ namespace BC7C {
|
||||
|
||||
startX = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static double CompressTwoClusters(
|
||||
static double CompressTwoClusters(
|
||||
int shapeIdx,
|
||||
const RGBACluster *clusters,
|
||||
uint8 *outBuf,
|
||||
bool opaque,
|
||||
double *errors = NULL,
|
||||
int *modeChosen = NULL
|
||||
) {
|
||||
) {
|
||||
|
||||
uint8 tempBuf1[16];
|
||||
BitStream tmpStream1(tempBuf1, 128, 0);
|
||||
double bestError =
|
||||
BC7CompressionMode(1, opaque).Compress(tmpStream1, shapeIdx, clusters);
|
||||
CompressionMode(1, opaque).Compress(tmpStream1, shapeIdx, clusters);
|
||||
|
||||
if(errors) errors[1] = bestError;
|
||||
if(modeChosen) *modeChosen = 1;
|
||||
@ -1810,7 +1811,7 @@ namespace BC7C {
|
||||
BitStream tmpStream3(tempBuf3, 128, 0);
|
||||
|
||||
double error =
|
||||
BC7CompressionMode(3, opaque).Compress(tmpStream3, shapeIdx, clusters);
|
||||
CompressionMode(3, opaque).Compress(tmpStream3, shapeIdx, clusters);
|
||||
|
||||
if(errors) errors[3] = error;
|
||||
if(error < bestError) {
|
||||
@ -1829,7 +1830,7 @@ namespace BC7C {
|
||||
BitStream tmpStream7(tempBuf7, 128, 0);
|
||||
|
||||
error =
|
||||
BC7CompressionMode(7, opaque).Compress(tmpStream7, shapeIdx, clusters);
|
||||
CompressionMode(7, opaque).Compress(tmpStream7, shapeIdx, clusters);
|
||||
|
||||
if(errors) errors[7] = error;
|
||||
if(error < bestError) {
|
||||
@ -1840,16 +1841,16 @@ namespace BC7C {
|
||||
}
|
||||
|
||||
return bestError;
|
||||
}
|
||||
}
|
||||
|
||||
static double CompressThreeClusters(
|
||||
static double CompressThreeClusters(
|
||||
int shapeIdx,
|
||||
const RGBACluster *clusters,
|
||||
uint8 *outBuf,
|
||||
bool opaque,
|
||||
double *errors = NULL,
|
||||
int *modeChosen = NULL
|
||||
) {
|
||||
) {
|
||||
uint8 tempBuf0[16];
|
||||
BitStream tmpStream0(tempBuf0, 128, 0);
|
||||
|
||||
@ -1859,7 +1860,7 @@ namespace BC7C {
|
||||
double error, bestError = DBL_MAX;;
|
||||
if(shapeIdx < 16) {
|
||||
bestError =
|
||||
BC7CompressionMode(0, opaque).Compress(tmpStream0, shapeIdx, clusters);
|
||||
CompressionMode(0, opaque).Compress(tmpStream0, shapeIdx, clusters);
|
||||
|
||||
if(errors) errors[0] = bestError;
|
||||
} else {
|
||||
@ -1873,7 +1874,7 @@ namespace BC7C {
|
||||
}
|
||||
|
||||
error =
|
||||
BC7CompressionMode(2, opaque).Compress(tmpStream2, shapeIdx, clusters);
|
||||
CompressionMode(2, opaque).Compress(tmpStream2, shapeIdx, clusters);
|
||||
|
||||
if(errors) errors[2] = error;
|
||||
if(error < bestError) {
|
||||
@ -1883,11 +1884,11 @@ namespace BC7C {
|
||||
}
|
||||
|
||||
return bestError;
|
||||
}
|
||||
}
|
||||
|
||||
static void PopulateTwoClustersForShape(
|
||||
static void PopulateTwoClustersForShape(
|
||||
const RGBACluster &points, int shapeIdx, RGBACluster *clusters
|
||||
) {
|
||||
) {
|
||||
const uint16 shape = kShapeMask2[shapeIdx];
|
||||
for(uint32 pt = 0; pt < kMaxNumDataPoints; pt++) {
|
||||
|
||||
@ -1906,11 +1907,11 @@ namespace BC7C {
|
||||
assert((pbs1 ^ pbs2) == 0xFFFF);
|
||||
assert((shape & pbs2) == shape);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
static void PopulateThreeClustersForShape(
|
||||
static void PopulateThreeClustersForShape(
|
||||
const RGBACluster &points, int shapeIdx, RGBACluster *clusters
|
||||
) {
|
||||
) {
|
||||
for(uint32 pt = 0; pt < kMaxNumDataPoints; pt++) {
|
||||
|
||||
const RGBAVector &p = points.GetPoint(pt);
|
||||
@ -1935,9 +1936,9 @@ namespace BC7C {
|
||||
assert(!(pbs3 & pbs2));
|
||||
assert(!(pbs3 & pbs1));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
static double EstimateTwoClusterError(RGBACluster &c) {
|
||||
static double EstimateTwoClusterError(RGBACluster &c) {
|
||||
RGBAVector Min, Max, v;
|
||||
c.GetBoundingBox(Min, Max);
|
||||
v = Max - Min;
|
||||
@ -1945,7 +1946,7 @@ namespace BC7C {
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
const float *w = BC7C::GetErrorMetric();
|
||||
const float *w = BPTCC::GetErrorMetric();
|
||||
|
||||
double error = 0.0001;
|
||||
#ifdef USE_PCA_FOR_SHAPE_ESTIMATION
|
||||
@ -1961,9 +1962,9 @@ namespace BC7C {
|
||||
0xFFFFFFFF, RGBAVector(w[0], w[1], w[2], w[3]));
|
||||
#endif
|
||||
return error;
|
||||
}
|
||||
}
|
||||
|
||||
static double EstimateThreeClusterError(RGBACluster &c) {
|
||||
static double EstimateThreeClusterError(RGBACluster &c) {
|
||||
RGBAVector Min, Max, v;
|
||||
c.GetBoundingBox(Min, Max);
|
||||
v = Max - Min;
|
||||
@ -1971,7 +1972,7 @@ namespace BC7C {
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
const float *w = BC7C::GetErrorMetric();
|
||||
const float *w = BPTCC::GetErrorMetric();
|
||||
|
||||
double error = 0.0001;
|
||||
#ifdef USE_PCA_FOR_SHAPE_ESTIMATION
|
||||
@ -1988,9 +1989,9 @@ namespace BC7C {
|
||||
0xFFFFFFFF, RGBAVector(w[0], w[1], w[2], w[3]));
|
||||
#endif
|
||||
return error;
|
||||
}
|
||||
}
|
||||
|
||||
static void CompressBC7Block(const uint32 *block, uint8 *outBuf) {
|
||||
static void CompressBC7Block(const uint32 *block, uint8 *outBuf) {
|
||||
// All a single color?
|
||||
if(AllOneColor(block)) {
|
||||
BitStream bStrm(outBuf, 128, 0);
|
||||
@ -2080,7 +2081,7 @@ namespace BC7C {
|
||||
uint8 tempBuf1[16], tempBuf2[16];
|
||||
|
||||
BitStream tempStream1 (tempBuf1, 128, 0);
|
||||
BC7CompressionMode compressor(6, opaque);
|
||||
CompressionMode compressor(6, opaque);
|
||||
double best = compressor.Compress(tempStream1, 0, &blockCluster);
|
||||
if(best == 0.0f) {
|
||||
memcpy(outBuf, tempBuf1, 16);
|
||||
@ -2092,7 +2093,7 @@ namespace BC7C {
|
||||
for(int mode = 4; mode <= 5; mode++) {
|
||||
|
||||
BitStream tempStream2(tempBuf2, 128, 0);
|
||||
BC7CompressionMode compressorTry(mode, opaque);
|
||||
CompressionMode compressorTry(mode, opaque);
|
||||
|
||||
double error = compressorTry.Compress(tempStream2, 0, &blockCluster);
|
||||
if(error < best) {
|
||||
@ -2135,11 +2136,11 @@ namespace BC7C {
|
||||
}
|
||||
|
||||
memcpy(outBuf, tempBuf1, 16);
|
||||
}
|
||||
}
|
||||
|
||||
static double EstimateTwoClusterErrorStats(
|
||||
static double EstimateTwoClusterErrorStats(
|
||||
RGBACluster &c, double (&estimates)[2]
|
||||
) {
|
||||
) {
|
||||
RGBAVector Min, Max, v;
|
||||
c.GetBoundingBox(Min, Max);
|
||||
v = Max - Min;
|
||||
@ -2148,7 +2149,7 @@ namespace BC7C {
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
const float *w = BC7C::GetErrorMetric();
|
||||
const float *w = BPTCC::GetErrorMetric();
|
||||
|
||||
const double err1 = c.QuantizedError(
|
||||
Min, Max, 8, 0xFFFCFCFC, RGBAVector(w[0], w[1], w[2], w[3])
|
||||
@ -2183,11 +2184,11 @@ namespace BC7C {
|
||||
error += std::min(err1, err3);
|
||||
#endif
|
||||
return error;
|
||||
}
|
||||
}
|
||||
|
||||
static double EstimateThreeClusterErrorStats(
|
||||
static double EstimateThreeClusterErrorStats(
|
||||
RGBACluster &c, double (&estimates)[2]
|
||||
) {
|
||||
) {
|
||||
RGBAVector Min, Max, v;
|
||||
c.GetBoundingBox(Min, Max);
|
||||
v = Max - Min;
|
||||
@ -2196,7 +2197,7 @@ namespace BC7C {
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
const float *w = BC7C::GetErrorMetric();
|
||||
const float *w = BPTCC::GetErrorMetric();
|
||||
const double err0 = 0.0001 + c.QuantizedError(
|
||||
Min, Max, 4, 0xFFF0F0F0, RGBAVector(w[0], w[1], w[2], w[3])
|
||||
);
|
||||
@ -2231,28 +2232,28 @@ namespace BC7C {
|
||||
error += std::min(err0, err2);
|
||||
#endif
|
||||
return error;
|
||||
}
|
||||
}
|
||||
|
||||
static void UpdateErrorEstimate(double *estimates, uint32 mode, double est) {
|
||||
static void UpdateErrorEstimate(double *estimates, uint32 mode, double est) {
|
||||
assert(estimates);
|
||||
assert(mode >= 0);
|
||||
assert(mode < BC7CompressionMode::kNumModes);
|
||||
assert(mode < CompressionMode::kNumModes);
|
||||
if(estimates[mode] == -1.0 || est < estimates[mode]) {
|
||||
estimates[mode] = est;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
static void PrintStat(const BlockLogger &lgr, const char *stat, const T &v) {
|
||||
template<typename T>
|
||||
static void PrintStat(const BlockLogger &lgr, const char *stat, const T &v) {
|
||||
std::stringstream ss;
|
||||
ss << stat << " -- " << v << std::endl;
|
||||
lgr << ss.str();
|
||||
}
|
||||
}
|
||||
|
||||
// Compress a single block but collect statistics as well...
|
||||
static void CompressBC7Block(
|
||||
// Compress a single block but collect statistics as well...
|
||||
static void CompressBC7Block(
|
||||
const uint32 *block, uint8 *outBuf, const BlockLogger &logStream
|
||||
) {
|
||||
) {
|
||||
|
||||
class RAIIStatSaver {
|
||||
private:
|
||||
@ -2278,7 +2279,7 @@ namespace BC7C {
|
||||
|
||||
PrintStat(m_Logger, kBlockStatString[eBlockStat_Mode], *m_ModePtr);
|
||||
|
||||
for(uint32 i = 0; i < BC7CompressionMode::kNumModes; i++) {
|
||||
for(uint32 i = 0; i < CompressionMode::kNumModes; i++) {
|
||||
|
||||
PrintStat(m_Logger,
|
||||
kBlockStatString[eBlockStat_ModeZeroEstimate + i],
|
||||
@ -2291,12 +2292,12 @@ namespace BC7C {
|
||||
};
|
||||
|
||||
int bestMode = 0;
|
||||
double modeEstimate[BC7CompressionMode::kNumModes];
|
||||
double modeError[BC7CompressionMode::kNumModes];
|
||||
double modeEstimate[CompressionMode::kNumModes];
|
||||
double modeError[CompressionMode::kNumModes];
|
||||
|
||||
// reset global variables...
|
||||
bestMode = 0;
|
||||
for(uint32 i = 0; i < BC7CompressionMode::kNumModes; i++) {
|
||||
for(uint32 i = 0; i < CompressionMode::kNumModes; i++) {
|
||||
modeError[i] = modeEstimate[i] = -1.0;
|
||||
}
|
||||
|
||||
@ -2506,7 +2507,7 @@ namespace BC7C {
|
||||
uint8 tempBuf1[16], tempBuf2[16];
|
||||
|
||||
BitStream tempStream1 (tempBuf1, 128, 0);
|
||||
BC7CompressionMode compressor(6, opaque);
|
||||
CompressionMode compressor(6, opaque);
|
||||
double best = compressor.Compress(tempStream1, 0, &blockCluster);
|
||||
modeError[6] = best;
|
||||
bestMode = 6;
|
||||
@ -2520,7 +2521,7 @@ namespace BC7C {
|
||||
for(int mode = 4; mode <= 5; mode++) {
|
||||
|
||||
BitStream tempStream2(tempBuf2, 128, 0);
|
||||
BC7CompressionMode compressorTry(mode, opaque);
|
||||
CompressionMode compressorTry(mode, opaque);
|
||||
|
||||
double error = compressorTry.Compress(tempStream2, 0, &blockCluster);
|
||||
if(error < best) {
|
||||
@ -2569,9 +2570,9 @@ namespace BC7C {
|
||||
}
|
||||
|
||||
memcpy(outBuf, tempBuf1, 16);
|
||||
}
|
||||
}
|
||||
|
||||
static void DecompressBC7Block(const uint8 block[16], uint32 outBuf[16]) {
|
||||
static void DecompressBC7Block(const uint8 block[16], uint32 outBuf[16]) {
|
||||
|
||||
BitStreamReadOnly strm(block);
|
||||
|
||||
@ -2580,8 +2581,8 @@ namespace BC7C {
|
||||
mode++;
|
||||
}
|
||||
|
||||
const BC7CompressionMode::Attributes *attrs =
|
||||
BC7CompressionMode::GetAttributesForMode(mode);
|
||||
const CompressionMode::Attributes *attrs =
|
||||
CompressionMode::GetAttributesForMode(mode);
|
||||
const uint32 nSubsets = attrs->numSubsets;
|
||||
|
||||
uint32 idxMode = 0;
|
||||
@ -2624,11 +2625,11 @@ namespace BC7C {
|
||||
|
||||
// Handle pbits
|
||||
switch(attrs->pbitType) {
|
||||
case BC7CompressionMode::ePBitType_None:
|
||||
case CompressionMode::ePBitType_None:
|
||||
// Do nothing.
|
||||
break;
|
||||
|
||||
case BC7CompressionMode::ePBitType_Shared:
|
||||
case CompressionMode::ePBitType_Shared:
|
||||
|
||||
cp += 1;
|
||||
ap += 1;
|
||||
@ -2645,7 +2646,7 @@ namespace BC7C {
|
||||
}
|
||||
break;
|
||||
|
||||
case BC7CompressionMode::ePBitType_NotShared:
|
||||
case CompressionMode::ePBitType_NotShared:
|
||||
|
||||
cp += 1;
|
||||
ap += 1;
|
||||
@ -2728,9 +2729,9 @@ namespace BC7C {
|
||||
for(int ch = 0; ch < 4; ch++) {
|
||||
if(ch == 3 && nBitsPerAlpha > 0) {
|
||||
uint32 i0 =
|
||||
kBC7InterpolationValues[nBitsPerAlpha - 1][alphaIndices[i]][0];
|
||||
kInterpolationValues[nBitsPerAlpha - 1][alphaIndices[i]][0];
|
||||
uint32 i1 =
|
||||
kBC7InterpolationValues[nBitsPerAlpha - 1][alphaIndices[i]][1];
|
||||
kInterpolationValues[nBitsPerAlpha - 1][alphaIndices[i]][1];
|
||||
|
||||
const uint32 ep1 = static_cast<uint32>(eps[subset][0][3]);
|
||||
const uint32 ep2 = static_cast<uint32>(eps[subset][1][3]);
|
||||
@ -2739,9 +2740,9 @@ namespace BC7C {
|
||||
|
||||
} else {
|
||||
uint32 i0 =
|
||||
kBC7InterpolationValues[nBitsPerColor - 1][colorIndices[i]][0];
|
||||
kInterpolationValues[nBitsPerColor - 1][colorIndices[i]][0];
|
||||
uint32 i1 =
|
||||
kBC7InterpolationValues[nBitsPerColor - 1][colorIndices[i]][1];
|
||||
kInterpolationValues[nBitsPerColor - 1][colorIndices[i]][1];
|
||||
|
||||
const uint32 ep1 = static_cast<uint32>(eps[subset][0][ch]);
|
||||
const uint32 ep2 = static_cast<uint32>(eps[subset][1][ch]);
|
||||
@ -2771,10 +2772,10 @@ namespace BC7C {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Convert the image from a BC7 buffer to a RGBA8 buffer
|
||||
void Decompress(const FasTC::DecompressionJob &dj) {
|
||||
// Convert the image from a BC7 buffer to a RGBA8 buffer
|
||||
void Decompress(const FasTC::DecompressionJob &dj) {
|
||||
|
||||
const uint8 *inBuf = dj.InBuf();
|
||||
uint32 *outBuf = reinterpret_cast<uint32 *>(dj.OutBuf());
|
||||
@ -2793,5 +2794,6 @@ namespace BC7C {
|
||||
inBuf += 16;
|
||||
}
|
||||
}
|
||||
}
|
||||
} // namespace BC7C
|
||||
}
|
||||
|
||||
} // namespace BPTCC
|
||||
@ -47,7 +47,7 @@
|
||||
#include <string.h>
|
||||
|
||||
/*
|
||||
const BC7ParallelStage stage;
|
||||
const BPTCParallelStage stage;
|
||||
|
||||
// This is the stream of data that will be used to read the block data.
|
||||
const unsigned char *const m_InBuf;
|
||||
@ -65,7 +65,7 @@
|
||||
uint32 m_NumBlocks;
|
||||
*/
|
||||
ParallelStage::ParallelStage(
|
||||
BC7ParallelStage stage,
|
||||
BPTCParallelStage stage,
|
||||
const unsigned char *inbuf,
|
||||
unsigned char *outbuf,
|
||||
uint32 numBlocks,
|
||||
|
||||
@ -1,30 +1,39 @@
|
||||
/* FasTC
|
||||
* Copyright (c) 2012 University of North Carolina at Chapel Hill. All rights reserved.
|
||||
* Copyright (c) 2014 University of North Carolina at Chapel Hill.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software and its documentation for educational,
|
||||
* research, and non-profit purposes, without fee, and without a written agreement is hereby granted,
|
||||
* provided that the above copyright notice, this paragraph, and the following four paragraphs appear
|
||||
* in all copies.
|
||||
* Permission to use, copy, modify, and distribute this software and its
|
||||
* documentation for educational, research, and non-profit purposes, without
|
||||
* fee, and without a written agreement is hereby granted, provided that the
|
||||
* above copyright notice, this paragraph, and the following four paragraphs
|
||||
* appear in all copies.
|
||||
*
|
||||
* Permission to incorporate this software into commercial products may be obtained by contacting the
|
||||
* authors or the Office of Technology Development at the University of North Carolina at Chapel Hill <otd@unc.edu>.
|
||||
* Permission to incorporate this software into commercial products may be
|
||||
* obtained by contacting the authors or the Office of Technology Development
|
||||
* at the University of North Carolina at Chapel Hill <otd@unc.edu>.
|
||||
*
|
||||
* This software program and documentation are copyrighted by the University of North Carolina at Chapel Hill.
|
||||
* The software program and documentation are supplied "as is," without any accompanying services from the
|
||||
* University of North Carolina at Chapel Hill or the authors. The University of North Carolina at Chapel Hill
|
||||
* and the authors do not warrant that the operation of the program will be uninterrupted or error-free. The
|
||||
* end-user understands that the program was developed for research purposes and is advised not to rely
|
||||
* exclusively on the program for any reason.
|
||||
* This software program and documentation are copyrighted by the University of
|
||||
* North Carolina at Chapel Hill. The software program and documentation are
|
||||
* supplied "as is," without any accompanying services from the University of
|
||||
* North Carolina at Chapel Hill or the authors. The University of North
|
||||
* Carolina at Chapel Hill and the authors do not warrant that the operation of
|
||||
* the program will be uninterrupted or error-free. The end-user understands
|
||||
* that the program was developed for research purposes and is advised not to
|
||||
* rely exclusively on the program for any reason.
|
||||
*
|
||||
* IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE AUTHORS BE LIABLE TO ANY PARTY FOR
|
||||
* DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE
|
||||
* USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE
|
||||
* AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
* IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE
|
||||
* AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL,
|
||||
* OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF
|
||||
* THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA
|
||||
* AT CHAPEL HILL OR THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
*
|
||||
* THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING,
|
||||
* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY
|
||||
* STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY
|
||||
* OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
|
||||
* THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY
|
||||
* DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY
|
||||
* STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON
|
||||
* AN "AS IS" BASIS, AND THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND
|
||||
* THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
|
||||
* ENHANCEMENTS, OR MODIFICATIONS.
|
||||
*
|
||||
* Please send all BUG REPORTS to <pavel@cs.unc.edu>.
|
||||
@ -43,7 +52,7 @@
|
||||
|
||||
#include "TexCompTypes.h"
|
||||
|
||||
enum BC7ParallelStage {
|
||||
enum BPTCParallelStage {
|
||||
eParallelStage_Uniform,
|
||||
eParallelStage_Partitioned,
|
||||
eParallelStage_Normal,
|
||||
@ -54,7 +63,7 @@ enum BC7ParallelStage {
|
||||
class ParallelStage {
|
||||
public:
|
||||
ParallelStage(
|
||||
BC7ParallelStage stage,
|
||||
BPTCParallelStage stage,
|
||||
const unsigned char *inbuf,
|
||||
unsigned char *outbuf,
|
||||
uint32 numBlocks,
|
||||
@ -66,7 +75,7 @@ class ParallelStage {
|
||||
|
||||
~ParallelStage();
|
||||
|
||||
const BC7ParallelStage m_Stage;
|
||||
const BPTCParallelStage m_Stage;
|
||||
|
||||
// Adds the block number to the list of blocks for this parallel stage
|
||||
void AddBlock(uint32 blockNum);
|
||||
|
||||
@ -1,30 +1,39 @@
|
||||
/* FasTC
|
||||
* Copyright (c) 2012 University of North Carolina at Chapel Hill. All rights reserved.
|
||||
* Copyright (c) 2014 University of North Carolina at Chapel Hill.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software and its documentation for educational,
|
||||
* research, and non-profit purposes, without fee, and without a written agreement is hereby granted,
|
||||
* provided that the above copyright notice, this paragraph, and the following four paragraphs appear
|
||||
* in all copies.
|
||||
* Permission to use, copy, modify, and distribute this software and its
|
||||
* documentation for educational, research, and non-profit purposes, without
|
||||
* fee, and without a written agreement is hereby granted, provided that the
|
||||
* above copyright notice, this paragraph, and the following four paragraphs
|
||||
* appear in all copies.
|
||||
*
|
||||
* Permission to incorporate this software into commercial products may be obtained by contacting the
|
||||
* authors or the Office of Technology Development at the University of North Carolina at Chapel Hill <otd@unc.edu>.
|
||||
* Permission to incorporate this software into commercial products may be
|
||||
* obtained by contacting the authors or the Office of Technology Development
|
||||
* at the University of North Carolina at Chapel Hill <otd@unc.edu>.
|
||||
*
|
||||
* This software program and documentation are copyrighted by the University of North Carolina at Chapel Hill.
|
||||
* The software program and documentation are supplied "as is," without any accompanying services from the
|
||||
* University of North Carolina at Chapel Hill or the authors. The University of North Carolina at Chapel Hill
|
||||
* and the authors do not warrant that the operation of the program will be uninterrupted or error-free. The
|
||||
* end-user understands that the program was developed for research purposes and is advised not to rely
|
||||
* exclusively on the program for any reason.
|
||||
* This software program and documentation are copyrighted by the University of
|
||||
* North Carolina at Chapel Hill. The software program and documentation are
|
||||
* supplied "as is," without any accompanying services from the University of
|
||||
* North Carolina at Chapel Hill or the authors. The University of North
|
||||
* Carolina at Chapel Hill and the authors do not warrant that the operation of
|
||||
* the program will be uninterrupted or error-free. The end-user understands
|
||||
* that the program was developed for research purposes and is advised not to
|
||||
* rely exclusively on the program for any reason.
|
||||
*
|
||||
* IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE AUTHORS BE LIABLE TO ANY PARTY FOR
|
||||
* DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE
|
||||
* USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE
|
||||
* AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
* IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE
|
||||
* AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL,
|
||||
* OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF
|
||||
* THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA
|
||||
* AT CHAPEL HILL OR THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
*
|
||||
* THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING,
|
||||
* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY
|
||||
* STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY
|
||||
* OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
|
||||
* THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY
|
||||
* DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY
|
||||
* STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON
|
||||
* AN "AS IS" BASIS, AND THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND
|
||||
* THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
|
||||
* ENHANCEMENTS, OR MODIFICATIONS.
|
||||
*
|
||||
* Please send all BUG REPORTS to <pavel@cs.unc.edu>.
|
||||
@ -46,27 +55,28 @@
|
||||
//
|
||||
// This code has been modified significantly from the original.
|
||||
|
||||
//--------------------------------------------------------------------------------------
|
||||
//------------------------------------------------------------------------------
|
||||
// Copyright 2011 Intel Corporation
|
||||
// All Rights Reserved
|
||||
//
|
||||
// Permission is granted to use, copy, distribute and prepare derivative works of this
|
||||
// software for any purpose and without fee, provided, that the above copyright notice
|
||||
// and this statement appear in all copies. Intel makes no representations about the
|
||||
// suitability of this software for any purpose. THIS SOFTWARE IS PROVIDED "AS IS."
|
||||
// INTEL SPECIFICALLY DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, AND ALL LIABILITY,
|
||||
// INCLUDING CONSEQUENTIAL AND OTHER INDIRECT DAMAGES, FOR THE USE OF THIS SOFTWARE,
|
||||
// INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PROPRIETARY RIGHTS, AND INCLUDING THE
|
||||
// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Intel does not
|
||||
// assume any responsibility for any errors which may appear in this software nor any
|
||||
// Permission is granted to use, copy, distribute and prepare derivative works
|
||||
// of this software for any purpose and without fee, provided, that the above
|
||||
// copyright notice and this statement appear in all copies. Intel makes no
|
||||
// representations about the suitability of this software for any purpose. THIS
|
||||
// SOFTWARE IS PROVIDED "AS IS." INTEL SPECIFICALLY DISCLAIMS ALL WARRANTIES,
|
||||
// EXPRESS OR IMPLIED, AND ALL LIABILITY, INCLUDING CONSEQUENTIAL AND OTHER
|
||||
// INDIRECT DAMAGES, FOR THE USE OF THIS SOFTWARE, INCLUDING LIABILITY FOR
|
||||
// INFRINGEMENT OF ANY PROPRIETARY RIGHTS, AND INCLUDING THE WARRANTIES OF
|
||||
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. Intel does not assume
|
||||
// any responsibility for any errors which may appear in this software nor any
|
||||
// responsibility to update it.
|
||||
//
|
||||
//--------------------------------------------------------------------------------------
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
#include "BC7Config.h"
|
||||
#include "BPTCConfig.h"
|
||||
#include "RGBAEndpoints.h"
|
||||
#include "BC7Compressor.h"
|
||||
#include "BC7CompressionMode.h"
|
||||
#include "BPTCCompressor.h"
|
||||
#include "CompressionMode.h"
|
||||
|
||||
#include <cassert>
|
||||
#include <cstdlib>
|
||||
@ -406,7 +416,11 @@ uint32 RGBACluster::GetPowerMethodIterations() {
|
||||
return m_PowerMethodIterations;
|
||||
}
|
||||
|
||||
double RGBACluster::QuantizedError(const RGBAVector &p1, const RGBAVector &p2, uint8 nBuckets, uint32 bitMask, const RGBAVector &errorMetricVec, const int pbits[2], int *indices) const {
|
||||
double RGBACluster::QuantizedError(
|
||||
const RGBAVector &p1, const RGBAVector &p2,
|
||||
uint8 nBuckets, uint32 bitMask, const RGBAVector &errorMetricVec,
|
||||
const int pbits[2], int *indices
|
||||
) const {
|
||||
|
||||
// nBuckets should be a power of two.
|
||||
assert(nBuckets == 3 || !(nBuckets & (nBuckets - 1)));
|
||||
@ -415,7 +429,9 @@ double RGBACluster::QuantizedError(const RGBAVector &p1, const RGBAVector &p2, u
|
||||
|
||||
typedef uint32 tInterpPair[2];
|
||||
typedef tInterpPair tInterpLevel[16];
|
||||
const tInterpLevel *interpVals = (nBuckets == 3)? kBC7InterpolationValues : kBC7InterpolationValues + (indexPrec - 1);
|
||||
const tInterpLevel *interpVals =
|
||||
(nBuckets == 3)? BPTCC::kInterpolationValues
|
||||
: BPTCC::kInterpolationValues + (indexPrec - 1);
|
||||
|
||||
assert(indexPrec >= 2 && indexPrec <= 4);
|
||||
|
||||
|
||||
@ -1,30 +1,39 @@
|
||||
/* FasTC
|
||||
* Copyright (c) 2012 University of North Carolina at Chapel Hill. All rights reserved.
|
||||
* Copyright (c) 2014 University of North Carolina at Chapel Hill.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software and its documentation for educational,
|
||||
* research, and non-profit purposes, without fee, and without a written agreement is hereby granted,
|
||||
* provided that the above copyright notice, this paragraph, and the following four paragraphs appear
|
||||
* in all copies.
|
||||
* Permission to use, copy, modify, and distribute this software and its
|
||||
* documentation for educational, research, and non-profit purposes, without
|
||||
* fee, and without a written agreement is hereby granted, provided that the
|
||||
* above copyright notice, this paragraph, and the following four paragraphs
|
||||
* appear in all copies.
|
||||
*
|
||||
* Permission to incorporate this software into commercial products may be obtained by contacting the
|
||||
* authors or the Office of Technology Development at the University of North Carolina at Chapel Hill <otd@unc.edu>.
|
||||
* Permission to incorporate this software into commercial products may be
|
||||
* obtained by contacting the authors or the Office of Technology Development
|
||||
* at the University of North Carolina at Chapel Hill <otd@unc.edu>.
|
||||
*
|
||||
* This software program and documentation are copyrighted by the University of North Carolina at Chapel Hill.
|
||||
* The software program and documentation are supplied "as is," without any accompanying services from the
|
||||
* University of North Carolina at Chapel Hill or the authors. The University of North Carolina at Chapel Hill
|
||||
* and the authors do not warrant that the operation of the program will be uninterrupted or error-free. The
|
||||
* end-user understands that the program was developed for research purposes and is advised not to rely
|
||||
* exclusively on the program for any reason.
|
||||
* This software program and documentation are copyrighted by the University of
|
||||
* North Carolina at Chapel Hill. The software program and documentation are
|
||||
* supplied "as is," without any accompanying services from the University of
|
||||
* North Carolina at Chapel Hill or the authors. The University of North
|
||||
* Carolina at Chapel Hill and the authors do not warrant that the operation of
|
||||
* the program will be uninterrupted or error-free. The end-user understands
|
||||
* that the program was developed for research purposes and is advised not to
|
||||
* rely exclusively on the program for any reason.
|
||||
*
|
||||
* IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE AUTHORS BE LIABLE TO ANY PARTY FOR
|
||||
* DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE
|
||||
* USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE
|
||||
* AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
* IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE
|
||||
* AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL,
|
||||
* OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF
|
||||
* THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA
|
||||
* AT CHAPEL HILL OR THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
*
|
||||
* THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING,
|
||||
* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY
|
||||
* STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY
|
||||
* OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
|
||||
* THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY
|
||||
* DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY
|
||||
* STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON
|
||||
* AN "AS IS" BASIS, AND THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND
|
||||
* THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
|
||||
* ENHANCEMENTS, OR MODIFICATIONS.
|
||||
*
|
||||
* Please send all BUG REPORTS to <pavel@cs.unc.edu>.
|
||||
@ -58,7 +67,7 @@ namespace FasTC {
|
||||
|
||||
// This structure defines a compression job. Here, width and height are the dimensions
|
||||
// of the image in pixels. inBuf contains the R8G8B8A8 data that is to be compressed, and
|
||||
// outBuf will contain the compressed BC7 data.
|
||||
// outBuf will contain the compressed BPTC data.
|
||||
//
|
||||
// Implicit sizes:
|
||||
// inBuf - (width * height * 4) bytes
|
||||
@ -165,8 +174,8 @@ namespace FasTC {
|
||||
}
|
||||
};
|
||||
|
||||
// This struct mirrors that for a compression job, but is used to decompress a BC7 stream. Here, inBuf
|
||||
// is a buffer of BC7 data, and outBuf is the destination where we will copy the decompressed R8G8B8A8 data
|
||||
// This struct mirrors that for a compression job, but is used to decompress a BPTC stream. Here, inBuf
|
||||
// is a buffer of BPTC data, and outBuf is the destination where we will copy the decompressed R8G8B8A8 data
|
||||
class DecompressionJob {
|
||||
private:
|
||||
const ECompressionFormat m_Format;
|
||||
|
||||
@ -341,7 +341,7 @@ int main(int argc, char **argv) {
|
||||
if(decompressedOutput[0] != '\0') {
|
||||
memcpy(basename, decompressedOutput, 256);
|
||||
} else if(format == FasTC::eCompressionFormat_BPTC) {
|
||||
strcat(basename, "-bc7.png");
|
||||
strcat(basename, "-bptc.png");
|
||||
} else if(format == FasTC::eCompressionFormat_PVRTC) {
|
||||
strcat(basename, "-pvrtc.png");
|
||||
} else if(format == FasTC::eCompressionFormat_DXT1) {
|
||||
|
||||
@ -1,30 +1,39 @@
|
||||
# FasTC
|
||||
# Copyright (c) 2012 University of North Carolina at Chapel Hill. All rights reserved.
|
||||
# Copyright (c) 2014 University of North Carolina at Chapel Hill.
|
||||
# All rights reserved.
|
||||
#
|
||||
# Permission to use, copy, modify, and distribute this software and its documentation for educational,
|
||||
# research, and non-profit purposes, without fee, and without a written agreement is hereby granted,
|
||||
# provided that the above copyright notice, this paragraph, and the following four paragraphs appear
|
||||
# in all copies.
|
||||
# Permission to use, copy, modify, and distribute this software and its
|
||||
# documentation for educational, research, and non-profit purposes, without
|
||||
# fee, and without a written agreement is hereby granted, provided that the
|
||||
# above copyright notice, this paragraph, and the following four paragraphs
|
||||
# appear in all copies.
|
||||
#
|
||||
# Permission to incorporate this software into commercial products may be obtained by contacting the
|
||||
# authors or the Office of Technology Development at the University of North Carolina at Chapel Hill <otd@unc.edu>.
|
||||
# Permission to incorporate this software into commercial products may be
|
||||
# obtained by contacting the authors or the Office of Technology Development
|
||||
# at the University of North Carolina at Chapel Hill <otd@unc.edu>.
|
||||
#
|
||||
# This software program and documentation are copyrighted by the University of North Carolina at Chapel Hill.
|
||||
# The software program and documentation are supplied "as is," without any accompanying services from the
|
||||
# University of North Carolina at Chapel Hill or the authors. The University of North Carolina at Chapel Hill
|
||||
# and the authors do not warrant that the operation of the program will be uninterrupted or error-free. The
|
||||
# end-user understands that the program was developed for research purposes and is advised not to rely
|
||||
# exclusively on the program for any reason.
|
||||
# This software program and documentation are copyrighted by the University of
|
||||
# North Carolina at Chapel Hill. The software program and documentation are
|
||||
# supplied "as is," without any accompanying services from the University of
|
||||
# North Carolina at Chapel Hill or the authors. The University of North
|
||||
# Carolina at Chapel Hill and the authors do not warrant that the operation of
|
||||
# the program will be uninterrupted or error-free. The end-user understands
|
||||
# that the program was developed for research purposes and is advised not to
|
||||
# rely exclusively on the program for any reason.
|
||||
#
|
||||
# IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE AUTHORS BE LIABLE TO ANY PARTY FOR
|
||||
# DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE
|
||||
# USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE
|
||||
# AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
# IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE
|
||||
# AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL,
|
||||
# OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF
|
||||
# THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA
|
||||
# AT CHAPEL HILL OR THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||
# DAMAGE.
|
||||
#
|
||||
# THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING,
|
||||
# BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY
|
||||
# STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY
|
||||
# OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
|
||||
# THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY
|
||||
# DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY
|
||||
# STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON
|
||||
# AN "AS IS" BASIS, AND THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND
|
||||
# THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
|
||||
# ENHANCEMENTS, OR MODIFICATIONS.
|
||||
#
|
||||
# Please send all BUG REPORTS to <pavel@cs.unc.edu>.
|
||||
|
||||
@ -1,30 +1,39 @@
|
||||
/* FasTC
|
||||
* Copyright (c) 2012 University of North Carolina at Chapel Hill. All rights reserved.
|
||||
* Copyright (c) 2014 University of North Carolina at Chapel Hill.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software and its documentation for educational,
|
||||
* research, and non-profit purposes, without fee, and without a written agreement is hereby granted,
|
||||
* provided that the above copyright notice, this paragraph, and the following four paragraphs appear
|
||||
* in all copies.
|
||||
* Permission to use, copy, modify, and distribute this software and its
|
||||
* documentation for educational, research, and non-profit purposes, without
|
||||
* fee, and without a written agreement is hereby granted, provided that the
|
||||
* above copyright notice, this paragraph, and the following four paragraphs
|
||||
* appear in all copies.
|
||||
*
|
||||
* Permission to incorporate this software into commercial products may be obtained by contacting the
|
||||
* authors or the Office of Technology Development at the University of North Carolina at Chapel Hill <otd@unc.edu>.
|
||||
* Permission to incorporate this software into commercial products may be
|
||||
* obtained by contacting the authors or the Office of Technology Development
|
||||
* at the University of North Carolina at Chapel Hill <otd@unc.edu>.
|
||||
*
|
||||
* This software program and documentation are copyrighted by the University of North Carolina at Chapel Hill.
|
||||
* The software program and documentation are supplied "as is," without any accompanying services from the
|
||||
* University of North Carolina at Chapel Hill or the authors. The University of North Carolina at Chapel Hill
|
||||
* and the authors do not warrant that the operation of the program will be uninterrupted or error-free. The
|
||||
* end-user understands that the program was developed for research purposes and is advised not to rely
|
||||
* exclusively on the program for any reason.
|
||||
* This software program and documentation are copyrighted by the University of
|
||||
* North Carolina at Chapel Hill. The software program and documentation are
|
||||
* supplied "as is," without any accompanying services from the University of
|
||||
* North Carolina at Chapel Hill or the authors. The University of North
|
||||
* Carolina at Chapel Hill and the authors do not warrant that the operation of
|
||||
* the program will be uninterrupted or error-free. The end-user understands
|
||||
* that the program was developed for research purposes and is advised not to
|
||||
* rely exclusively on the program for any reason.
|
||||
*
|
||||
* IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE AUTHORS BE LIABLE TO ANY PARTY FOR
|
||||
* DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE
|
||||
* USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE
|
||||
* AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
* IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE
|
||||
* AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL,
|
||||
* OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF
|
||||
* THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA
|
||||
* AT CHAPEL HILL OR THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
*
|
||||
* THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING,
|
||||
* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY
|
||||
* STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY
|
||||
* OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
|
||||
* THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY
|
||||
* DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY
|
||||
* STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON
|
||||
* AN "AS IS" BASIS, AND THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND
|
||||
* THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
|
||||
* ENHANCEMENTS, OR MODIFICATIONS.
|
||||
*
|
||||
* Please send all BUG REPORTS to <pavel@cs.unc.edu>.
|
||||
@ -51,7 +60,7 @@
|
||||
#include "Pixel.h"
|
||||
|
||||
#include "TexCompTypes.h"
|
||||
#include "BC7Compressor.h"
|
||||
#include "BPTCCompressor.h"
|
||||
#include "PVRTCCompressor.h"
|
||||
#include "DXTCompressor.h"
|
||||
#include "ETCCompressor.h"
|
||||
@ -135,7 +144,7 @@ bool CompressedImage::DecompressImage(unsigned char *outBuf, unsigned int outBuf
|
||||
|
||||
case FasTC::eCompressionFormat_BPTC:
|
||||
{
|
||||
BC7C::Decompress(dj);
|
||||
BPTCC::Decompress(dj);
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@
|
||||
|
||||
#include "ETCCompressor.h"
|
||||
#include "DXTCompressor.h"
|
||||
#include "BC7Compressor.h"
|
||||
#include "BPTCCompressor.h"
|
||||
#include "CompressionFuncs.h"
|
||||
#include "Image.h"
|
||||
#include "ImageFile.h"
|
||||
@ -104,12 +104,12 @@ static CompressionFuncWithStats ChooseFuncFromSettingsWithStats(const SCompress
|
||||
|
||||
case FasTC::eCompressionFormat_BPTC:
|
||||
{
|
||||
#ifdef FOUND_NVTT_BC7_EXPORT
|
||||
#ifdef FOUND_NVTT_BPTC_EXPORT
|
||||
if(s.bUseNVTT)
|
||||
return BC7C::CompressNVTTWithStats;
|
||||
return BPTCC::CompressNVTTWithStats;
|
||||
else
|
||||
#endif
|
||||
return BC7C::CompressWithStats;
|
||||
return BPTCC::CompressWithStats;
|
||||
}
|
||||
break;
|
||||
|
||||
@ -135,19 +135,19 @@ static CompressionFunc ChooseFuncFromSettings(const SCompressionSettings &s) {
|
||||
switch(s.format) {
|
||||
case FasTC::eCompressionFormat_BPTC:
|
||||
{
|
||||
BC7C::SetQualityLevel(s.iQuality);
|
||||
BPTCC::SetQualityLevel(s.iQuality);
|
||||
#ifdef HAS_SSE_41
|
||||
if(s.bUseSIMD) {
|
||||
return BC7C::CompressImageBC7SIMD;
|
||||
return BPTCC::CompressImageBPTCSIMD;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef FOUND_NVTT_BC7_EXPORT
|
||||
#ifdef FOUND_NVTT_BPTC_EXPORT
|
||||
if(s.bUseNVTT)
|
||||
return BC7C::CompressNVTT;
|
||||
return BPTCC::CompressNVTT;
|
||||
else
|
||||
#endif
|
||||
return BC7C::Compress;
|
||||
return BPTCC::Compress;
|
||||
}
|
||||
break;
|
||||
|
||||
@ -232,8 +232,8 @@ class AtomicThreadUnit : public TCCallable {
|
||||
virtual ~AtomicThreadUnit() { }
|
||||
virtual void operator()() {
|
||||
m_Barrier->Wait();
|
||||
if(m_CmpFnc == BC7C::Compress) {
|
||||
BC7C::CompressAtomic(m_CompressionJobList);
|
||||
if(m_CmpFnc == BPTCC::Compress) {
|
||||
BPTCC::CompressAtomic(m_CompressionJobList);
|
||||
}
|
||||
else {
|
||||
assert(!"I don't know what we're compressing...");
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
*/
|
||||
|
||||
#include "ThreadGroup.h"
|
||||
#include "BC7Compressor.h"
|
||||
#include "BPTCCompressor.h"
|
||||
|
||||
#include <cstdlib>
|
||||
#include <cstdio>
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
#include <cassert>
|
||||
#include <iostream>
|
||||
|
||||
#include "BC7Compressor.h"
|
||||
#include "BPTCCompressor.h"
|
||||
|
||||
using FasTC::CompressionJob;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user