Experimental DXT1 compressor.

This commit is contained in:
Bartosz Taudul 2019-06-27 17:09:47 +02:00
parent 79eb1b9029
commit 1939c31165
6 changed files with 132 additions and 1338 deletions

View File

@ -21,7 +21,7 @@
#include "client/TracySysTime.cpp" #include "client/TracySysTime.cpp"
#include "common/TracySocket.cpp" #include "common/TracySocket.cpp"
#include "client/tracy_rpmalloc.cpp" #include "client/tracy_rpmalloc.cpp"
#include "client/TracyEtc1.cpp" #include "client/TracyDxt1.cpp"
#if TRACY_HAS_CALLSTACK == 2 || TRACY_HAS_CALLSTACK == 3 #if TRACY_HAS_CALLSTACK == 2 || TRACY_HAS_CALLSTACK == 3
# include "libbacktrace/alloc.cpp" # include "libbacktrace/alloc.cpp"

117
client/TracyDxt1.cpp Normal file
View File

@ -0,0 +1,117 @@
#include "TracyDxt1.hpp"
#include <assert.h>
#include <stdint.h>
#include <string.h>
#ifdef __ARM_NEON
# include <arm_neon.h>
#endif
#if defined __AVX__ && !defined __SSE4_1__
# define __SSE4_1__
#endif
#ifdef _MSC_VER
# ifdef __SSE4_1__
# include <intrin.h>
# else
# include <x86intrin.h>
# endif
#endif
namespace tracy
{
static inline uint16_t to565( uint8_t r, uint8_t g, uint8_t b )
{
return ( ( r & 0xF8 ) << 8 ) | ( ( g & 0xFC ) << 3 ) | ( b >> 3 );
}
static uint64_t CheckSolid( const uint8_t* src )
{
const auto ref = to565( src[0], src[1], src[2] );
src += 4;
for( int i=1; i<16; i++ )
{
if( to565( src[0], src[1], src[2] ) != ref )
{
return 0;
}
src += 4;
}
return uint64_t( ref );
}
static const uint8_t IndexTable[4] = { 1, 3, 2, 0 };
static uint64_t ProcessRGB( const uint8_t* src )
{
const auto solid = CheckSolid( src );
if( solid != 0 ) return solid;
uint8_t min[3] = { src[0], src[1], src[2] };
uint8_t max[3] = { src[0], src[1], src[2] };
auto tmp = src + 4;
for( int i=1; i<16; i++ )
{
for( int j=0; j<3; j++ )
{
if( tmp[j] < min[j] ) min[j] = tmp[j];
else if( tmp[j] > max[j] ) max[j] = tmp[j];
}
tmp += 4;
}
uint32_t range = ( 4 << 13 ) / ( 1 + max[0] - min[0] + max[1] - min[1] + max[2] - min[2] );
uint8_t rmin[3] = { min[0], min[1], min[2] };
for( int i=0; i<3; i++ )
{
const uint8_t inset = ( max[i] - min[i] ) >> 4;
min[i] += inset;
max[i] -= inset;
}
uint32_t data = 0;
for( int i=0; i<16; i++ )
{
uint32_t c = src[0] - rmin[0] + src[1] - rmin[1] + src[2] - rmin[2];
uint8_t idx = IndexTable[( c * range ) >> 13];
data |= idx << (i*2);
src += 4;
}
return uint64_t( ( uint64_t( to565( min[0], min[1], min[2] ) ) << 16 ) | to565( max[0], max[1], max[2] ) | ( uint64_t( data ) << 32 ) );
}
void CompressImageDxt1( const char* src, char* dst, int w, int h )
{
assert( (w % 4) == 0 && (h % 4) == 0 );
uint32_t buf[4*4];
int i = 0;
auto ptr = dst;
auto blocks = w * h / 16;
do
{
auto tmp = (char*)buf;
memcpy( tmp, src, 4*4 );
memcpy( tmp + 4*4, src + w * 4, 4*4 );
memcpy( tmp + 8*4, src + w * 8, 4*4 );
memcpy( tmp + 12*4, src + w * 12, 4*4 );
src += 4*4;
if( ++i == w/4 )
{
src += w * 3 * 4;
i = 0;
}
const auto c = ProcessRGB( (uint8_t*)buf );
memcpy( ptr, &c, sizeof( uint64_t ) );
ptr += sizeof( uint64_t );
}
while( --blocks );
}
}

11
client/TracyDxt1.hpp Normal file
View File

@ -0,0 +1,11 @@
#ifndef __TRACYDXT1_HPP__
#define __TRACYDXT1_HPP__
namespace tracy
{
void CompressImageDxt1( const char* src, char* dst, int w, int h );
}
#endif

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +0,0 @@
#ifndef __TRACYETC1_HPP__
#define __TRACYETC1_HPP__
namespace tracy
{
void CompressImageEtc1( const char* src, char* dst, int w, int h );
}
#endif

View File

@ -48,7 +48,7 @@
#include "../common/tracy_lz4.hpp" #include "../common/tracy_lz4.hpp"
#include "tracy_rpmalloc.hpp" #include "tracy_rpmalloc.hpp"
#include "TracyCallstack.hpp" #include "TracyCallstack.hpp"
#include "TracyEtc1.hpp" #include "TracyDxt1.hpp"
#include "TracyScoped.hpp" #include "TracyScoped.hpp"
#include "TracyProfiler.hpp" #include "TracyProfiler.hpp"
#include "TracyThread.hpp" #include "TracyThread.hpp"
@ -992,7 +992,7 @@ Profiler::Profiler()
s_compressThread = (Thread*)tracy_malloc( sizeof( Thread ) ); s_compressThread = (Thread*)tracy_malloc( sizeof( Thread ) );
new(s_compressThread) Thread( LaunchCompressWorker, this ); new(s_compressThread) Thread( LaunchCompressWorker, this );
SetThreadName( s_compressThread->Handle(), "Tracy Profiler ETC1" ); SetThreadName( s_compressThread->Handle(), "Tracy Profiler DXT1" );
#if defined PTW32_VERSION #if defined PTW32_VERSION
s_profilerThreadId = pthread_getw32threadid_np( s_thread->Handle() ); s_profilerThreadId = pthread_getw32threadid_np( s_thread->Handle() );
@ -1432,7 +1432,7 @@ void Profiler::CompressWorker()
const auto h = fi->h; const auto h = fi->h;
const auto csz = size_t( w * h / 2 ); const auto csz = size_t( w * h / 2 );
auto etc1buf = (char*)tracy_malloc( csz ); auto etc1buf = (char*)tracy_malloc( csz );
CompressImageEtc1( (const char*)fi->image, etc1buf, w, h ); CompressImageDxt1( (const char*)fi->image, etc1buf, w, h );
tracy_free( fi->image ); tracy_free( fi->image );
Magic magic; Magic magic;