From df3df9de4fb47cf00f51f5bcaab82ac4ca48bf74 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Sun, 9 Jun 2013 21:12:40 -0700
Subject: [PATCH] NORSPEC-246 fix shader compile errors from missing return

---
 .../newview/app_settings/shaders/class1/deferred/blurLightF.glsl | 1 +
 .../newview/app_settings/shaders/class1/deferred/materialF.glsl  | 1 +
 .../app_settings/shaders/class1/deferred/multiPointLightF.glsl   | 1 +
 .../app_settings/shaders/class1/deferred/multiSpotLightF.glsl    | 1 +
 .../app_settings/shaders/class1/deferred/pointLightF.glsl        | 1 +
 .../app_settings/shaders/class1/deferred/softenLightF.glsl       | 1 +
 .../newview/app_settings/shaders/class1/deferred/spotLightF.glsl | 1 +
 .../app_settings/shaders/class1/deferred/sunLightSSAOF.glsl      | 1 +
 .../app_settings/shaders/class2/deferred/multiSpotLightF.glsl    | 1 +
 .../app_settings/shaders/class2/deferred/softenLightF.glsl       | 1 +
 .../newview/app_settings/shaders/class2/deferred/spotLightF.glsl | 1 +
 .../newview/app_settings/shaders/class2/deferred/sunLightF.glsl  | 1 +
 .../app_settings/shaders/class2/deferred/sunLightSSAOF.glsl      | 1 +
 13 files changed, 13 insertions(+)

diff --git a/indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl
index d071801e2d3..589ace086db 100755
--- a/indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/blurLightF.glsl
@@ -69,6 +69,7 @@ vec2 encode_normal(vec3 n)
 {
 	vec2 sn;
 	sn.xy = (n.xy * vec2(0.5f,0.5f)) + vec2(0.5f,0.5f);
+	return sn;
 }
 
 vec3 decode_normal (vec2 enc)
diff --git a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
index f58c69deaad..f2decdfa7dc 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
@@ -431,6 +431,7 @@ vec2 encode_normal(vec3 n)
 {
 	vec2 sn;
 	sn.xy = (n.xy * vec2(0.5f,0.5f)) + vec2(0.5f,0.5f);
+	return sn;
 }
 
 vec3 decode_normal (vec2 enc)
diff --git a/indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
index e27250e13e3..722020ccfe6 100755
--- a/indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
@@ -61,6 +61,7 @@ vec2 encode_normal(vec3 n)
 {
 	vec2 sn;
 	sn.xy = (n.xy * vec2(0.5f,0.5f)) + vec2(0.5f,0.5f);
+	return sn;
 }
 
 vec3 decode_normal (vec2 enc)
diff --git a/indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
index ca3fcdcadb8..e99d7ee6266 100755
--- a/indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/multiSpotLightF.glsl
@@ -72,6 +72,7 @@ vec2 encode_normal(vec3 n)
 {
 	vec2 sn;
 	sn.xy = (n.xy * vec2(0.5f,0.5f)) + vec2(0.5f,0.5f);
+	return sn;
 }
 
 vec3 decode_normal (vec2 enc)
diff --git a/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
index 850988a6045..77d59c6ecfa 100755
--- a/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
@@ -59,6 +59,7 @@ vec2 encode_normal(vec3 n)
 {
 	vec2 sn;
 	sn.xy = (n.xy * vec2(0.5f,0.5f)) + vec2(0.5f,0.5f);
+	return sn;
 }
 
 vec3 decode_normal (vec2 enc)
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
index e94201df416..f7920f75954 100755
--- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl
@@ -83,6 +83,7 @@ vec2 encode_normal(vec3 n)
 {
 	vec2 sn;
 	sn.xy = (n.xy * vec2(0.5f,0.5f)) + vec2(0.5f,0.5f);
+	return sn;
 }
 
 vec3 decode_normal (vec2 enc)
diff --git a/indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
index 879953b4761..4e1add3e56d 100755
--- a/indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/spotLightF.glsl
@@ -70,6 +70,7 @@ vec2 encode_normal(vec3 n)
 {
 	vec2 sn;
 	sn.xy = (n.xy * vec2(0.5f,0.5f)) + vec2(0.5f,0.5f);
+	return sn;
 }
 
 vec3 decode_normal (vec2 enc)
diff --git a/indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl b/indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl
index 6d3b3e23de3..14d35d1f0f2 100755
--- a/indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/sunLightSSAOF.glsl
@@ -54,6 +54,7 @@ vec2 encode_normal(vec3 n)
 {
 	vec2 sn;
 	sn.xy = (n.xy * vec2(0.5f,0.5f)) + vec2(0.5f,0.5f);
+	return sn;
 }
 
 vec3 decode_normal (vec2 enc)
diff --git a/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
index db60c8ea514..2300487a90f 100755
--- a/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl
@@ -73,6 +73,7 @@ vec2 encode_normal(vec3 n)
 {
 	vec2 sn;
 	sn.xy = (n.xy * vec2(0.5f,0.5f)) + vec2(0.5f,0.5f);
+	return sn;
 }
 
 vec3 decode_normal (vec2 enc)
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index 08b456dd967..520b3bbd47e 100755
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -83,6 +83,7 @@ vec2 encode_normal(vec3 n)
 {
 	vec2 sn;
 	sn.xy = (n.xy * vec2(0.5f,0.5f)) + vec2(0.5f,0.5f);
+	return sn;
 }
 
 vec3 decode_normal (vec2 enc)
diff --git a/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
index 4fc9a6ad87e..9e062e46d72 100755
--- a/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl
@@ -73,6 +73,7 @@ vec2 encode_normal(vec3 n)
 {
 	vec2 sn;
 	sn.xy = (n.xy * vec2(0.5f,0.5f)) + vec2(0.5f,0.5f);
+	return sn;
 }
 
 vec3 decode_normal (vec2 enc)
diff --git a/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl
index c1ed32f7e7c..334baad8b4d 100755
--- a/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/sunLightF.glsl
@@ -70,6 +70,7 @@ vec2 encode_normal(vec3 n)
 {
 	vec2 sn;
 	sn.xy = (n.xy * vec2(0.5f,0.5f)) + vec2(0.5f,0.5f);
+	return sn;
 }
 
 vec3 decode_normal (vec2 enc)
diff --git a/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl b/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl
index 8a029109a67..cfce215fafd 100755
--- a/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/sunLightSSAOF.glsl
@@ -71,6 +71,7 @@ vec2 encode_normal(vec3 n)
 {
 	vec2 sn;
 	sn.xy = (n.xy * vec2(0.5f,0.5f)) + vec2(0.5f,0.5f);
+	return sn;
 }
 
 vec3 decode_normal (vec2 enc)
-- 
GitLab