From a0a1d93fb6a74149bbef57f1d1489510247110ca Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 15 Nov 2018 09:49:36 -0800
Subject: [PATCH] Merge 6ish
---
.../app_settings/shaders/class1/environment/terrainV.glsl | 2 +-
indra/newview/lldrawpoolwater.cpp | 4 ++++
indra/newview/llvosky.cpp | 4 ++++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/indra/newview/app_settings/shaders/class1/environment/terrainV.glsl b/indra/newview/app_settings/shaders/class1/environment/terrainV.glsl
index d09c5f9247c..4d6f0c67a53 100644
--- a/indra/newview/app_settings/shaders/class1/environment/terrainV.glsl
+++ b/indra/newview/app_settings/shaders/class1/environment/terrainV.glsl
@@ -71,7 +71,7 @@ void main()
/// Potentially better without it for water.
pos /= pos.w;
- vec4 color = calcLighting(pos.xyz, norm, vec4(1,1,1,1), vec4(0));
+ vec4 color = calcLighting(pos.xyz, norm, vec4(1), vec4(0));
vertex_color = color;
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index df06ad31e6d..93168901565 100644
--- a/indra/newview/lldrawpoolwater.cpp
+++ b/indra/newview/lldrawpoolwater.cpp
@@ -48,6 +48,10 @@
#include "llviewershadermgr.h"
#include "llwaterparammanager.h"
+#if LL_WINDOWS
+#pragma optimize("", off)
+#endif
+
const LLUUID TRANSPARENT_WATER_TEXTURE("2bfd3884-7e27-69b9-ba3a-3e673f680004");
const LLUUID OPAQUE_WATER_TEXTURE("43c32285-d658-1793-c123-bf86315de055");
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index c131cb886f4..54ec238fdef 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -54,6 +54,10 @@
#undef min
#undef max
+#if LL_WINDOWS
+#pragma optimize("", off)
+#endif
+
static const S32 NUM_TILES_X = 8;
static const S32 NUM_TILES_Y = 4;
static const S32 NUM_TILES = NUM_TILES_X * NUM_TILES_Y;
--
GitLab