From 004cc9107bd48166d87b239fb506532ac6330ef9 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 21 Oct 2011 15:51:49 -0500
Subject: [PATCH] SH-2240 Fix for OSX GLSL compiler not liking #ifndef
gl_FragData
---
.../newview/app_settings/shaders/class1/deferred/avatarF.glsl | 2 +-
indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl | 2 +-
.../newview/app_settings/shaders/class1/deferred/cloudsF.glsl | 2 +-
.../shaders/class1/deferred/diffuseAlphaMaskF.glsl | 2 +-
.../shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl | 2 +-
.../shaders/class1/deferred/diffuseAlphaMaskNoColorF.glsl | 2 +-
.../app_settings/shaders/class1/deferred/diffuseF.glsl | 2 +-
.../app_settings/shaders/class1/deferred/diffuseIndexedF.glsl | 2 +-
.../app_settings/shaders/class1/deferred/impostorF.glsl | 2 +-
indra/newview/app_settings/shaders/class1/deferred/skyF.glsl | 2 +-
.../newview/app_settings/shaders/class1/deferred/starsF.glsl | 2 +-
.../app_settings/shaders/class1/deferred/terrainF.glsl | 2 +-
indra/newview/app_settings/shaders/class1/deferred/treeF.glsl | 2 +-
.../newview/app_settings/shaders/class1/deferred/waterF.glsl | 2 +-
.../app_settings/shaders/class1/objects/fullbrightF.glsl | 4 ++--
15 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl b/indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl
index 945a1e71a52..9a3b2e3e8a5 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl
@@ -23,7 +23,7 @@
* $/LicenseInfo$
*/
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
out vec4 gl_FragData[3];
#endif
diff --git a/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl b/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl
index 463c61090f1..6cc5f23acaf 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl
@@ -23,7 +23,7 @@
* $/LicenseInfo$
*/
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
out vec4 gl_FragData[3];
#endif
diff --git a/indra/newview/app_settings/shaders/class1/deferred/cloudsF.glsl b/indra/newview/app_settings/shaders/class1/deferred/cloudsF.glsl
index 73e726fe15f..db272cf601e 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/cloudsF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/cloudsF.glsl
@@ -24,7 +24,7 @@
*/
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
out vec4 gl_FragData[3];
#endif
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl
index f3351c08bf8..14b79c37fd2 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl
@@ -23,7 +23,7 @@
* $/LicenseInfo$
*/
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
out vec4 gl_FragData[3];
#endif
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl
index 7d83b9a72c2..381fba8813e 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl
@@ -23,7 +23,7 @@
* $/LicenseInfo$
*/
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
out vec4 gl_FragData[3];
#endif
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskNoColorF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskNoColorF.glsl
index a24623d7b5e..b582ba7f9c5 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskNoColorF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskNoColorF.glsl
@@ -24,7 +24,7 @@
*/
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
out vec4 gl_FragData[3];
#endif
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl
index a8e5ae4a622..7bde49eb86b 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl
@@ -23,7 +23,7 @@
* $/LicenseInfo$
*/
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
out vec4 gl_FragData[3];
#endif
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl
index 9a0e511bef8..75b45111e0e 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl
@@ -23,7 +23,7 @@
* $/LicenseInfo$
*/
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
out vec4 gl_FragData[3];
#endif
diff --git a/indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl b/indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl
index a929c0e4f59..5decddebbbd 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl
@@ -23,7 +23,7 @@
* $/LicenseInfo$
*/
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
out vec4 gl_FragData[3];
#endif
diff --git a/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl b/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
index dac1ee1294f..96ad0aa93a3 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
@@ -23,7 +23,7 @@
* $/LicenseInfo$
*/
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
out vec4 gl_FragData[3];
#endif
diff --git a/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl b/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl
index 7986320c38d..03fccd27661 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl
@@ -23,7 +23,7 @@
* $/LicenseInfo$
*/
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
out vec4 gl_FragData[3];
#endif
diff --git a/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl b/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
index 3112a1ea7f8..e014e53d259 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
@@ -23,7 +23,7 @@
* $/LicenseInfo$
*/
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
out vec4 gl_FragData[3];
#endif
diff --git a/indra/newview/app_settings/shaders/class1/deferred/treeF.glsl b/indra/newview/app_settings/shaders/class1/deferred/treeF.glsl
index 06071056ac1..b934bc69919 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/treeF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/treeF.glsl
@@ -23,7 +23,7 @@
* $/LicenseInfo$
*/
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
out vec4 gl_FragData[3];
#endif
diff --git a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
index 43cd4c2eed8..4c9ea24a249 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
@@ -25,7 +25,7 @@
#extension GL_ARB_texture_rectangle : enable
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
out vec4 gl_FragData[3];
#endif
diff --git a/indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl
index 0fab5e50010..d2de1980a60 100644
--- a/indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
+ * $/LicenseInfo$F
*/
@@ -28,6 +28,6 @@
void fullbright_lighting();
void main()
-{
+{F
fullbright_lighting();
}
--
GitLab