This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.5a
in repository iortcw.
commit 1ed84d2fbaee22b6bd12eecdbbe32de791d32261
Author: MAN-AT-ARMS <m4n4t4...@gmail.com>
Date: Fri Oct 21 20:41:12 2016 -0400
All: Rend2: Remove check for GL_ARB_texture_non_power_of_two
---
MP/code/rend2/tr_extensions.c | 14 --------------
MP/code/rend2/tr_image.c | 14 +++-----------
MP/code/rend2/tr_local.h | 1 -
SP/code/rend2/tr_extensions.c | 14 --------------
SP/code/rend2/tr_image.c | 14 +++-----------
SP/code/rend2/tr_local.h | 1 -
6 files changed, 6 insertions(+), 52 deletions(-)
diff --git a/MP/code/rend2/tr_extensions.c b/MP/code/rend2/tr_extensions.c
index ee12a92..1159d58 100644
--- a/MP/code/rend2/tr_extensions.c
+++ b/MP/code/rend2/tr_extensions.c
@@ -138,20 +138,6 @@ void GLimp_InitExtraExtensions()
ri.Printf(PRINT_ALL, result[2], extension);
}
- // GL_ARB_texture_non_power_of_two
- extension = "GL_ARB_texture_non_power_of_two";
- glRefConfig.textureNonPowerOfTwo = qfalse;
- if( GLimp_HaveExtension( extension ) )
- {
- glRefConfig.textureNonPowerOfTwo = qtrue; //
!!r_ext_texture_non_power_of_two->integer
-
- ri.Printf(PRINT_ALL, result[glRefConfig.textureNonPowerOfTwo],
extension);
- }
- else
- {
- ri.Printf(PRINT_ALL, result[2], extension);
- }
-
// GL_ARB_texture_float
extension = "GL_ARB_texture_float";
glRefConfig.textureFloat = qfalse;
diff --git a/MP/code/rend2/tr_image.c b/MP/code/rend2/tr_image.c
index 234b707..a2334a7 100644
--- a/MP/code/rend2/tr_image.c
+++ b/MP/code/rend2/tr_image.c
@@ -1568,7 +1568,7 @@ static qboolean RawImage_ScaleToPower2( byte **data, int
*inout_width, int *inou
//
// convert to exact power of 2 sizes
//
- if (glRefConfig.textureNonPowerOfTwo && !mipmap)
+ if (!mipmap)
{
scaled_width = width;
scaled_height = height;
@@ -2828,16 +2828,8 @@ void R_CreateBuiltinImages( void ) {
{
int width, height, hdrFormat, rgbFormat;
- if(glRefConfig.textureNonPowerOfTwo)
- {
- width = glConfig.vidWidth;
- height = glConfig.vidHeight;
- }
- else
- {
- width = NextPowerOfTwo(glConfig.vidWidth);
- height = NextPowerOfTwo(glConfig.vidHeight);
- }
+ width = glConfig.vidWidth;
+ height = glConfig.vidHeight;
hdrFormat = GL_RGBA8;
if (r_hdr->integer && glRefConfig.framebufferObject &&
glRefConfig.textureFloat)
diff --git a/MP/code/rend2/tr_local.h b/MP/code/rend2/tr_local.h
index f9cb6c2..a7cbb40 100644
--- a/MP/code/rend2/tr_local.h
+++ b/MP/code/rend2/tr_local.h
@@ -1517,7 +1517,6 @@ typedef struct {
int maxRenderbufferSize;
int maxColorAttachments;
- qboolean textureNonPowerOfTwo;
qboolean textureFloat;
textureCompressionRef_t textureCompression;
qboolean swizzleNormalmap;
diff --git a/SP/code/rend2/tr_extensions.c b/SP/code/rend2/tr_extensions.c
index ee12a92..1159d58 100644
--- a/SP/code/rend2/tr_extensions.c
+++ b/SP/code/rend2/tr_extensions.c
@@ -138,20 +138,6 @@ void GLimp_InitExtraExtensions()
ri.Printf(PRINT_ALL, result[2], extension);
}
- // GL_ARB_texture_non_power_of_two
- extension = "GL_ARB_texture_non_power_of_two";
- glRefConfig.textureNonPowerOfTwo = qfalse;
- if( GLimp_HaveExtension( extension ) )
- {
- glRefConfig.textureNonPowerOfTwo = qtrue; //
!!r_ext_texture_non_power_of_two->integer
-
- ri.Printf(PRINT_ALL, result[glRefConfig.textureNonPowerOfTwo],
extension);
- }
- else
- {
- ri.Printf(PRINT_ALL, result[2], extension);
- }
-
// GL_ARB_texture_float
extension = "GL_ARB_texture_float";
glRefConfig.textureFloat = qfalse;
diff --git a/SP/code/rend2/tr_image.c b/SP/code/rend2/tr_image.c
index 730ca64..b766b1e 100644
--- a/SP/code/rend2/tr_image.c
+++ b/SP/code/rend2/tr_image.c
@@ -1563,7 +1563,7 @@ static qboolean RawImage_ScaleToPower2( byte **data, int
*inout_width, int *inou
//
// convert to exact power of 2 sizes
//
- if (glRefConfig.textureNonPowerOfTwo && !mipmap)
+ if (!mipmap)
{
scaled_width = width;
scaled_height = height;
@@ -2832,16 +2832,8 @@ void R_CreateBuiltinImages( void ) {
{
int width, height, hdrFormat, rgbFormat;
- if(glRefConfig.textureNonPowerOfTwo)
- {
- width = glConfig.vidWidth;
- height = glConfig.vidHeight;
- }
- else
- {
- width = NextPowerOfTwo(glConfig.vidWidth);
- height = NextPowerOfTwo(glConfig.vidHeight);
- }
+ width = glConfig.vidWidth;
+ height = glConfig.vidHeight;
hdrFormat = GL_RGBA8;
if (r_hdr->integer && glRefConfig.framebufferObject &&
glRefConfig.textureFloat)
diff --git a/SP/code/rend2/tr_local.h b/SP/code/rend2/tr_local.h
index b612f20..976f777 100644
--- a/SP/code/rend2/tr_local.h
+++ b/SP/code/rend2/tr_local.h
@@ -1530,7 +1530,6 @@ typedef struct {
int maxRenderbufferSize;
int maxColorAttachments;
- qboolean textureNonPowerOfTwo;
qboolean textureFloat;
textureCompressionRef_t textureCompression;
qboolean swizzleNormalmap;
--
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
