TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename enum GFXTextureProfile::None for avoid conficts on Linux.

Browse source
This commit is contained in:
LuisAntonRebollo 2014-04-07 00:03:52 +02:00
parent 938e28b6f3
commit 7f46383eb5
13 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Engine/source/gfx/gfxTextureProfile.cpp
View file

@ -34,15 +34,15 @@
GFX_ImplementTextureProfile(GFXDefaultRenderTargetProfile,
GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::NoMipmap | GFXTextureProfile::RenderTarget,
GFXTextureProfile::None);
GFXTextureProfile::NONE);
GFX_ImplementTextureProfile(GFXDefaultStaticDiffuseProfile,
GFXTextureProfile::DiffuseMap,
GFXTextureProfile::Static,
GFXTextureProfile::None);
GFXTextureProfile::NONE);
GFX_ImplementTextureProfile(GFXDefaultStaticNormalMapProfile,
GFXTextureProfile::NormalMap,
GFXTextureProfile::Static,
GFXTextureProfile::None);
GFXTextureProfile::NONE);
GFX_ImplementTextureProfile(GFXDefaultStaticDXT5nmProfile,
GFXTextureProfile::NormalMap,
GFXTextureProfile::Static,
@ -50,15 +50,15 @@ GFX_ImplementTextureProfile(GFXDefaultStaticDXT5nmProfile,
GFX_ImplementTextureProfile(GFXDefaultPersistentProfile,
GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::Static | GFXTextureProfile::KeepBitmap,
GFXTextureProfile::None);
GFXTextureProfile::NONE);
GFX_ImplementTextureProfile(GFXSystemMemProfile,
GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::NoMipmap | GFXTextureProfile::SystemMemory,
GFXTextureProfile::None);
GFXTextureProfile::NONE);
GFX_ImplementTextureProfile(GFXDefaultZTargetProfile,
GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize | GFXTextureProfile::NoMipmap | GFXTextureProfile::ZTarget | GFXTextureProfile::NoDiscard,
GFXTextureProfile::None);
GFXTextureProfile::NONE);
//-----------------------------------------------------------------------------