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 724d1f70ce194bd392e7a15ad2f79621c2e8d862
Author: m4n4t4...@gmail.com
<m4n4t4...@gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date: Fri Feb 21 13:41:39 2014 +0000
All: Rend2: Remove and force r_softOverbright
---
MP/code/rend2/tr_image.c | 41 +++++------------------------------------
MP/code/rend2/tr_init.c | 4 ----
MP/code/rend2/tr_local.h | 2 --
MP/code/rend2/tr_shade.c | 2 +-
MP/code/rend2/tr_sky.c | 4 ++--
SP/code/rend2/tr_image.c | 41 +++++------------------------------------
SP/code/rend2/tr_init.c | 4 ----
SP/code/rend2/tr_local.h | 2 --
SP/code/rend2/tr_shade.c | 2 +-
SP/code/rend2/tr_sky.c | 4 ++--
10 files changed, 16 insertions(+), 90 deletions(-)
diff --git a/MP/code/rend2/tr_image.c b/MP/code/rend2/tr_image.c
index 30ce0d1..3320cba 100644
--- a/MP/code/rend2/tr_image.c
+++ b/MP/code/rend2/tr_image.c
@@ -3247,37 +3247,14 @@ void R_SetColorMappings( void ) {
int i, j;
float g;
int inf;
- int shift;
// setup the overbright lighting
tr.overbrightBits = r_overBrightBits->integer;
- if ( !glConfig.deviceSupportsGamma ) {
- tr.overbrightBits = 0; // need hardware gamma for
overbright
- }
-
- // never overbright in windowed mode without soft overbright
- if ( !glConfig.isFullscreen && !r_softOverbright->integer )
- {
- tr.overbrightBits = 0;
- }
-
- // never overbright with tonemapping
- if ( r_toneMap->integer && r_hdr->integer )
- {
- tr.overbrightBits = 0;
- }
- // allow 2 overbright bits in 24 bit, but only 1 in 16 bit
- if ( glConfig.colorBits > 16 ) {
- if ( tr.overbrightBits > 2 ) {
- tr.overbrightBits = 2;
- }
- } else {
- if ( tr.overbrightBits > 1 ) {
- tr.overbrightBits = 1;
- }
- }
- if ( tr.overbrightBits < 0 ) {
+ // allow 2 overbright bits
+ if ( tr.overbrightBits > 2 ) {
+ tr.overbrightBits = 2;
+ } else if ( tr.overbrightBits < 0 ) {
tr.overbrightBits = 0;
}
@@ -3297,14 +3274,6 @@ void R_SetColorMappings( void ) {
g = r_gamma->value;
- shift = tr.overbrightBits;
-
- // no shift with soft overbright
- if (r_softOverbright->integer)
- {
- shift = 0;
- }
-
for ( i = 0; i < 256; i++ ) {
int i2;
@@ -3322,7 +3291,7 @@ void R_SetColorMappings( void ) {
} else {
inf = 255 * pow ( i2/255.0f, 1.0f / g ) + 0.5f;
}
- inf <<= shift;
+
if ( inf < 0 ) {
inf = 0;
}
diff --git a/MP/code/rend2/tr_init.c b/MP/code/rend2/tr_init.c
index 6611776..43f1442 100644
--- a/MP/code/rend2/tr_init.c
+++ b/MP/code/rend2/tr_init.c
@@ -130,8 +130,6 @@ cvar_t *r_mergeLeafSurfaces;
cvar_t *r_cameraExposure;
-cvar_t *r_softOverbright;
-
cvar_t *r_hdr;
cvar_t *r_floatLightmap;
cvar_t *r_postProcess;
@@ -1278,8 +1276,6 @@ void R_Register( void ) {
r_greyscale = ri.Cvar_Get("r_greyscale", "0", CVAR_ARCHIVE |
CVAR_LATCH);
ri.Cvar_CheckRange(r_greyscale, 0, 1, qfalse);
- r_softOverbright = ri.Cvar_Get( "r_softOverbright", "1", CVAR_ARCHIVE |
CVAR_LATCH );
-
r_hdr = ri.Cvar_Get( "r_hdr", "1", CVAR_ARCHIVE | CVAR_LATCH );
r_floatLightmap = ri.Cvar_Get( "r_floatLightmap", "0", CVAR_ARCHIVE |
CVAR_LATCH );
r_postProcess = ri.Cvar_Get( "r_postProcess", "1", CVAR_ARCHIVE );
diff --git a/MP/code/rend2/tr_local.h b/MP/code/rend2/tr_local.h
index f1b87ce..c854836 100644
--- a/MP/code/rend2/tr_local.h
+++ b/MP/code/rend2/tr_local.h
@@ -1961,8 +1961,6 @@ extern cvar_t *r_anaglyphMode;
extern cvar_t *r_mergeMultidraws;
extern cvar_t *r_mergeLeafSurfaces;
-extern cvar_t *r_softOverbright;
-
extern cvar_t *r_hdr;
extern cvar_t *r_floatLightmap;
extern cvar_t *r_postProcess;
diff --git a/MP/code/rend2/tr_shade.c b/MP/code/rend2/tr_shade.c
index d970f90..73b0f85 100644
--- a/MP/code/rend2/tr_shade.c
+++ b/MP/code/rend2/tr_shade.c
@@ -621,7 +621,7 @@ static void ComputeShaderColors( shaderStage_t *pStage,
vec4_t baseColor, vec4_t
}
// multiply color by overbrightbits if this isn't a blend
- if (r_softOverbright->integer && tr.overbrightBits
+ if (tr.overbrightBits
&& !((blend & GLS_SRCBLEND_BITS) == GLS_SRCBLEND_DST_COLOR)
&& !((blend & GLS_SRCBLEND_BITS) == GLS_SRCBLEND_ONE_MINUS_DST_COLOR)
&& !((blend & GLS_DSTBLEND_BITS) == GLS_DSTBLEND_SRC_COLOR)
diff --git a/MP/code/rend2/tr_sky.c b/MP/code/rend2/tr_sky.c
index d7bb2b6..2918c56 100644
--- a/MP/code/rend2/tr_sky.c
+++ b/MP/code/rend2/tr_sky.c
@@ -463,7 +463,7 @@ static void DrawSkySide( struct image_s *image, const int
mins[2], const int max
color[0] =
color[1] =
- color[2] = (r_softOverbright->integer ? 1.0 : tr.identityLight)
* backEnd.refdef.colorScale;
+ color[2] = backEnd.refdef.colorScale;
color[3] = 1.0f;
GLSL_SetUniformVec4(sp, UNIFORM_BASECOLOR, color);
@@ -582,7 +582,7 @@ static void DrawSkySideInner( struct image_s *image, const
int mins[2], const in
color[0] =
color[1] =
- color[2] = (r_softOverbright->integer ? 1.0 : tr.identityLight)
* backEnd.refdef.colorScale;
+ color[2] = backEnd.refdef.colorScale;
color[3] = 1.0f;
GLSL_SetUniformVec4(sp, UNIFORM_BASECOLOR, color);
diff --git a/SP/code/rend2/tr_image.c b/SP/code/rend2/tr_image.c
index eecf23d..dec31e6 100644
--- a/SP/code/rend2/tr_image.c
+++ b/SP/code/rend2/tr_image.c
@@ -3258,37 +3258,14 @@ void R_SetColorMappings( void ) {
int i, j;
float g;
int inf;
- int shift;
// setup the overbright lighting
tr.overbrightBits = r_overBrightBits->integer;
- if ( !glConfig.deviceSupportsGamma ) {
- tr.overbrightBits = 0; // need hardware gamma for
overbright
- }
-
- // never overbright in windowed mode without soft overbright
- if ( !glConfig.isFullscreen && !r_softOverbright->integer )
- {
- tr.overbrightBits = 0;
- }
-
- // never overbright with tonemapping
- if ( r_toneMap->integer && r_hdr->integer )
- {
- tr.overbrightBits = 0;
- }
- // allow 2 overbright bits in 24 bit, but only 1 in 16 bit
- if ( glConfig.colorBits > 16 ) {
- if ( tr.overbrightBits > 2 ) {
- tr.overbrightBits = 2;
- }
- } else {
- if ( tr.overbrightBits > 1 ) {
- tr.overbrightBits = 1;
- }
- }
- if ( tr.overbrightBits < 0 ) {
+ // allow 2 overbright bits
+ if ( tr.overbrightBits > 2 ) {
+ tr.overbrightBits = 2;
+ } else if ( tr.overbrightBits < 0 ) {
tr.overbrightBits = 0;
}
@@ -3308,14 +3285,6 @@ void R_SetColorMappings( void ) {
g = r_gamma->value;
- shift = tr.overbrightBits;
-
- // no shift with soft overbright
- if (r_softOverbright->integer)
- {
- shift = 0;
- }
-
for ( i = 0; i < 256; i++ ) {
int i2;
@@ -3333,7 +3302,7 @@ void R_SetColorMappings( void ) {
} else {
inf = 255 * pow( i2 / 255.0f, 1.0f / g ) + 0.5f;
}
- inf <<= shift;
+
if ( inf < 0 ) {
inf = 0;
}
diff --git a/SP/code/rend2/tr_init.c b/SP/code/rend2/tr_init.c
index 7182ddd..2b11fad 100644
--- a/SP/code/rend2/tr_init.c
+++ b/SP/code/rend2/tr_init.c
@@ -136,8 +136,6 @@ cvar_t *r_mergeLeafSurfaces;
cvar_t *r_cameraExposure;
-cvar_t *r_softOverbright;
-
cvar_t *r_hdr;
cvar_t *r_floatLightmap;
cvar_t *r_postProcess;
@@ -1302,8 +1300,6 @@ void R_Register( void ) {
r_greyscale = ri.Cvar_Get("r_greyscale", "0", CVAR_ARCHIVE |
CVAR_LATCH);
ri.Cvar_CheckRange(r_greyscale, 0, 1, qfalse);
- r_softOverbright = ri.Cvar_Get( "r_softOverbright", "1", CVAR_ARCHIVE |
CVAR_LATCH );
-
r_hdr = ri.Cvar_Get( "r_hdr", "1", CVAR_ARCHIVE | CVAR_LATCH );
r_floatLightmap = ri.Cvar_Get( "r_floatLightmap", "0", CVAR_ARCHIVE |
CVAR_LATCH );
r_postProcess = ri.Cvar_Get( "r_postProcess", "1", CVAR_ARCHIVE );
diff --git a/SP/code/rend2/tr_local.h b/SP/code/rend2/tr_local.h
index f378f00..aaf6071 100644
--- a/SP/code/rend2/tr_local.h
+++ b/SP/code/rend2/tr_local.h
@@ -1980,8 +1980,6 @@ extern cvar_t *r_anaglyphMode;
extern cvar_t *r_mergeMultidraws;
extern cvar_t *r_mergeLeafSurfaces;
-extern cvar_t *r_softOverbright;
-
extern cvar_t *r_hdr;
extern cvar_t *r_floatLightmap;
extern cvar_t *r_postProcess;
diff --git a/SP/code/rend2/tr_shade.c b/SP/code/rend2/tr_shade.c
index d0d4079..ee920ac 100644
--- a/SP/code/rend2/tr_shade.c
+++ b/SP/code/rend2/tr_shade.c
@@ -615,7 +615,7 @@ static void ComputeShaderColors( shaderStage_t *pStage,
vec4_t baseColor, vec4_t
}
// multiply color by overbrightbits if this isn't a blend
- if (r_softOverbright->integer && tr.overbrightBits
+ if (tr.overbrightBits
&& !((blend & GLS_SRCBLEND_BITS) == GLS_SRCBLEND_DST_COLOR)
&& !((blend & GLS_SRCBLEND_BITS) == GLS_SRCBLEND_ONE_MINUS_DST_COLOR)
&& !((blend & GLS_DSTBLEND_BITS) == GLS_DSTBLEND_SRC_COLOR)
diff --git a/SP/code/rend2/tr_sky.c b/SP/code/rend2/tr_sky.c
index a0e4bb1..852ffff 100644
--- a/SP/code/rend2/tr_sky.c
+++ b/SP/code/rend2/tr_sky.c
@@ -460,7 +460,7 @@ static void DrawSkySide( struct image_s *image, const int
mins[2], const int max
color[0] =
color[1] =
- color[2] = (r_softOverbright->integer ? 1.0 : tr.identityLight)
* backEnd.refdef.colorScale;
+ color[2] = backEnd.refdef.colorScale;
color[3] = 1.0f;
GLSL_SetUniformVec4(sp, UNIFORM_BASECOLOR, color);
@@ -579,7 +579,7 @@ static void DrawSkySideInner( struct image_s *image, const
int mins[2], const in
color[0] =
color[1] =
- color[2] = (r_softOverbright->integer ? 1.0 : tr.identityLight)
* backEnd.refdef.colorScale;
+ color[2] = backEnd.refdef.colorScale;
color[3] = 1.0f;
GLSL_SetUniformVec4(sp, UNIFORM_BASECOLOR, color);
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
