salmon-engine-core/engine
6
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Thread-safety

Browse Source
This commit is contained in:
vladislav.khorev committed 2013-02-03 21:24:01 +00:00
1 parent 1abaf6c321
commit 916a41e064
17 files changed
+289 -286
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/TextureManager/SalmonTexture.h
+11 -4
View File
@@ -59,12 +59,19 @@ protected:
bool CreateTexDataFromTga(const std::string& filename, TTextureData& texData);
bool CreateTexDataFromPng(const std::string& filename, TTextureData& texData);
cardinal AddTextureBmp24Data(const TTextureData& texData);
cardinal AddTextureBmp32Data(const TTextureData& texData);
cardinal AddCubemapTextureBmp24Data(TTextureData* texData);
cardinal AddTextureBmp24Data(const TTextureData& texData); //MAIN THREAD ONLY
cardinal AddTextureBmp32Data(const TTextureData& texData); //MAIN THREAD ONLY
cardinal AddCubemapTextureBmp24Data(TTextureData* texData); //MAIN THREAD ONLY
//cardinal AddCubemapTextureBmp32Data(TTextureData* texData); Not implemented yet
void InnerClear();
cardinal InnerAddEmptyTexture(const std::string& texName, cardinal width, cardinal height); //MAIN THREAD ONLY
cardinal InnerAddEmptyCubemapTexture(const std::string& texName, cardinal width, cardinal height); //MAIN THREAD ONLY
cardinal InnerAddDepthTexture(const std::string& texName, cardinal width, cardinal height); //MAIN THREAD ONLY
void InnerDeleteTexture(TTextureMap::iterator itr); //MAIN THREAD ONLY //MAIN THREAD ONLY
void InnerClear(); //MAIN THREAD ONLY
public:
TTextureListClass();