[iortcw] 245/497: All: Rend2: Remove lightmap support from generic glsl shader

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 6b79c3b5dbbdda902c64ac679f52eb7ee463df1a
Author: m4n4t4...@gmail.com 

Date:   Thu Nov 13 23:48:16 2014 +

All: Rend2: Remove lightmap support from generic glsl shader
---
 MP/code/rend2/glsl/generic_fp.glsl |  33 
 MP/code/rend2/glsl/generic_vp.glsl |   9 +--
 MP/code/rend2/tr_glsl.c|  12 ---
 MP/code/rend2/tr_local.h   |  12 +--
 MP/code/rend2/tr_shade.c   |  11 ---
 MP/code/rend2/tr_shader.c  | 161 -
 SP/code/rend2/glsl/generic_fp.glsl |  33 
 SP/code/rend2/glsl/generic_vp.glsl |   9 +--
 SP/code/rend2/tr_glsl.c|  12 ---
 SP/code/rend2/tr_local.h   |  12 +--
 SP/code/rend2/tr_shade.c   |  11 ---
 SP/code/rend2/tr_shader.c  | 161 -
 12 files changed, 10 insertions(+), 466 deletions(-)

diff --git a/MP/code/rend2/glsl/generic_fp.glsl 
b/MP/code/rend2/glsl/generic_fp.glsl
index aefa33c..50db078 100644
--- a/MP/code/rend2/glsl/generic_fp.glsl
+++ b/MP/code/rend2/glsl/generic_fp.glsl
@@ -1,45 +1,12 @@
 uniform sampler2D u_DiffuseMap;
 
-#if defined(USE_LIGHTMAP)
-uniform sampler2D u_LightMap;
-
-uniform int   u_Texture1Env;
-#endif
-
 varying vec2  var_DiffuseTex;
 
-#if defined(USE_LIGHTMAP)
-varying vec2  var_LightTex;
-#endif
-
 varying vec4  var_Color;
 
 
 void main()
 {
vec4 color  = texture2D(u_DiffuseMap, var_DiffuseTex);
-#if defined(USE_LIGHTMAP)
-   vec4 color2 = texture2D(u_LightMap, var_LightTex);
-  #if defined(RGBM_LIGHTMAP)
-   color2.rgb *= color2.a;
-   color2.a = 1.0;
-  #endif
-
-   if (u_Texture1Env == TEXENV_MODULATE)
-   {
-   color *= color2;
-   }
-   else if (u_Texture1Env == TEXENV_ADD)
-   {
-   color += color2;
-   }
-   else if (u_Texture1Env == TEXENV_REPLACE)
-   {
-   color = color2;
-   }
-   
-   //color = color * (u_Texture1Env. + color2 * u_Texture1Env.z) + 
color2 * u_Texture1Env.y;
-#endif
-
gl_FragColor = color * var_Color;
 }
diff --git a/MP/code/rend2/glsl/generic_vp.glsl 
b/MP/code/rend2/glsl/generic_vp.glsl
index 8dc86d7..e04b201 100644
--- a/MP/code/rend2/glsl/generic_vp.glsl
+++ b/MP/code/rend2/glsl/generic_vp.glsl
@@ -9,7 +9,7 @@ attribute vec3 attr_Normal2;
 attribute vec4 attr_Color;
 attribute vec4 attr_TexCoord0;
 
-#if defined(USE_LIGHTMAP) || defined(USE_TCGEN)
+#if defined(USE_TCGEN)
 attribute vec4 attr_TexCoord1;
 #endif
 
@@ -57,9 +57,6 @@ uniform float  u_VertexLerp;
 #endif
 
 varying vec2   var_DiffuseTex;
-#if defined(USE_LIGHTMAP)
-varying vec2   var_LightTex;
-#endif
 varying vec4   var_Color;
 
 #if defined(USE_DEFORM_VERTEXES)
@@ -236,10 +233,6 @@ void main()
 var_DiffuseTex = tex;
 #endif
 
-#if defined(USE_LIGHTMAP)
-   var_LightTex = attr_TexCoord1.st;
-#endif
-
 #if defined(USE_RGBAGEN)
var_Color = CalcColor(position, normal);
 #else
diff --git a/MP/code/rend2/tr_glsl.c b/MP/code/rend2/tr_glsl.c
index ef2820a..074218d 100644
--- a/MP/code/rend2/tr_glsl.c
+++ b/MP/code/rend2/tr_glsl.c
@@ -90,7 +90,6 @@ static uniformInfo_t uniformsInfo[] =
 
{ "u_DiffuseTexMatrix",  GLSL_VEC4 },
{ "u_DiffuseTexOffTurb", GLSL_VEC4 },
-   { "u_Texture1Env",   GLSL_INT },
 
{ "u_TCGen0",GLSL_INT },
{ "u_TCGen0Vector0", GLSL_VEC3 },
@@ -919,18 +918,12 @@ void GLSL_InitGPUShaders(void)
if (i & GENERICDEF_USE_RGBAGEN)
Q_strcat(extradefines, 1024, "#define USE_RGBAGEN\n");
 
-   if (i & GENERICDEF_USE_LIGHTMAP)
-   Q_strcat(extradefines, 1024, "#define USE_LIGHTMAP\n");
-
if (i & GENERICDEF_USE_WOLF_FOG_LINEAR)
Q_strcat(extradefines, 1024, "#define 
USE_WOLF_FOG_LINEAR\n");

if (i & GENERICDEF_USE_WOLF_FOG_EXPONENTIAL)
Q_strcat(extradefines, 1024, "#define 
USE_WOLF_FOG_EXPONENTIAL\n");
 
-   if (r_hdr->integer && !glRefConfig.floatLightmap)
-   Q_strcat(extradefines, 1024, "#define RGBM_LIGHTMAP\n");
-
if (!GLSL_InitGPUShader([i], "generic", 
attribs, qtrue, extradefines, qtrue, fallbackShader_generic_vp, 
fallbackShader_generic_fp))
{
ri.Error(ERR_FATAL, "Could not load generic shader!");
@@ -1518,11 +1511,6 @@ shaderProgram_t *GLSL_GetGenericShaderProgram(int stage, 
glfog_t *glFog)
shaderAttribs |= GENERICDEF_USE_WOLF_FOG_EXPONENTIAL;
}
 
-   if (pStage->bundle[1].image[0] && tess.shader->multitextureEnv)
-   {
-   shaderAttribs |= GENERICDEF_USE_LIGHTMAP;
-   }
-
switch (pStage->rgbGen)
{

[iortcw] 245/497: All: Rend2: Remove lightmap support from generic glsl shader

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 6b79c3b5dbbdda902c64ac679f52eb7ee463df1a
Author: m4n4t4...@gmail.com 

Date:   Thu Nov 13 23:48:16 2014 +

All: Rend2: Remove lightmap support from generic glsl shader
---
 MP/code/rend2/glsl/generic_fp.glsl |  33 
 MP/code/rend2/glsl/generic_vp.glsl |   9 +--
 MP/code/rend2/tr_glsl.c|  12 ---
 MP/code/rend2/tr_local.h   |  12 +--
 MP/code/rend2/tr_shade.c   |  11 ---
 MP/code/rend2/tr_shader.c  | 161 -
 SP/code/rend2/glsl/generic_fp.glsl |  33 
 SP/code/rend2/glsl/generic_vp.glsl |   9 +--
 SP/code/rend2/tr_glsl.c|  12 ---
 SP/code/rend2/tr_local.h   |  12 +--
 SP/code/rend2/tr_shade.c   |  11 ---
 SP/code/rend2/tr_shader.c  | 161 -
 12 files changed, 10 insertions(+), 466 deletions(-)

diff --git a/MP/code/rend2/glsl/generic_fp.glsl 
b/MP/code/rend2/glsl/generic_fp.glsl
index aefa33c..50db078 100644
--- a/MP/code/rend2/glsl/generic_fp.glsl
+++ b/MP/code/rend2/glsl/generic_fp.glsl
@@ -1,45 +1,12 @@
 uniform sampler2D u_DiffuseMap;
 
-#if defined(USE_LIGHTMAP)
-uniform sampler2D u_LightMap;
-
-uniform int   u_Texture1Env;
-#endif
-
 varying vec2  var_DiffuseTex;
 
-#if defined(USE_LIGHTMAP)
-varying vec2  var_LightTex;
-#endif
-
 varying vec4  var_Color;
 
 
 void main()
 {
vec4 color  = texture2D(u_DiffuseMap, var_DiffuseTex);
-#if defined(USE_LIGHTMAP)
-   vec4 color2 = texture2D(u_LightMap, var_LightTex);
-  #if defined(RGBM_LIGHTMAP)
-   color2.rgb *= color2.a;
-   color2.a = 1.0;
-  #endif
-
-   if (u_Texture1Env == TEXENV_MODULATE)
-   {
-   color *= color2;
-   }
-   else if (u_Texture1Env == TEXENV_ADD)
-   {
-   color += color2;
-   }
-   else if (u_Texture1Env == TEXENV_REPLACE)
-   {
-   color = color2;
-   }
-   
-   //color = color * (u_Texture1Env. + color2 * u_Texture1Env.z) + 
color2 * u_Texture1Env.y;
-#endif
-
gl_FragColor = color * var_Color;
 }
diff --git a/MP/code/rend2/glsl/generic_vp.glsl 
b/MP/code/rend2/glsl/generic_vp.glsl
index 8dc86d7..e04b201 100644
--- a/MP/code/rend2/glsl/generic_vp.glsl
+++ b/MP/code/rend2/glsl/generic_vp.glsl
@@ -9,7 +9,7 @@ attribute vec3 attr_Normal2;
 attribute vec4 attr_Color;
 attribute vec4 attr_TexCoord0;
 
-#if defined(USE_LIGHTMAP) || defined(USE_TCGEN)
+#if defined(USE_TCGEN)
 attribute vec4 attr_TexCoord1;
 #endif
 
@@ -57,9 +57,6 @@ uniform float  u_VertexLerp;
 #endif
 
 varying vec2   var_DiffuseTex;
-#if defined(USE_LIGHTMAP)
-varying vec2   var_LightTex;
-#endif
 varying vec4   var_Color;
 
 #if defined(USE_DEFORM_VERTEXES)
@@ -236,10 +233,6 @@ void main()
 var_DiffuseTex = tex;
 #endif
 
-#if defined(USE_LIGHTMAP)
-   var_LightTex = attr_TexCoord1.st;
-#endif
-
 #if defined(USE_RGBAGEN)
var_Color = CalcColor(position, normal);
 #else
diff --git a/MP/code/rend2/tr_glsl.c b/MP/code/rend2/tr_glsl.c
index ef2820a..074218d 100644
--- a/MP/code/rend2/tr_glsl.c
+++ b/MP/code/rend2/tr_glsl.c
@@ -90,7 +90,6 @@ static uniformInfo_t uniformsInfo[] =
 
{ "u_DiffuseTexMatrix",  GLSL_VEC4 },
{ "u_DiffuseTexOffTurb", GLSL_VEC4 },
-   { "u_Texture1Env",   GLSL_INT },
 
{ "u_TCGen0",GLSL_INT },
{ "u_TCGen0Vector0", GLSL_VEC3 },
@@ -919,18 +918,12 @@ void GLSL_InitGPUShaders(void)
if (i & GENERICDEF_USE_RGBAGEN)
Q_strcat(extradefines, 1024, "#define USE_RGBAGEN\n");
 
-   if (i & GENERICDEF_USE_LIGHTMAP)
-   Q_strcat(extradefines, 1024, "#define USE_LIGHTMAP\n");
-
if (i & GENERICDEF_USE_WOLF_FOG_LINEAR)
Q_strcat(extradefines, 1024, "#define 
USE_WOLF_FOG_LINEAR\n");

if (i & GENERICDEF_USE_WOLF_FOG_EXPONENTIAL)
Q_strcat(extradefines, 1024, "#define 
USE_WOLF_FOG_EXPONENTIAL\n");
 
-   if (r_hdr->integer && !glRefConfig.floatLightmap)
-   Q_strcat(extradefines, 1024, "#define RGBM_LIGHTMAP\n");
-
if (!GLSL_InitGPUShader([i], "generic", 
attribs, qtrue, extradefines, qtrue, fallbackShader_generic_vp, 
fallbackShader_generic_fp))
{
ri.Error(ERR_FATAL, "Could not load generic shader!");
@@ -1518,11 +1511,6 @@ shaderProgram_t *GLSL_GetGenericShaderProgram(int stage, 
glfog_t *glFog)
shaderAttribs |= GENERICDEF_USE_WOLF_FOG_EXPONENTIAL;
}
 
-   if (pStage->bundle[1].image[0] && tess.shader->multitextureEnv)
-   {
-   shaderAttribs |= GENERICDEF_USE_LIGHTMAP;
-   }
-
switch (pStage->rgbGen)
{