Merge pull request #2450 from secondlife/lua-merge

Merge updated 'main' branch into release/luau-scripting

1 files changed, 49 insertions, 29 deletions

diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h
index 9b16711b85..42eecbb97c 100644
--- a/indra/llimage/llimage.h
+++ b/indra/llimage/llimage.h
@@ -117,6 +117,10 @@ class LLImageBase
 protected:
     virtual ~LLImageBase();
 
+    virtual void deleteData();
+    virtual U8* allocateData(S32 size = -1);
+    virtual U8* reallocateData(S32 size = -1);
+
 public:
     LLImageBase();
 
@@ -126,10 +130,6 @@ public:
         TYPE_AVATAR_BAKE = 1,
     };
 
-    virtual void deleteData();
-    virtual U8* allocateData(S32 size = -1);
-    virtual U8* reallocateData(S32 size = -1);
-
     virtual void dump();
     virtual void sanityCheck();
 
@@ -171,10 +171,27 @@ private:
 
     S8 mComponents;
 
-    bool mBadBufferAllocation ;
-    bool mAllowOverSize ;
+    bool mBadBufferAllocation;
+    bool mAllowOverSize;
+
+private:
+    mutable LLSharedMutex mDataMutex;
+
+public:
+    template<bool SHARED>
+    class DataLock : LLSharedMutexLockTemplate<SHARED>
+    {
+    public:
+        DataLock(const LLImageBase* image)
+        : LLSharedMutexLockTemplate<SHARED>(image ? &image->mDataMutex : nullptr)
+        {
+        }
+    };
 };
 
+using LLImageDataLock = LLImageBase::DataLock<false>;
+using LLImageDataSharedLock = LLImageBase::DataLock<true>;
+
 // Raw representation of an image (used for textures, and other uncompressed formats
 class LLImageRaw : public LLImageBase
 {
@@ -238,42 +255,30 @@ public:
     LLPointer<LLImageRaw> duplicate();
 
     // Src and dst can be any size.  Src and dst can each have 3 or 4 components.
-    void copy( LLImageRaw* src );
+    void copy( const LLImageRaw* src );
 
     // Src and dst are same size.  Src and dst have same number of components.
-    void copyUnscaled( LLImageRaw* src );
+    void copyUnscaled( const LLImageRaw* src );
 
     // Src and dst are same size.  Src has 4 components.  Dst has 3 components.
-    void copyUnscaled4onto3( LLImageRaw* src );
+    void copyUnscaled4onto3( const LLImageRaw* src );
 
     // Src and dst are same size.  Src has 3 components.  Dst has 4 components.
-    void copyUnscaled3onto4( LLImageRaw* src );
+    void copyUnscaled3onto4( const LLImageRaw* src );
 
     // Src and dst are same size.  Src has 1 component.  Dst has 4 components.
     // Alpha component is set to source alpha mask component.
     // RGB components are set to fill color.
-    void copyUnscaledAlphaMask( LLImageRaw* src, const LLColor4U& fill);
+    void copyUnscaledAlphaMask( const LLImageRaw* src, const LLColor4U& fill);
 
     // Src and dst can be any size.  Src and dst have same number of components.
-    void copyScaled( LLImageRaw* src );
-
-    // Src and dst can be any size.  Src has 3 components.  Dst has 4 components.
-    void copyScaled3onto4( LLImageRaw* src );
-
-    // Src and dst can be any size.  Src has 4 components.  Dst has 3 components.
-    void copyScaled4onto3( LLImageRaw* src );
+    void copyScaled( const LLImageRaw* src );
 
 
     // Composite operations
 
     // Src and dst can be any size.  Src and dst can each have 3 or 4 components.
-    void composite( LLImageRaw* src );
-
-    // Src and dst can be any size.  Src has 4 components.  Dst has 3 components.
-    void compositeScaled4onto3( LLImageRaw* src );
-
-    // Src and dst are same size.  Src has 4 components.  Dst has 3 components.
-    void compositeUnscaled4onto3( LLImageRaw* src );
+    void composite( const LLImageRaw* src );
 
     // Emissive operations used by minimap
     // Roughly emulates GLTF emissive texture, but is not GLTF-compliant
@@ -282,13 +287,25 @@ public:
     void addEmissiveScaled(LLImageRaw* src);
     void addEmissiveUnscaled(LLImageRaw* src);
 protected:
+    // Src and dst can be any size.  Src has 4 components.  Dst has 3 components.
+    void compositeScaled4onto3( const LLImageRaw* src );
+
+    // Src and dst are same size.  Src has 4 components.  Dst has 3 components.
+    void compositeUnscaled4onto3( const LLImageRaw* src );
+
+    // Src and dst can be any size.  Src has 3 components.  Dst has 4 components.
+    void copyScaled3onto4( const LLImageRaw* src );
+
+    // Src and dst can be any size.  Src has 4 components.  Dst has 3 components.
+    void copyScaled4onto3( const LLImageRaw* src );
+
     // Create an image from a local file (generally used in tools)
     //bool createFromFile(const std::string& filename, bool j2c_lowest_mip_only = false);
 
-    void copyLineScaled( U8* in, U8* out, S32 in_pixel_len, S32 out_pixel_len, S32 in_pixel_step, S32 out_pixel_step );
-    void compositeRowScaled4onto3( U8* in, U8* out, S32 in_pixel_len, S32 out_pixel_len );
+    void copyLineScaled( const U8* in, U8* out, S32 in_pixel_len, S32 out_pixel_len, S32 in_pixel_step, S32 out_pixel_step );
+    void compositeRowScaled4onto3( const U8* in, U8* out, S32 in_pixel_len, S32 out_pixel_len );
 
-    U8  fastFractionalMult(U8 a,U8 b);
+    static U8 fastFractionalMult(U8 a, U8 b);
 
     void setDataAndSize(U8 *data, S32 width, S32 height, S8 components) ;
 
@@ -296,7 +313,7 @@ public:
     static S32 sRawImageCount;
 
 private:
-    bool validateSrcAndDst(std::string func, LLImageRaw* src, LLImageRaw* dst);
+    static bool validateSrcAndDst(std::string func, const LLImageRaw* src, const LLImageRaw* dst);
 };
 
 // Compressed representation of image.
@@ -305,7 +322,10 @@ class LLImageFormatted : public LLImageBase
 {
 public:
     static LLImageFormatted* createFromType(S8 codec);
+    static LLImageFormatted* loadFromMemory(const U8* data, U32 size, std::string_view mimetype);
     static LLImageFormatted* createFromExtension(const std::string& instring);
+    static LLImageFormatted* createFromMimeType(std::string_view mimetype);
+    static S8 getCodecFromMimeType(std::string_view mimetype);
 
 protected:
     /*virtual*/ ~LLImageFormatted();