mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-30 01:04:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unify texture compression implementations.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-03-02 02:08:14 +01:00
parent aa0bf47ec3
commit 50123298a7
3 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/TracyTextureCompression.cpp
View File

@ -21,7 +21,7 @@ TextureCompression::~TextureCompression()
ZSTD_freeDCtx( m_dctx ); ZSTD_freeDCtx( m_dctx );
} }
void TextureCompression::Pack( struct ZSTD_CCtx_s* ctx, char*& buf, size_t& bufsz, const char* image, uint32_t inBytes, uint32_t& csz ) const uint32_t TextureCompression::Pack( struct ZSTD_CCtx_s* ctx, char*& buf, size_t& bufsz, const char* image, uint32_t inBytes ) const
{ {
const auto maxout = ZSTD_COMPRESSBOUND( inBytes ); const auto maxout = ZSTD_COMPRESSBOUND( inBytes );
if( bufsz < maxout ) if( bufsz < maxout )
@ -31,21 +31,7 @@ void TextureCompression::Pack( struct ZSTD_CCtx_s* ctx, char*& buf, size_t& bufs
buf = new char[maxout]; buf = new char[maxout];
} }
assert( ctx ); assert( ctx );
const auto outsz = ZSTD_compressCCtx( ctx, buf, maxout, image, inBytes, 3 ); return (uint32_t)ZSTD_compressCCtx( ctx, buf, maxout, image, inBytes, 3 );
csz = uint32_t( outsz );
}
uint32_t TextureCompression::PackImpl( const char* image, uint32_t inBytes )
{
const auto maxout = ZSTD_COMPRESSBOUND( inBytes );
if( m_bufSize < maxout )
{
m_bufSize = maxout;
delete[] m_buf;
m_buf = new char[maxout];
}
assert( m_cctx );
return (uint32_t)ZSTD_compressCCtx( m_cctx, m_buf, maxout, image, inBytes, 1 );
} }
const char* TextureCompression::Unpack( const FrameImage& image ) const char* TextureCompression::Unpack( const FrameImage& image )

6
server/TracyTextureCompression.hpp
View File

@ -20,12 +20,12 @@ public:
TextureCompression(); TextureCompression();
~TextureCompression(); ~TextureCompression();
void Pack( struct ZSTD_CCtx_s* ctx, char*& buf, size_t& bufsz, const char* image, uint32_t inBytes, uint32_t& csz ) const; uint32_t Pack( struct ZSTD_CCtx_s* ctx, char*& buf, size_t& bufsz, const char* image, uint32_t inBytes ) const;
template<size_t Size> template<size_t Size>
const char* Pack( const char* image, uint32_t inBytes, uint32_t& csz, Slab<Size>& slab ) const char* Pack( const char* image, uint32_t inBytes, uint32_t& csz, Slab<Size>& slab )
{ {
const auto outsz = PackImpl( image, inBytes ); const auto outsz = Pack( m_cctx, m_buf, m_bufSize, image, inBytes );
auto ptr = (char*)slab.AllocBig( outsz ); auto ptr = (char*)slab.AllocBig( outsz );
memcpy( ptr, m_buf, outsz ); memcpy( ptr, m_buf, outsz );
csz = outsz; csz = outsz;
@ -35,8 +35,6 @@ public:
const char* Unpack( const FrameImage& image ); const char* Unpack( const FrameImage& image );
private: private:
uint32_t PackImpl( const char* image, uint32_t inBytes );
char* m_buf; char* m_buf;
size_t m_bufSize; size_t m_bufSize;
struct ZSTD_CCtx_s* m_cctx; struct ZSTD_CCtx_s* m_cctx;

2
server/TracyWorker.cpp
View File

@ -1473,7 +1473,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask, bool bgTasks )
data[idx].state.store( JobData::InProgress, std::memory_order_release ); data[idx].state.store( JobData::InProgress, std::memory_order_release );
td->Queue( [this, &data, idx, fi] { td->Queue( [this, &data, idx, fi] {
m_texcomp.Pack( data[idx].ctx, data[idx].outbuf, data[idx].outsz, data[idx].buf, fi->w * fi->h / 2, fi->csz ); fi->csz = m_texcomp.Pack( data[idx].ctx, data[idx].outbuf, data[idx].outsz, data[idx].buf, fi->w * fi->h / 2 );
data[idx].state.store( JobData::DataReady, std::memory_order_release ); data[idx].state.store( JobData::DataReady, std::memory_order_release );
} ); } );