[iortcw] 60/95: All: Remove dead legacy ansiotropy settings
Simon McVittie
smcv at debian.org
Fri Sep 8 10:42:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to tag 1.51
in repository iortcw.
commit 4c4ea22c7a3787da19f41ecccc25752ac0ff5ef2
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date: Sat May 6 10:45:52 2017 -0400
All: Remove dead legacy ansiotropy settings
---
MP/code/rend2/tr_init.c | 7 +++++--
MP/code/renderer/tr_init.c | 8 ++++++--
SP/code/rend2/tr_init.c | 6 +++++-
SP/code/renderer/tr_init.c | 8 ++++++--
4 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/MP/code/rend2/tr_init.c b/MP/code/rend2/tr_init.c
index 94b37a2..245fe70 100644
--- a/MP/code/rend2/tr_init.c
+++ b/MP/code/rend2/tr_init.c
@@ -1085,9 +1085,11 @@ void GL_SetDefaultState( void ) {
// ATI pn_triangles
if ( qglPNTrianglesiATI ) {
int maxtess;
+
// get max supported tesselation
qglGetIntegerv( GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI, (GLint*)&maxtess );
glConfig.ATIMaxTruformTess = maxtess;
+
// cap if necessary
if ( r_ati_truform_tess->value > maxtess ) {
ri.Cvar_Set( "r_ati_truform_tess", va( "%d", maxtess ) );
@@ -1097,6 +1099,7 @@ void GL_SetDefaultState( void ) {
qglPNTrianglesiATI( GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI, r_ati_truform_tess->value );
}
+#if 0
if ( glConfig.anisotropicAvailable ) {
float maxAnisotropy;
@@ -1104,9 +1107,9 @@ void GL_SetDefaultState( void ) {
glConfig.maxAnisotropy = maxAnisotropy;
// set when rendering
-// qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, glConfig.maxAnisotropy);
+ //qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, glConfig.maxAnisotropy);
}
-
+#endif
//----(SA) end
}
diff --git a/MP/code/renderer/tr_init.c b/MP/code/renderer/tr_init.c
index 1e279d7..63b7886 100644
--- a/MP/code/renderer/tr_init.c
+++ b/MP/code/renderer/tr_init.c
@@ -997,9 +997,11 @@ void GL_SetDefaultState( void ) {
// ATI pn_triangles
if ( qglPNTrianglesiATI ) {
int maxtess;
+
// get max supported tesselation
qglGetIntegerv( GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI, (GLint*)&maxtess );
glConfig.ATIMaxTruformTess = maxtess;
+
// cap if necessary
if ( r_ati_truform_tess->value > maxtess ) {
ri.Cvar_Set( "r_ati_truform_tess", va( "%d", maxtess ) );
@@ -1008,9 +1010,9 @@ void GL_SetDefaultState( void ) {
// set Wolf defaults
qglPNTrianglesiATI( GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI, r_ati_truform_tess->value );
}
-//----(SA) end
#endif
+#if 0
if ( glConfig.anisotropicAvailable ) {
float maxAnisotropy;
@@ -1018,8 +1020,10 @@ void GL_SetDefaultState( void ) {
glConfig.maxAnisotropy = maxAnisotropy;
// set when rendering
-// qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, glConfig.maxAnisotropy);
+ //qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, glConfig.maxAnisotropy);
}
+#endif
+//----(SA) end
}
/*
diff --git a/SP/code/rend2/tr_init.c b/SP/code/rend2/tr_init.c
index 1812c34..3278ac2 100644
--- a/SP/code/rend2/tr_init.c
+++ b/SP/code/rend2/tr_init.c
@@ -1089,9 +1089,11 @@ void GL_SetDefaultState( void ) {
// ATI pn_triangles
if ( qglPNTrianglesiATI ) {
int maxtess;
+
// get max supported tesselation
qglGetIntegerv( GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI, (GLint*)&maxtess );
glConfig.ATIMaxTruformTess = maxtess;
+
// cap if necessary
if ( r_ati_truform_tess->value > maxtess ) {
ri.Cvar_Set( "r_ati_truform_tess", va( "%d", maxtess ) );
@@ -1101,6 +1103,7 @@ void GL_SetDefaultState( void ) {
qglPNTrianglesiATI( GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI, r_ati_truform_tess->value );
}
+#if 0
if ( glConfig.anisotropicAvailable ) {
float maxAnisotropy;
@@ -1108,8 +1111,9 @@ void GL_SetDefaultState( void ) {
glConfig.maxAnisotropy = maxAnisotropy;
// set when rendering
-// qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, glConfig.maxAnisotropy);
+ //qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, glConfig.maxAnisotropy);
}
+#endif
//----(SA) end
}
diff --git a/SP/code/renderer/tr_init.c b/SP/code/renderer/tr_init.c
index bd30f6d..6b1df45 100644
--- a/SP/code/renderer/tr_init.c
+++ b/SP/code/renderer/tr_init.c
@@ -1000,9 +1000,11 @@ void GL_SetDefaultState( void ) {
// ATI pn_triangles
if ( qglPNTrianglesiATI ) {
int maxtess;
+
// get max supported tesselation
qglGetIntegerv( GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI, (GLint*)&maxtess );
glConfig.ATIMaxTruformTess = maxtess;
+
// cap if necessary
if ( r_ati_truform_tess->value > maxtess ) {
ri.Cvar_Set( "r_ati_truform_tess", va( "%d", maxtess ) );
@@ -1011,9 +1013,9 @@ void GL_SetDefaultState( void ) {
// set Wolf defaults
qglPNTrianglesiATI( GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI, r_ati_truform_tess->value );
}
-//----(SA) end
#endif
+#if 0
if ( glConfig.anisotropicAvailable ) {
float maxAnisotropy;
@@ -1021,8 +1023,10 @@ void GL_SetDefaultState( void ) {
glConfig.maxAnisotropy = maxAnisotropy;
// set when rendering
-// qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, glConfig.maxAnisotropy);
+ // glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, glConfig.maxAnisotropy);
}
+#endif
+//----(SA) end
}
/*
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git
More information about the Pkg-games-commits
mailing list