From e6826f6d973f9b2b26204c906d51ecb520e9c6c2 Mon Sep 17 00:00:00 2001
From: Miezhiko <Miezhiko@gmail.com>
Date: Fri, 8 Sep 2023 12:45:55 +0400
Subject: [PATCH] GCC 13 compilation fixes (pointers/smart pointers comparison)
Signed-off-by: Miezhiko <Miezhiko@gmail.com>
---
indra/newview/lldrawpool.cpp | 6 +++---
indra/newview/lldrawpoolalpha.cpp | 2 +-
indra/newview/llreflectionmapmanager.cpp | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp
index b3ba516a1c9..721fa22e2f9 100644
--- a/indra/newview/lldrawpool.cpp
+++ b/indra/newview/lldrawpool.cpp
@@ -468,7 +468,7 @@ void LLRenderPass::pushRiggedBatches(U32 type, bool texture, bool batch_textures
LLDrawInfo* pparams = *i;
LLCullResult::increment_iterator(i, end);
- if (pparams->mAvatar.notNull() && (lastAvatar != pparams->mAvatar || lastMeshId != pparams->mSkinInfo->mHash))
+ if (pparams->mAvatar.notNull() && (lastAvatar != pparams->mAvatar.get() || lastMeshId != pparams->mSkinInfo->mHash))
{
uploadMatrixPalette(*pparams);
lastAvatar = pparams->mAvatar;
@@ -820,7 +820,7 @@ void LLRenderPass::pushUntexturedRiggedGLTFBatches(U32 type)
void LLRenderPass::pushRiggedGLTFBatch(LLDrawInfo& params, LLVOAvatar*& lastAvatar, U64& lastMeshId)
{
- if (params.mAvatar.notNull() && (lastAvatar != params.mAvatar || lastMeshId != params.mSkinInfo->mHash))
+ if (params.mAvatar.notNull() && (lastAvatar != params.mAvatar.get() || lastMeshId != params.mSkinInfo->mHash))
{
uploadMatrixPalette(params);
lastAvatar = params.mAvatar;
@@ -832,7 +832,7 @@ void LLRenderPass::pushRiggedGLTFBatch(LLDrawInfo& params, LLVOAvatar*& lastAvat
void LLRenderPass::pushUntexturedRiggedGLTFBatch(LLDrawInfo& params, LLVOAvatar*& lastAvatar, U64& lastMeshId)
{
- if (params.mAvatar.notNull() && (lastAvatar != params.mAvatar || lastMeshId != params.mSkinInfo->mHash))
+ if (params.mAvatar.notNull() && (lastAvatar != params.mAvatar.get() || lastMeshId != params.mSkinInfo->mHash))
{
uploadMatrixPalette(params);
lastAvatar = params.mAvatar;
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index 3cba1d77c06..6ee7c79e35a 100644
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -560,7 +560,7 @@ void LLDrawPoolAlpha::renderRiggedPbrEmissives(std::vector<LLDrawInfo*>& emissiv
for (LLDrawInfo* draw : emissives)
{
- if (lastAvatar != draw->mAvatar || lastMeshId != draw->mSkinInfo->mHash)
+ if (lastAvatar != draw->mAvatar.get() || lastMeshId != draw->mSkinInfo->mHash)
{
if (!uploadMatrixPalette(*draw))
{ // failed to upload matrix palette, skip rendering
diff --git a/indra/newview/llreflectionmapmanager.cpp b/indra/newview/llreflectionmapmanager.cpp
index d4e1d22f35d..3510d09db84 100644
--- a/indra/newview/llreflectionmapmanager.cpp
+++ b/indra/newview/llreflectionmapmanager.cpp
@@ -224,7 +224,7 @@ void LLReflectionMapManager::update()
continue;
}
- if (probe != mDefaultProbe &&
+ if (probe != mDefaultProbe.get() &&
(!probe->isRelevant() || mPaused))
{ // skip irrelevant probes (or all non-default probes if paused)
continue;
@@ -234,7 +234,7 @@ void LLReflectionMapManager::update()
LLVector4a d;
- if (probe != mDefaultProbe)
+ if (probe != mDefaultProbe.get())
{
if (probe->mViewerObject) //make sure probes track the viewer objects they are attached to
{
@@ -930,7 +930,7 @@ void LLReflectionMapManager::updateUniforms()
break;
}
- if (refmap != mDefaultProbe)
+ if (refmap != mDefaultProbe.get())
{
// bucket search data
// theory of operation:
--
GitLab