From e38514f9fdb79efa77a1cf41cb4288e4cfbce932 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Sun, 9 Jun 2013 09:38:45 -0700
Subject: [PATCH] NORSPEC-246 WIP Fix macro bug that slipped past due to MSVC
promiscuity
---
indra/newview/llviewershadermgr.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index ff9b28bc372..a27621ecdce 100755
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -50,7 +50,7 @@
#define SINGLE_FP_PERMUTATION(shader) \
if (gGLManager.mIsMobileGF) \
{ \
- shader[i].addPermutation("SINGLE_FP_ONLY","1"); \
+ shader.addPermutation("SINGLE_FP_ONLY","1"); \
}
@@ -1304,7 +1304,7 @@ BOOL LLViewerShaderMgr::loadShadersDeferred()
bool has_skin = i & 0x10;
gDeferredMaterialProgram[i].addPermutation("HAS_SKIN",has_skin ? "1" : "0");
- SINGLE_FP_PERMUTATION(gDeferredMaterialProgram);
+ SINGLE_FP_PERMUTATION(gDeferredMaterialProgram[i]);
if (has_skin)
{
--
GitLab