From 598c953d540090caa8a9a12581a4ab8ae52615dd Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 12 Oct 2022 18:49:18 -0500
Subject: SL-18190 Fix for assert on 360 snapshot and ? fix for mac build ?
---
indra/llmath/v3color.h | 6 +++---
indra/newview/llsettingsvo.cpp | 2 +-
indra/newview/llviewerwindow.cpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/indra/llmath/v3color.h b/indra/llmath/v3color.h
index 60353bea6e..0b3b4ea3e1 100644
--- a/indra/llmath/v3color.h
+++ b/indra/llmath/v3color.h
@@ -485,7 +485,7 @@ inline const LLColor3 srgbColor3(const LLColor3 &a) {
return srgbColor;
}
-inline const LLColor3 linearColor3(const F32* v) {
+inline const LLColor3 linearColor3p(const F32* v) {
LLColor3 linearColor;
linearColor.mV[0] = sRGBtoLinear(v[0]);
linearColor.mV[1] = sRGBtoLinear(v[1]);
@@ -496,12 +496,12 @@ inline const LLColor3 linearColor3(const F32* v) {
template<class T>
inline const LLColor3 linearColor3(const T& a) {
- return linearColor3(a.mV);
+ return linearColor3p(a.mV);
}
template<class T>
inline const LLVector3 linearColor3v(const T& a) {
- return LLVector3(linearColor3(a.mV).mV);
+ return LLVector3(linearColor3p(a.mV).mV);
}
#endif
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index ddd9c56841..f9b7c749b3 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -968,7 +968,7 @@ void LLSettingsVOWater::applySpecial(void *ptarget, bool force)
LLColor4 fog_color(env.getCurrentWater()->getWaterFogColor());
shader->uniform4fv(LLShaderMgr::WATER_FOGCOLOR, fog_color.mV);
- shader->uniform3fv(LLShaderMgr::WATER_FOGCOLOR_LINEAR, linearColor3(fog_color.mV).mV);
+ shader->uniform3fv(LLShaderMgr::WATER_FOGCOLOR_LINEAR, linearColor3(fog_color).mV);
F32 blend_factor = env.getCurrentWater()->getBlendFactor();
shader->uniform1f(LLShaderMgr::BLEND_FACTOR, blend_factor);
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 8ef65b665d..5c5a5ba0d1 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -5162,7 +5162,7 @@ BOOL LLViewerWindow::simpleSnapshot(LLImageRaw* raw, S32 image_width, S32 image_
LLRenderTarget scratch_space;
U32 color_fmt = GL_RGBA;
const bool use_depth_buffer = true;
- const bool use_stencil_buffer = true;
+ const bool use_stencil_buffer = false;
if (scratch_space.allocate(image_width, image_height, color_fmt, use_depth_buffer, use_stencil_buffer))
{
if (gPipeline.allocateScreenBuffer(image_width, image_height))
--
cgit v1.2.3