diff --git a/Engine/source/gfx/bitmap/gBitmap.cpp b/Engine/source/gfx/bitmap/gBitmap.cpp index 019e92a57..54d267aa8 100644 --- a/Engine/source/gfx/bitmap/gBitmap.cpp +++ b/Engine/source/gfx/bitmap/gBitmap.cpp @@ -1057,6 +1057,7 @@ bool GBitmap::write(Stream& io_rStream) const bool GBitmap::readBitmap( const String &bmType, Stream &ioStream ) { + PROFILE_SCOPE(ResourceGBitmap_readBitmap); const GBitmap::Registration *regInfo = GBitmap::sFindRegInfo( bmType ); if ( regInfo == NULL ) diff --git a/Engine/source/gfx/bitmap/gBitmap.h b/Engine/source/gfx/bitmap/gBitmap.h index 419b982f1..5c4b201ff 100644 --- a/Engine/source/gfx/bitmap/gBitmap.h +++ b/Engine/source/gfx/bitmap/gBitmap.h @@ -39,6 +39,9 @@ #include "gfx/gfxEnums.h" // For the format #endif +#ifndef _PROFILER_H_ +#include "platform/profiler.h" +#endif //-------------------------------------- Forward decls. class Stream; class RectI; diff --git a/Engine/source/gfx/bitmap/loaders/bitmapBmp.cpp b/Engine/source/gfx/bitmap/loaders/bitmapBmp.cpp index a54c3997e..cce955880 100644 --- a/Engine/source/gfx/bitmap/loaders/bitmapBmp.cpp +++ b/Engine/source/gfx/bitmap/loaders/bitmapBmp.cpp @@ -92,6 +92,7 @@ struct BITMAPINFOHEADER static bool sReadBMP(Stream &stream, GBitmap *bitmap) { + PROFILE_SCOPE(sReadBMP); BITMAPINFOHEADER bi; BITMAPFILEHEADER bf; RGBQUAD rgb[256]; diff --git a/Engine/source/gfx/bitmap/loaders/bitmapGif.cpp b/Engine/source/gfx/bitmap/loaders/bitmapGif.cpp index d4c031026..56bf51cc6 100644 --- a/Engine/source/gfx/bitmap/loaders/bitmapGif.cpp +++ b/Engine/source/gfx/bitmap/loaders/bitmapGif.cpp @@ -86,6 +86,7 @@ static S32 gifWriteDataFn(GifFileType *gifinfo, GifByteType *data, S32 length) //-------------------------------------- static bool sReadGIF( Stream &stream, GBitmap *bitmap ) { + PROFILE_SCOPE(sReadGIF); GifFileType *gifinfo = DGifOpen( (void*)&stream, gifReadDataFn); if (!gifinfo) return false; diff --git a/Engine/source/gfx/bitmap/loaders/bitmapJpeg.cpp b/Engine/source/gfx/bitmap/loaders/bitmapJpeg.cpp index 8a647afda..3711b3507 100644 --- a/Engine/source/gfx/bitmap/loaders/bitmapJpeg.cpp +++ b/Engine/source/gfx/bitmap/loaders/bitmapJpeg.cpp @@ -97,6 +97,7 @@ static S32 jpegErrorFn(void *client_data) //-------------------------------------- static bool sReadJPG(Stream &stream, GBitmap *bitmap) { + PROFILE_SCOPE(sReadJPG); JFREAD = jpegReadDataFn; JFERROR = jpegErrorFn; diff --git a/Engine/source/gfx/bitmap/loaders/bitmapMng.cpp b/Engine/source/gfx/bitmap/loaders/bitmapMng.cpp index 7483dc0cb..5caa67d93 100644 --- a/Engine/source/gfx/bitmap/loaders/bitmapMng.cpp +++ b/Engine/source/gfx/bitmap/loaders/bitmapMng.cpp @@ -206,6 +206,7 @@ static mng_bool mngFatalErrorFn(mng_handle mng, mng_int32 code, mng_int8 severit static bool sReadMNG(Stream &stream, GBitmap *bitmap) { + PROFILE_SCOPE(sReadMNG); mngstuff mnginfo; dMemset(&mnginfo, 0, sizeof(mngstuff)); diff --git a/Engine/source/gfx/bitmap/loaders/bitmapPng.cpp b/Engine/source/gfx/bitmap/loaders/bitmapPng.cpp index 702c5b33d..66a52dd05 100644 --- a/Engine/source/gfx/bitmap/loaders/bitmapPng.cpp +++ b/Engine/source/gfx/bitmap/loaders/bitmapPng.cpp @@ -136,6 +136,7 @@ static void pngWarningFn(png_structp, png_const_charp /*pMessage*/) //-------------------------------------- static bool sReadPNG(Stream &stream, GBitmap *bitmap) { + PROFILE_SCOPE(sReadPNG); static const U32 cs_headerBytesChecked = 8; U8 header[cs_headerBytesChecked]; diff --git a/Engine/source/gfx/bitmap/loaders/bitmapTga.cpp b/Engine/source/gfx/bitmap/loaders/bitmapTga.cpp index dff46bf03..978532892 100644 --- a/Engine/source/gfx/bitmap/loaders/bitmapTga.cpp +++ b/Engine/source/gfx/bitmap/loaders/bitmapTga.cpp @@ -228,6 +228,7 @@ is_15_bit_in_disguise: static bool sReadTGA(Stream &stream, GBitmap *bitmap) { + PROFILE_SCOPE(sReadTGA); struct Header { U8 idLength; // length of the image_id string below.