diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-10-17 18:26:04 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-10-17 18:26:04 -0400 |
| commit | ac1d3a22f2034a5e3aba757bde72825643fa799c (patch) | |
| tree | 420b1e27469931f3017bcbe2e7c6f12f2dbd644b /indra/llrender/llimagegl.h | |
| parent | 6d405e2d018e6722288e1cfbf477d985b8384a54 (diff) | |
| parent | c7057c141c38492bfdc2bfe9d82de97a7364f01b (diff) | |
Merge. Pull in viewer-release after 3.6.8 fixes for AMD graphics.
Diffstat (limited to 'indra/llrender/llimagegl.h')
| -rwxr-xr-x | indra/llrender/llimagegl.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h index 57a052b258..0c62dd0d33 100755 --- a/indra/llrender/llimagegl.h +++ b/indra/llrender/llimagegl.h @@ -45,16 +45,9 @@ class LLImageGL : public LLRefCount { friend class LLTexUnit; public: - static U32 sCurTexName; - - //previously used but now available texture names - // sDeadTextureList[<usage>][<internal format>] - typedef std::map<U32, std::list<U32> > dead_texturelist_t; - static dead_texturelist_t sDeadTextureList[LLTexUnit::TT_NONE]; - // These 2 functions replace glGenTextures() and glDeleteTextures() - static void generateTextures(LLTexUnit::eTextureType type, U32 format, S32 numTextures, U32 *textures); - static void deleteTextures(LLTexUnit::eTextureType type, U32 format, S32 mip_levels, S32 numTextures, U32 *textures, bool immediate = false); + static void generateTextures(S32 numTextures, U32 *textures); + static void deleteTextures(S32 numTextures, U32 *textures); static void deleteDeadTextures(); // Size calculation |