diff --git a/BPTCEncoder/include/BC7Compressor.h b/BPTCEncoder/include/BC7Compressor.h index 1bd6bb8..f0a0924 100755 --- a/BPTCEncoder/include/BC7Compressor.h +++ b/BPTCEncoder/include/BC7Compressor.h @@ -70,40 +70,40 @@ class BlockStatManager; namespace BC7C { - // 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 - // channel is treated equally. For a while, the widely accepted non-uniform metric - // has been to give red 30%, green 59% and blue 11% weight when computing the error - // between two pixels. - enum ErrorMetric - { - eErrorMetric_Uniform, // Treats r, g, and b channels equally - eErrorMetric_Nonuniform, // { 0.3, 0.59, 0.11 } - - kNumErrorMetrics - }; + // 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 + // channel is treated equally. For a while, the widely accepted non-uniform metric + // has been to give red 30%, green 59% and blue 11% weight when computing the error + // between two pixels. + enum ErrorMetric + { + eErrorMetric_Uniform, // Treats r, g, and b channels equally + eErrorMetric_Nonuniform, // { 0.3, 0.59, 0.11 } + + kNumErrorMetrics + }; - // Sets the error metric to be the one specified. - void SetErrorMetric(ErrorMetric e); + // Sets the error metric to be the one specified. + void SetErrorMetric(ErrorMetric e); - // Retreives a float4 pointer for the r, g, b, a weights for each color channel, in - // that order, based on the current error metric. - const float *GetErrorMetric(); + // Retreives a float4 pointer for the r, g, b, a weights for each color channel, in + // that order, based on the current error metric. + const float *GetErrorMetric(); - // Returns the enumeration for the current error metric. - ErrorMetric GetErrorMetricEnum(); + // Returns the enumeration for the current error metric. + ErrorMetric GetErrorMetricEnum(); - // Sets the number of steps that we use to perform simulated annealing. In general, a - // larger number produces better results. The default is set to 50. This metric works - // on a logarithmic scale -- twice the value will double the compute time, but only - // decrease the error by two times a factor. - void SetQualityLevel(int q); - int GetQualityLevel(); + // Sets the number of steps that we use to perform simulated annealing. In general, a + // larger number produces better results. The default is set to 50. This metric works + // on a logarithmic scale -- twice the value will double the compute time, but only + // decrease the error by two times a factor. + void SetQualityLevel(int q); + int GetQualityLevel(); - // Compress the image given as RGBA data to BC7 format. Width and Height are the dimensions of - // the image in pixels. - void Compress(const CompressionJob &); + // Compress the image given as RGBA data to BC7 format. Width and Height are the dimensions of + // the image in pixels. + void Compress(const CompressionJob &); // Perform a compression while recording all of the choices the compressor made into a // list of statistics. We can use this to see whether or not certain heuristics are working, such as @@ -111,9 +111,9 @@ namespace BC7C void CompressWithStats(const CompressionJob &, BlockStatManager &statManager); #ifdef HAS_SSE_41 - // Compress the image given as RGBA data to BC7 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, unsigned int width, unsigned int height); + // Compress the image given as RGBA data to BC7 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, unsigned int width, unsigned int height); #endif #ifdef HAS_ATOMICS @@ -123,6 +123,6 @@ namespace BC7C void CompressAtomic(CompressionJobList &); #endif - // Decompress the image given as BC7 data to R8G8B8A8 format. Width and Height are the dimensions of the image in pixels. - void Decompress(const DecompressionJob &); + // Decompress the image given as BC7 data to R8G8B8A8 format. Width and Height are the dimensions of the image in pixels. + void Decompress(const DecompressionJob &); }