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, 185 insertions, 185 deletions

diff --git a/indra/llrender/llcubemaparray.cpp b/indra/llrender/llcubemaparray.cpp
index 4f8d4015b6..cba65a6211 100644
--- a/indra/llrender/llcubemaparray.cpp
+++ b/indra/llrender/llcubemaparray.cpp
@@ -1,185 +1,185 @@
-/** 
- * @file llcubemaparray.cpp
- * @brief LLCubeMap class implementation
- *
- * $LicenseInfo:firstyear=2022&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2022, 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$
- */
-#include "linden_common.h"
-
-#include "llworkerthread.h"
-
-#include "llcubemaparray.h"
-
-#include "v4coloru.h"
-#include "v3math.h"
-#include "v3dmath.h"
-#include "m3math.h"
-#include "m4math.h"
-
-#include "llrender.h"
-#include "llglslshader.h"
-
-#include "llglheaders.h"
-
-//#pragma optimize("", off)
-
-using namespace LLImageGLMemory;
-
-// MUST match order of OpenGL face-layers
-GLenum LLCubeMapArray::sTargets[6] =
-{
-    GL_TEXTURE_CUBE_MAP_POSITIVE_X,
-    GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
-    GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
-    GL_TEXTURE_CUBE_MAP_NEGATIVE_Y,
-    GL_TEXTURE_CUBE_MAP_POSITIVE_Z,
-    GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
-};
-
-LLVector3 LLCubeMapArray::sLookVecs[6] =
-{
-        LLVector3(1, 0, 0),
-        LLVector3(-1, 0, 0),
-        LLVector3(0, 1, 0),
-        LLVector3(0, -1, 0),
-        LLVector3(0, 0, 1),
-        LLVector3(0, 0, -1)
-};
-
-LLVector3 LLCubeMapArray::sUpVecs[6] = 
-{
-    LLVector3(0, -1, 0),
-    LLVector3(0, -1, 0),
-    LLVector3(0, 0, 1),
-    LLVector3(0, 0, -1),
-    LLVector3(0, -1, 0),
-    LLVector3(0, -1, 0)
-};
-
-LLVector3 LLCubeMapArray::sClipToCubeLookVecs[6] =
-{
-        LLVector3(0, 0, -1), //GOOD
-        LLVector3(0, 0, 1), //GOOD
-        
-        LLVector3(1, 0, 0), // GOOD
-        LLVector3(1, 0, 0), // GOOD
-
-        LLVector3(1, 0, 0),
-        LLVector3(-1, 0, 0),
-};
-
-LLVector3 LLCubeMapArray::sClipToCubeUpVecs[6] =
-{
-    LLVector3(-1, 0, 0), //GOOD
-    LLVector3(1, 0, 0), //GOOD
-
-    LLVector3(0, 1, 0), // GOOD
-    LLVector3(0, -1, 0), // GOOD
-
-    LLVector3(0, 0, -1),
-    LLVector3(0, 0, 1)
-};
-
-LLCubeMapArray::LLCubeMapArray()
-	: mTextureStage(0)
-{
-	
-}
-
-LLCubeMapArray::~LLCubeMapArray()
-{
-}
-
-void LLCubeMapArray::allocate(U32 resolution, U32 components, U32 count, bool use_mips)
-{
-    U32 texname = 0;
-    mWidth = resolution;
-    mCount = count;
-
-    LLImageGL::generateTextures(1, &texname);
-
-    mImage = new LLImageGL(resolution, resolution, components, use_mips);
-    mImage->setTexName(texname);
-    mImage->setTarget(sTargets[0], LLTexUnit::TT_CUBE_MAP_ARRAY);
-
-    mImage->setUseMipMaps(use_mips);
-    mImage->setHasMipMaps(use_mips);
-
-    bind(0);
-
-    U32 format = components == 4 ? GL_RGBA16F : GL_RGB16F;
-
-    U32 mip = 0;
-
-    free_cur_tex_image();
-
-    while (resolution >= 1)
-    {
-        glTexImage3D(GL_TEXTURE_CUBE_MAP_ARRAY, mip, format, resolution, resolution, count * 6, 0,
-            GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
-
-        if (!use_mips)
-        {
-            break;
-        }
-        resolution /= 2;
-        ++mip;
-    }
-
-    alloc_tex_image(resolution * 6, resolution, format);
-
-    mImage->setAddressMode(LLTexUnit::TAM_CLAMP);
-
-    if (use_mips)
-    {
-        mImage->setFilteringOption(LLTexUnit::TFO_ANISOTROPIC);
-        //glGenerateMipmap(GL_TEXTURE_CUBE_MAP_ARRAY);  // <=== latest AMD drivers do not appreciate this method of allocating mipmaps
-    }
-    else
-    {
-        mImage->setFilteringOption(LLTexUnit::TFO_BILINEAR);
-    }
-
-    unbind();
-}
-
-void LLCubeMapArray::bind(S32 stage)
-{
-    mTextureStage = stage;
-    gGL.getTexUnit(stage)->bindManual(LLTexUnit::TT_CUBE_MAP_ARRAY, getGLName(), mImage->getUseMipMaps());
-}
-
-void LLCubeMapArray::unbind()
-{
-    gGL.getTexUnit(mTextureStage)->unbind(LLTexUnit::TT_CUBE_MAP_ARRAY);
-    mTextureStage = -1;
-}
-
-GLuint LLCubeMapArray::getGLName()
-{
-	return mImage->getTexName();
-}
-
-void LLCubeMapArray::destroyGL()
-{
-    mImage = NULL;
-}
+/**

+ * @file llcubemaparray.cpp

+ * @brief LLCubeMap class implementation

+ *

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

+ * Second Life Viewer Source Code

+ * Copyright (C) 2022, 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$

+ */

+#include "linden_common.h"

+

+#include "llworkerthread.h"

+

+#include "llcubemaparray.h"

+

+#include "v4coloru.h"

+#include "v3math.h"

+#include "v3dmath.h"

+#include "m3math.h"

+#include "m4math.h"

+

+#include "llrender.h"

+#include "llglslshader.h"

+

+#include "llglheaders.h"

+

+//#pragma optimize("", off)

+

+using namespace LLImageGLMemory;

+

+// MUST match order of OpenGL face-layers

+GLenum LLCubeMapArray::sTargets[6] =

+{

+    GL_TEXTURE_CUBE_MAP_POSITIVE_X,

+    GL_TEXTURE_CUBE_MAP_NEGATIVE_X,

+    GL_TEXTURE_CUBE_MAP_POSITIVE_Y,

+    GL_TEXTURE_CUBE_MAP_NEGATIVE_Y,

+    GL_TEXTURE_CUBE_MAP_POSITIVE_Z,

+    GL_TEXTURE_CUBE_MAP_NEGATIVE_Z

+};

+

+LLVector3 LLCubeMapArray::sLookVecs[6] =

+{

+        LLVector3(1, 0, 0),

+        LLVector3(-1, 0, 0),

+        LLVector3(0, 1, 0),

+        LLVector3(0, -1, 0),

+        LLVector3(0, 0, 1),

+        LLVector3(0, 0, -1)

+};

+

+LLVector3 LLCubeMapArray::sUpVecs[6] =

+{

+    LLVector3(0, -1, 0),

+    LLVector3(0, -1, 0),

+    LLVector3(0, 0, 1),

+    LLVector3(0, 0, -1),

+    LLVector3(0, -1, 0),

+    LLVector3(0, -1, 0)

+};

+

+LLVector3 LLCubeMapArray::sClipToCubeLookVecs[6] =

+{

+        LLVector3(0, 0, -1), //GOOD

+        LLVector3(0, 0, 1), //GOOD

+

+        LLVector3(1, 0, 0), // GOOD

+        LLVector3(1, 0, 0), // GOOD

+

+        LLVector3(1, 0, 0),

+        LLVector3(-1, 0, 0),

+};

+

+LLVector3 LLCubeMapArray::sClipToCubeUpVecs[6] =

+{

+    LLVector3(-1, 0, 0), //GOOD

+    LLVector3(1, 0, 0), //GOOD

+

+    LLVector3(0, 1, 0), // GOOD

+    LLVector3(0, -1, 0), // GOOD

+

+    LLVector3(0, 0, -1),

+    LLVector3(0, 0, 1)

+};

+

+LLCubeMapArray::LLCubeMapArray()

+    : mTextureStage(0)

+{

+

+}

+

+LLCubeMapArray::~LLCubeMapArray()

+{

+}

+

+void LLCubeMapArray::allocate(U32 resolution, U32 components, U32 count, bool use_mips)

+{

+    U32 texname = 0;

+    mWidth = resolution;

+    mCount = count;

+

+    LLImageGL::generateTextures(1, &texname);

+

+    mImage = new LLImageGL(resolution, resolution, components, use_mips);

+    mImage->setTexName(texname);

+    mImage->setTarget(sTargets[0], LLTexUnit::TT_CUBE_MAP_ARRAY);

+

+    mImage->setUseMipMaps(use_mips);

+    mImage->setHasMipMaps(use_mips);

+

+    bind(0);

+

+    U32 format = components == 4 ? GL_RGBA16F : GL_RGB16F;

+

+    U32 mip = 0;

+

+    free_cur_tex_image();

+

+    while (resolution >= 1)

+    {

+        glTexImage3D(GL_TEXTURE_CUBE_MAP_ARRAY, mip, format, resolution, resolution, count * 6, 0,

+            GL_RGBA, GL_UNSIGNED_BYTE, nullptr);

+

+        if (!use_mips)

+        {

+            break;

+        }

+        resolution /= 2;

+        ++mip;

+    }

+

+    alloc_tex_image(resolution * 6, resolution, format);

+

+    mImage->setAddressMode(LLTexUnit::TAM_CLAMP);

+

+    if (use_mips)

+    {

+        mImage->setFilteringOption(LLTexUnit::TFO_ANISOTROPIC);

+        //glGenerateMipmap(GL_TEXTURE_CUBE_MAP_ARRAY);  // <=== latest AMD drivers do not appreciate this method of allocating mipmaps

+    }

+    else

+    {

+        mImage->setFilteringOption(LLTexUnit::TFO_BILINEAR);

+    }

+

+    unbind();

+}

+

+void LLCubeMapArray::bind(S32 stage)

+{

+    mTextureStage = stage;

+    gGL.getTexUnit(stage)->bindManual(LLTexUnit::TT_CUBE_MAP_ARRAY, getGLName(), mImage->getUseMipMaps());

+}

+

+void LLCubeMapArray::unbind()

+{

+    gGL.getTexUnit(mTextureStage)->unbind(LLTexUnit::TT_CUBE_MAP_ARRAY);

+    mTextureStage = -1;

+}

+

+GLuint LLCubeMapArray::getGLName()

+{

+    return mImage->getTexName();

+}

+

+void LLCubeMapArray::destroyGL()

+{

+    mImage = NULL;

+}