[iortcw] 142/152: All: Rend2: Faster mipmap generation

[Simon McVittie]

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 256ad4f9f8b13a4f5e8e6067637c127a5769431d
Author: MAN-AT-ARMS <M4N4T4RMS at gmail.com>
Date:   Sat Oct 22 14:35:22 2016 -0400

    All: Rend2: Faster mipmap generation
---
 MP/code/rend2/tr_image.c | 10 +++++++++-
 SP/code/rend2/tr_image.c | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/MP/code/rend2/tr_image.c b/MP/code/rend2/tr_image.c
index a2334a7..964f6ae 100644
--- a/MP/code/rend2/tr_image.c
+++ b/MP/code/rend2/tr_image.c
@@ -2056,8 +2056,16 @@ static void RawImage_UploadTexture(GLuint texture, byte *data, int x, int y, int
 				RawImage_UploadToRgtc2Texture(texture, miplevel, x, y, width, height, data);
 			else
 				qglTextureSubImage2DEXT(texture, target, miplevel, x, y, width, height, dataFormat, dataType, data);
+		}
 
-			if (rgba8 && !lastMip && numMips < 2)
+		if (!lastMip && numMips < 2)
+		{
+			if (glRefConfig.framebufferObject)
+			{
+				qglGenerateTextureMipmapEXT(texture, target);
+				break;
+			}
+			else if (rgba8)
 			{
 				if (type == IMGTYPE_NORMAL || type == IMGTYPE_NORMALHEIGHT)
 					R_MipMapNormalHeight(data, data, width, height, glRefConfig.swizzleNormalmap);
diff --git a/SP/code/rend2/tr_image.c b/SP/code/rend2/tr_image.c
index b766b1e..0d7b0e6 100644
--- a/SP/code/rend2/tr_image.c
+++ b/SP/code/rend2/tr_image.c
@@ -2051,8 +2051,16 @@ static void RawImage_UploadTexture(GLuint texture, byte *data, int x, int y, int
 				RawImage_UploadToRgtc2Texture(texture, miplevel, x, y, width, height, data);
 			else
 				qglTextureSubImage2DEXT(texture, target, miplevel, x, y, width, height, dataFormat, dataType, data);
+		}
 
-			if (rgba8 && !lastMip && numMips < 2)
+		if (!lastMip && numMips < 2)
+		{
+			if (glRefConfig.framebufferObject)
+			{
+				qglGenerateTextureMipmapEXT(texture, target);
+				break;
+			}
+			else if (rgba8)
 			{
 				if (type == IMGTYPE_NORMAL || type == IMGTYPE_NORMALHEIGHT)
 					R_MipMapNormalHeight(data, data, width, height, glRefConfig.swizzleNormalmap);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git