Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 362 insertions, 362 deletions

diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h
index 18187734f1..68df7b0684 100644
--- a/indra/llrender/llimagegl.h
+++ b/indra/llrender/llimagegl.h
@@ -1,362 +1,362 @@
-/** 
- * @file llimagegl.h
- * @brief Object for managing images and their textures
- *
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-
-#ifndef LL_LLIMAGEGL_H
-#define LL_LLIMAGEGL_H
-
-#include "llimage.h"
-
-#include "llgltypes.h"
-#include "llpointer.h"
-#include "llrefcount.h"
-#include "v2math.h"
-#include "llunits.h"
-#include "llthreadsafequeue.h"
-#include "llrender.h"
-#include "threadpool.h"
-#include "workqueue.h"
-
-#define LL_IMAGEGL_THREAD_CHECK 0 //set to 1 to enable thread debugging for ImageGL
-
-class LLWindow;
-
-#define BYTES_TO_MEGA_BYTES(x) ((x) >> 20)
-#define MEGA_BYTES_TO_BYTES(x) ((x) << 20)
-
-namespace LLImageGLMemory
-{
-    void alloc_tex_image(U32 width, U32 height, U32 pixformat);
-    void free_tex_image(U32 texName);
-    void free_tex_images(U32 count, const U32* texNames);
-    void free_cur_tex_image();
-}
-
-//============================================================================
-class LLImageGL : public LLRefCount
-{
-	friend class LLTexUnit;
-public:
-
-    // Get an estimate of how many bytes have been allocated in vram for textures.
-    // Does not include mipmaps.
-    // NOTE: multiplying this number by two gives a good estimate for total
-    // video memory usage based on testing in lagland against an NVIDIA GPU.
-    static U64 getTextureBytesAllocated();
-
-	// These 2 functions replace glGenTextures() and glDeleteTextures()
-	static void generateTextures(S32 numTextures, U32 *textures);
-	static void deleteTextures(S32 numTextures, const U32 *textures);
-
-	// Size calculation
-	static S32 dataFormatBits(S32 dataformat);
-	static S64 dataFormatBytes(S32 dataformat, S32 width, S32 height);
-	static S32 dataFormatComponents(S32 dataformat);
-
-	bool updateBindStats() const ;
-	F32 getTimePassedSinceLastBound();
-	void forceUpdateBindStats(void) const;
-
-	// needs to be called every frame
-	static void updateStats(F32 current_time);
-
-	// Save off / restore GL textures
-	static void destroyGL(bool save_state = true);
-	static void restoreGL();
-	static void dirtyTexOptions();
-
-	static bool checkSize(S32 width, S32 height);
-
-	//for server side use only.
-	// Not currently necessary for LLImageGL, but required in some derived classes,
-	// so include for compatability
-	static bool create(LLPointer<LLImageGL>& dest, bool usemipmaps = true);
-	static bool create(LLPointer<LLImageGL>& dest, U32 width, U32 height, U8 components, bool usemipmaps = true);
-	static bool create(LLPointer<LLImageGL>& dest, const LLImageRaw* imageraw, bool usemipmaps = true);
-		
-public:
-	LLImageGL(bool usemipmaps = true);
-	LLImageGL(U32 width, U32 height, U8 components, bool usemipmaps = true);
-	LLImageGL(const LLImageRaw* imageraw, bool usemipmaps = true);
-
-    // For wrapping textures created via GL elsewhere with our API only. Use with caution.
-    LLImageGL(LLGLuint mTexName, U32 components, LLGLenum target, LLGLint  formatInternal, LLGLenum formatPrimary, LLGLenum formatType, LLTexUnit::eTextureAddressMode addressMode);
-
-protected:
-	virtual ~LLImageGL();
-
-	void analyzeAlpha(const void* data_in, U32 w, U32 h);
-	void calcAlphaChannelOffsetAndStride();
-
-public:
-	virtual void dump();	// debugging info to LL_INFOS()
-	
-	bool setSize(S32 width, S32 height, S32 ncomponents, S32 discard_level = -1);
-	void setComponents(S32 ncomponents) { mComponents = (S8)ncomponents ;}
-	void setAllowCompression(bool allow) { mAllowCompression = allow; }
-
-	static void setManualImage(U32 target, S32 miplevel, S32 intformat, S32 width, S32 height, U32 pixformat, U32 pixtype, const void *pixels, bool allow_compression = true);
-    
-	bool createGLTexture() ;
-	bool createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S32 usename = 0, bool to_create = true,
-		S32 category = sMaxCategories-1, bool defer_copy = false, LLGLuint* tex_name = nullptr);
-	bool createGLTexture(S32 discard_level, const U8* data, bool data_hasmips = false, S32 usename = 0, bool defer_copy = false, LLGLuint* tex_name = nullptr);
-	void setImage(const LLImageRaw* imageraw);
-	bool setImage(const U8* data_in, bool data_hasmips = false, S32 usename = 0);
-    // *TODO: This function may not work if the textures is compressed (i.e.
-    // RenderCompressTextures is 0). Partial image updates do not work on
-    // compressed textures.
-	bool setSubImage(const LLImageRaw* imageraw, S32 x_pos, S32 y_pos, S32 width, S32 height, bool force_fast_update = false, LLGLuint use_name = 0);
-	bool setSubImage(const U8* datap, S32 data_width, S32 data_height, S32 x_pos, S32 y_pos, S32 width, S32 height, bool force_fast_update = false, LLGLuint use_name = 0);
-	bool setSubImageFromFrameBuffer(S32 fb_x, S32 fb_y, S32 x_pos, S32 y_pos, S32 width, S32 height);
-
-    // wait for gl commands to finish on current thread and push
-    // a lambda to main thread to swap mNewTexName and mTexName
-    void syncToMainThread(LLGLuint new_tex_name);
-
-	// Read back a raw image for this discard level, if it exists
-	bool readBackRaw(S32 discard_level, LLImageRaw* imageraw, bool compressed_ok) const;
-	void destroyGLTexture();
-	void forceToInvalidateGLTexture();
-
-	void setExplicitFormat(LLGLint internal_format, LLGLenum primary_format, LLGLenum type_format = 0, bool swap_bytes = false);
-	void setComponents(S8 ncomponents) { mComponents = ncomponents; }
-
-	S32	 getDiscardLevel() const		{ return mCurrentDiscardLevel; }
-	S32	 getMaxDiscardLevel() const		{ return mMaxDiscardLevel; }
-
-	S32  getCurrentWidth() const { return mWidth ;}
-	S32  getCurrentHeight() const { return mHeight ;}
-	S32	 getWidth(S32 discard_level = -1) const;
-	S32	 getHeight(S32 discard_level = -1) const;
-	U8	 getComponents() const { return mComponents; }
-	S64  getBytes(S32 discard_level = -1) const;
-	S64  getMipBytes(S32 discard_level = -1) const;
-	bool getBoundRecently() const;
-	bool isJustBound() const;
-	bool getHasExplicitFormat() const { return mHasExplicitFormat; }
-	LLGLenum getPrimaryFormat() const { return mFormatPrimary; }
-	LLGLenum getFormatType() const { return mFormatType; }
-
-	bool getHasGLTexture() const { return mTexName != 0; }
-	LLGLuint getTexName() const { return mTexName; }
-
-	bool getIsAlphaMask() const;
-
-	bool getIsResident(bool test_now = false); // not const
-
-	void setTarget(const LLGLenum target, const LLTexUnit::eTextureType bind_target);
-
-	LLTexUnit::eTextureType getTarget(void) const { return mBindTarget; }
-	bool isGLTextureCreated(void) const { return mGLTextureCreated ; }
-	void setGLTextureCreated (bool initialized) { mGLTextureCreated = initialized; }
-
-	bool getUseMipMaps() const { return mUseMipMaps; }
-	void setUseMipMaps(bool usemips) { mUseMipMaps = usemips; }	
-    void setHasMipMaps(bool hasmips) { mHasMipMaps = hasmips; }
-	void updatePickMask(S32 width, S32 height, const U8* data_in);
-	bool getMask(const LLVector2 &tc);
-
-    void checkTexSize(bool forced = false) const ;
-	
-	// Sets the addressing mode used to sample the texture 
-	//  (such as wrapping, mirrored wrapping, and clamp)
-	// Note: this actually gets set the next time the texture is bound.
-	void setAddressMode(LLTexUnit::eTextureAddressMode mode);
-	LLTexUnit::eTextureAddressMode getAddressMode(void) const { return mAddressMode; }
-
-	// Sets the filtering options used to sample the texture 
-	//  (such as point sampling, bilinear interpolation, mipmapping, and anisotropic filtering)
-	// Note: this actually gets set the next time the texture is bound.
-	void setFilteringOption(LLTexUnit::eTextureFilterOptions option);
-	LLTexUnit::eTextureFilterOptions getFilteringOption(void) const { return mFilterOption; }
-
-	LLGLenum getTexTarget()const { return mTarget ;}
-	S8       getDiscardLevelInAtlas()const {return mDiscardLevelInAtlas;}
-	U32      getTexelsInAtlas()const { return mTexelsInAtlas ;}
-	U32      getTexelsInGLTexture()const {return mTexelsInGLTexture;}
-
-	
-	void init(bool usemipmaps);
-	virtual void cleanup(); // Clean up the LLImageGL so it can be reinitialized.  Be careful when using this in derived class destructors
-
-	void setNeedsAlphaAndPickMask(bool need_mask);
-
-	bool preAddToAtlas(S32 discard_level, const LLImageRaw* raw_image);
-	void postAddToAtlas() ;	
-
-#if LL_IMAGEGL_THREAD_CHECK
-    // thread debugging
-    std::thread::id mActiveThread;
-    void checkActiveThread();
-#endif
-
-public:
-	// Various GL/Rendering options
-	S64Bytes mTextureMemory;
-	mutable F32  mLastBindTime;	// last time this was bound, by discard level
-	
-private:
-	U32 createPickMask(S32 pWidth, S32 pHeight);
-	void freePickMask();
-    bool isCompressed();
-
-	LLPointer<LLImageRaw> mSaveData; // used for destroyGL/restoreGL
-	LL::WorkQueue::weak_t mMainQueue;
-	U8* mPickMask;  //downsampled bitmap approximation of alpha channel.  NULL if no alpha channel
-	U16 mPickMaskWidth;
-	U16 mPickMaskHeight;
-	S8 mUseMipMaps;
-	bool mHasExplicitFormat; // If false (default), GL format is f(mComponents)
-	bool mAutoGenMips = false;
-
-	bool mIsMask;
-	bool mNeedsAlphaAndPickMask;
-	S8   mAlphaStride ;
-	S8   mAlphaOffset ;
-
-	bool     mGLTextureCreated ;
-	LLGLuint mTexName;
-    //LLGLuint mNewTexName = 0; // tex name set by background thread to be applied in main thread
-	U16      mWidth;
-	U16      mHeight;
-	S8       mCurrentDiscardLevel;
-	
-	S8       mDiscardLevelInAtlas;
-	U32      mTexelsInAtlas ;
-	U32      mTexelsInGLTexture;
-
-	bool mAllowCompression;
-
-protected:
-	LLGLenum mTarget;		// Normally GL_TEXTURE2D, sometimes something else (ex. cube maps)
-	LLTexUnit::eTextureType mBindTarget;	// Normally TT_TEXTURE, sometimes something else (ex. cube maps)
-	bool mHasMipMaps;
-	S32 mMipLevels;
-
-	LLGLboolean mIsResident;
-	
-	S8 mComponents;
-	S8 mMaxDiscardLevel;	
-	
-	bool	mTexOptionsDirty;
-	LLTexUnit::eTextureAddressMode		mAddressMode;	// Defaults to TAM_WRAP
-	LLTexUnit::eTextureFilterOptions	mFilterOption;	// Defaults to TFO_ANISOTROPIC
-	
-	LLGLint  mFormatInternal; // = GL internalformat
-	LLGLenum mFormatPrimary;  // = GL format (pixel data format)
-	LLGLenum mFormatType;
-	bool	 mFormatSwapBytes;// if true, use glPixelStorei(GL_UNPACK_SWAP_BYTES, 1)
-	
-    bool mExternalTexture;
-
-	// STATICS
-public:	
-	static std::set<LLImageGL*> sImageList;
-	static S32 sCount;
-	
-	static F32 sLastFrameTime;
-
-	// Global memory statistics
-	static U32 sBindCount;					// Tracks number of texture binds for current frame
-	static U32 sUniqueCount;				// Tracks number of unique texture binds for current frame
-	static bool sGlobalUseAnisotropic;
-	static LLImageGL* sDefaultGLTexture ;	
-	static bool sAutomatedTest;
-	static bool sCompressTextures;			//use GL texture compression
-#if DEBUG_MISS
-	bool mMissed; // Missed on last bind?
-	bool getMissed() const { return mMissed; };
-#else
-	bool getMissed() const { return false; };
-#endif
-
-public:
-	static void initClass(LLWindow* window, S32 num_catagories, bool skip_analyze_alpha = false, bool thread_texture_loads = false, bool thread_media_updates = false);
-	static void cleanupClass() ;
-
-private:
-	static S32 sMaxCategories;
-	static bool sSkipAnalyzeAlpha;
-	
-	//the flag to allow to call readBackRaw(...).
-	//can be removed if we do not use that function at all.
-	static bool sAllowReadBackRaw ;
-//
-//****************************************************************************************************
-//The below for texture auditing use only
-//****************************************************************************************************
-private:
-	S32 mCategory ;
-public:
-	void setCategory(S32 category) {mCategory = category;}
-	S32  getCategory()const {return mCategory;}
-	
-    void setTexName(GLuint texName) { mTexName = texName; }
-
-    //similar to setTexName, but will call deleteTextures on mTexName if mTexName is not 0 or texname
-    void syncTexName(LLGLuint texname);
-
-	//for debug use: show texture size distribution 
-	//----------------------------------------
-	static S32 sCurTexSizeBar ;
-	static S32 sCurTexPickSize ;
-
-	static void setCurTexSizebar(S32 index, bool set_pick_size = true) ;
-	static void resetCurTexSizebar();
-
-//****************************************************************************************************
-//End of definitions for texture auditing use only
-//****************************************************************************************************
-
-};
-
-class LLImageGLThread : public LLSimpleton<LLImageGLThread>, LL::ThreadPool
-{
-public:
-    // follows gSavedSettings "RenderGLMultiThreadedTextures"
-    static bool sEnabledTextures;
-    // follows gSavedSettings "RenderGLMultiThreadedMedia"
-    static bool sEnabledMedia;
-    
-    LLImageGLThread(LLWindow* window);
-
-    // post a function to be executed on the LLImageGL background thread
-    template <typename CALLABLE>
-    bool post(CALLABLE&& func)
-    {
-        return getQueue().post(std::forward<CALLABLE>(func));
-    }
-
-    void run() override;
-
-private:
-    LLWindow* mWindow;
-    void* mContext = nullptr;
-    LLAtomicBool mFinished;
-};
-
-#endif // LL_LLIMAGEGL_H
+/**

+ * @file llimagegl.h

+ * @brief Object for managing images and their textures

+ *

+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2010, Linden Research, Inc.

+ *

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation;

+ * version 2.1 of the License only.

+ *

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

+ *

+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA

+ * $/LicenseInfo$

+ */

+

+

+#ifndef LL_LLIMAGEGL_H

+#define LL_LLIMAGEGL_H

+

+#include "llimage.h"

+

+#include "llgltypes.h"

+#include "llpointer.h"

+#include "llrefcount.h"

+#include "v2math.h"

+#include "llunits.h"

+#include "llthreadsafequeue.h"

+#include "llrender.h"

+#include "threadpool.h"

+#include "workqueue.h"

+

+#define LL_IMAGEGL_THREAD_CHECK 0 //set to 1 to enable thread debugging for ImageGL

+

+class LLWindow;

+

+#define BYTES_TO_MEGA_BYTES(x) ((x) >> 20)

+#define MEGA_BYTES_TO_BYTES(x) ((x) << 20)

+

+namespace LLImageGLMemory

+{

+    void alloc_tex_image(U32 width, U32 height, U32 pixformat);

+    void free_tex_image(U32 texName);

+    void free_tex_images(U32 count, const U32* texNames);

+    void free_cur_tex_image();

+}

+

+//============================================================================

+class LLImageGL : public LLRefCount

+{

+    friend class LLTexUnit;

+public:

+

+    // Get an estimate of how many bytes have been allocated in vram for textures.

+    // Does not include mipmaps.

+    // NOTE: multiplying this number by two gives a good estimate for total

+    // video memory usage based on testing in lagland against an NVIDIA GPU.

+    static U64 getTextureBytesAllocated();

+

+    // These 2 functions replace glGenTextures() and glDeleteTextures()

+    static void generateTextures(S32 numTextures, U32 *textures);

+    static void deleteTextures(S32 numTextures, const U32 *textures);

+

+    // Size calculation

+    static S32 dataFormatBits(S32 dataformat);

+    static S64 dataFormatBytes(S32 dataformat, S32 width, S32 height);

+    static S32 dataFormatComponents(S32 dataformat);

+

+    bool updateBindStats() const ;

+    F32 getTimePassedSinceLastBound();

+    void forceUpdateBindStats(void) const;

+

+    // needs to be called every frame

+    static void updateStats(F32 current_time);

+

+    // Save off / restore GL textures

+    static void destroyGL(bool save_state = true);

+    static void restoreGL();

+    static void dirtyTexOptions();

+

+    static bool checkSize(S32 width, S32 height);

+

+    //for server side use only.

+    // Not currently necessary for LLImageGL, but required in some derived classes,

+    // so include for compatability

+    static bool create(LLPointer<LLImageGL>& dest, bool usemipmaps = true);

+    static bool create(LLPointer<LLImageGL>& dest, U32 width, U32 height, U8 components, bool usemipmaps = true);

+    static bool create(LLPointer<LLImageGL>& dest, const LLImageRaw* imageraw, bool usemipmaps = true);

+

+public:

+    LLImageGL(bool usemipmaps = true);

+    LLImageGL(U32 width, U32 height, U8 components, bool usemipmaps = true);

+    LLImageGL(const LLImageRaw* imageraw, bool usemipmaps = true);

+

+    // For wrapping textures created via GL elsewhere with our API only. Use with caution.

+    LLImageGL(LLGLuint mTexName, U32 components, LLGLenum target, LLGLint  formatInternal, LLGLenum formatPrimary, LLGLenum formatType, LLTexUnit::eTextureAddressMode addressMode);

+

+protected:

+    virtual ~LLImageGL();

+

+    void analyzeAlpha(const void* data_in, U32 w, U32 h);

+    void calcAlphaChannelOffsetAndStride();

+

+public:

+    virtual void dump();    // debugging info to LL_INFOS()

+

+    bool setSize(S32 width, S32 height, S32 ncomponents, S32 discard_level = -1);

+    void setComponents(S32 ncomponents) { mComponents = (S8)ncomponents ;}

+    void setAllowCompression(bool allow) { mAllowCompression = allow; }

+

+    static void setManualImage(U32 target, S32 miplevel, S32 intformat, S32 width, S32 height, U32 pixformat, U32 pixtype, const void *pixels, bool allow_compression = true);

+

+    bool createGLTexture() ;

+    bool createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S32 usename = 0, bool to_create = true,

+        S32 category = sMaxCategories-1, bool defer_copy = false, LLGLuint* tex_name = nullptr);

+    bool createGLTexture(S32 discard_level, const U8* data, bool data_hasmips = false, S32 usename = 0, bool defer_copy = false, LLGLuint* tex_name = nullptr);

+    void setImage(const LLImageRaw* imageraw);

+    bool setImage(const U8* data_in, bool data_hasmips = false, S32 usename = 0);

+    // *TODO: This function may not work if the textures is compressed (i.e.

+    // RenderCompressTextures is 0). Partial image updates do not work on

+    // compressed textures.

+    bool setSubImage(const LLImageRaw* imageraw, S32 x_pos, S32 y_pos, S32 width, S32 height, bool force_fast_update = false, LLGLuint use_name = 0);

+    bool setSubImage(const U8* datap, S32 data_width, S32 data_height, S32 x_pos, S32 y_pos, S32 width, S32 height, bool force_fast_update = false, LLGLuint use_name = 0);

+    bool setSubImageFromFrameBuffer(S32 fb_x, S32 fb_y, S32 x_pos, S32 y_pos, S32 width, S32 height);

+

+    // wait for gl commands to finish on current thread and push

+    // a lambda to main thread to swap mNewTexName and mTexName

+    void syncToMainThread(LLGLuint new_tex_name);

+

+    // Read back a raw image for this discard level, if it exists

+    bool readBackRaw(S32 discard_level, LLImageRaw* imageraw, bool compressed_ok) const;

+    void destroyGLTexture();

+    void forceToInvalidateGLTexture();

+

+    void setExplicitFormat(LLGLint internal_format, LLGLenum primary_format, LLGLenum type_format = 0, bool swap_bytes = false);

+    void setComponents(S8 ncomponents) { mComponents = ncomponents; }

+

+    S32  getDiscardLevel() const        { return mCurrentDiscardLevel; }

+    S32  getMaxDiscardLevel() const     { return mMaxDiscardLevel; }

+

+    S32  getCurrentWidth() const { return mWidth ;}

+    S32  getCurrentHeight() const { return mHeight ;}

+    S32  getWidth(S32 discard_level = -1) const;

+    S32  getHeight(S32 discard_level = -1) const;

+    U8   getComponents() const { return mComponents; }

+    S64  getBytes(S32 discard_level = -1) const;

+    S64  getMipBytes(S32 discard_level = -1) const;

+    bool getBoundRecently() const;

+    bool isJustBound() const;

+    bool getHasExplicitFormat() const { return mHasExplicitFormat; }

+    LLGLenum getPrimaryFormat() const { return mFormatPrimary; }

+    LLGLenum getFormatType() const { return mFormatType; }

+

+    bool getHasGLTexture() const { return mTexName != 0; }

+    LLGLuint getTexName() const { return mTexName; }

+

+    bool getIsAlphaMask() const;

+

+    bool getIsResident(bool test_now = false); // not const

+

+    void setTarget(const LLGLenum target, const LLTexUnit::eTextureType bind_target);

+

+    LLTexUnit::eTextureType getTarget(void) const { return mBindTarget; }

+    bool isGLTextureCreated(void) const { return mGLTextureCreated ; }

+    void setGLTextureCreated (bool initialized) { mGLTextureCreated = initialized; }

+

+    bool getUseMipMaps() const { return mUseMipMaps; }

+    void setUseMipMaps(bool usemips) { mUseMipMaps = usemips; }

+    void setHasMipMaps(bool hasmips) { mHasMipMaps = hasmips; }

+    void updatePickMask(S32 width, S32 height, const U8* data_in);

+    bool getMask(const LLVector2 &tc);

+

+    void checkTexSize(bool forced = false) const ;

+

+    // Sets the addressing mode used to sample the texture

+    //  (such as wrapping, mirrored wrapping, and clamp)

+    // Note: this actually gets set the next time the texture is bound.

+    void setAddressMode(LLTexUnit::eTextureAddressMode mode);

+    LLTexUnit::eTextureAddressMode getAddressMode(void) const { return mAddressMode; }

+

+    // Sets the filtering options used to sample the texture

+    //  (such as point sampling, bilinear interpolation, mipmapping, and anisotropic filtering)

+    // Note: this actually gets set the next time the texture is bound.

+    void setFilteringOption(LLTexUnit::eTextureFilterOptions option);

+    LLTexUnit::eTextureFilterOptions getFilteringOption(void) const { return mFilterOption; }

+

+    LLGLenum getTexTarget()const { return mTarget ;}

+    S8       getDiscardLevelInAtlas()const {return mDiscardLevelInAtlas;}

+    U32      getTexelsInAtlas()const { return mTexelsInAtlas ;}

+    U32      getTexelsInGLTexture()const {return mTexelsInGLTexture;}

+

+

+    void init(bool usemipmaps);

+    virtual void cleanup(); // Clean up the LLImageGL so it can be reinitialized.  Be careful when using this in derived class destructors

+

+    void setNeedsAlphaAndPickMask(bool need_mask);

+

+    bool preAddToAtlas(S32 discard_level, const LLImageRaw* raw_image);

+    void postAddToAtlas() ;

+

+#if LL_IMAGEGL_THREAD_CHECK

+    // thread debugging

+    std::thread::id mActiveThread;

+    void checkActiveThread();

+#endif

+

+public:

+    // Various GL/Rendering options

+    S64Bytes mTextureMemory;

+    mutable F32  mLastBindTime; // last time this was bound, by discard level

+

+private:

+    U32 createPickMask(S32 pWidth, S32 pHeight);

+    void freePickMask();

+    bool isCompressed();

+

+    LLPointer<LLImageRaw> mSaveData; // used for destroyGL/restoreGL

+    LL::WorkQueue::weak_t mMainQueue;

+    U8* mPickMask;  //downsampled bitmap approximation of alpha channel.  NULL if no alpha channel

+    U16 mPickMaskWidth;

+    U16 mPickMaskHeight;

+    S8 mUseMipMaps;

+    bool mHasExplicitFormat; // If false (default), GL format is f(mComponents)

+    bool mAutoGenMips = false;

+

+    bool mIsMask;

+    bool mNeedsAlphaAndPickMask;

+    S8   mAlphaStride ;

+    S8   mAlphaOffset ;

+

+    bool     mGLTextureCreated ;

+    LLGLuint mTexName;

+    //LLGLuint mNewTexName = 0; // tex name set by background thread to be applied in main thread

+    U16      mWidth;

+    U16      mHeight;

+    S8       mCurrentDiscardLevel;

+

+    S8       mDiscardLevelInAtlas;

+    U32      mTexelsInAtlas ;

+    U32      mTexelsInGLTexture;

+

+    bool mAllowCompression;

+

+protected:

+    LLGLenum mTarget;       // Normally GL_TEXTURE2D, sometimes something else (ex. cube maps)

+    LLTexUnit::eTextureType mBindTarget;    // Normally TT_TEXTURE, sometimes something else (ex. cube maps)

+    bool mHasMipMaps;

+    S32 mMipLevels;

+

+    LLGLboolean mIsResident;

+

+    S8 mComponents;

+    S8 mMaxDiscardLevel;

+

+    bool    mTexOptionsDirty;

+    LLTexUnit::eTextureAddressMode      mAddressMode;   // Defaults to TAM_WRAP

+    LLTexUnit::eTextureFilterOptions    mFilterOption;  // Defaults to TFO_ANISOTROPIC

+

+    LLGLint  mFormatInternal; // = GL internalformat

+    LLGLenum mFormatPrimary;  // = GL format (pixel data format)

+    LLGLenum mFormatType;

+    bool     mFormatSwapBytes;// if true, use glPixelStorei(GL_UNPACK_SWAP_BYTES, 1)

+

+    bool mExternalTexture;

+

+    // STATICS

+public:

+    static std::set<LLImageGL*> sImageList;

+    static S32 sCount;

+

+    static F32 sLastFrameTime;

+

+    // Global memory statistics

+    static U32 sBindCount;                  // Tracks number of texture binds for current frame

+    static U32 sUniqueCount;                // Tracks number of unique texture binds for current frame

+    static bool sGlobalUseAnisotropic;

+    static LLImageGL* sDefaultGLTexture ;

+    static bool sAutomatedTest;

+    static bool sCompressTextures;          //use GL texture compression

+#if DEBUG_MISS

+    bool mMissed; // Missed on last bind?

+    bool getMissed() const { return mMissed; };

+#else

+    bool getMissed() const { return false; };

+#endif

+

+public:

+    static void initClass(LLWindow* window, S32 num_catagories, bool skip_analyze_alpha = false, bool thread_texture_loads = false, bool thread_media_updates = false);

+    static void cleanupClass() ;

+

+private:

+    static S32 sMaxCategories;

+    static bool sSkipAnalyzeAlpha;

+

+    //the flag to allow to call readBackRaw(...).

+    //can be removed if we do not use that function at all.

+    static bool sAllowReadBackRaw ;

+//

+//****************************************************************************************************

+//The below for texture auditing use only

+//****************************************************************************************************

+private:

+    S32 mCategory ;

+public:

+    void setCategory(S32 category) {mCategory = category;}

+    S32  getCategory()const {return mCategory;}

+

+    void setTexName(GLuint texName) { mTexName = texName; }

+

+    //similar to setTexName, but will call deleteTextures on mTexName if mTexName is not 0 or texname

+    void syncTexName(LLGLuint texname);

+

+    //for debug use: show texture size distribution

+    //----------------------------------------

+    static S32 sCurTexSizeBar ;

+    static S32 sCurTexPickSize ;

+

+    static void setCurTexSizebar(S32 index, bool set_pick_size = true) ;

+    static void resetCurTexSizebar();

+

+//****************************************************************************************************

+//End of definitions for texture auditing use only

+//****************************************************************************************************

+

+};

+

+class LLImageGLThread : public LLSimpleton<LLImageGLThread>, LL::ThreadPool

+{

+public:

+    // follows gSavedSettings "RenderGLMultiThreadedTextures"

+    static bool sEnabledTextures;

+    // follows gSavedSettings "RenderGLMultiThreadedMedia"

+    static bool sEnabledMedia;

+

+    LLImageGLThread(LLWindow* window);

+

+    // post a function to be executed on the LLImageGL background thread

+    template <typename CALLABLE>

+    bool post(CALLABLE&& func)

+    {

+        return getQueue().post(std::forward<CALLABLE>(func));

+    }

+

+    void run() override;

+

+private:

+    LLWindow* mWindow;

+    void* mContext = nullptr;

+    LLAtomicBool mFinished;

+};

+

+#endif // LL_LLIMAGEGL_H