From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Wed, 3 Oct 2012 16:55:24 +0000 (+0200)
Subject: Work around a Mesa bug wrt. mipmap generation.
X-Git-Tag: 1.0~397
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=60cc8cf581ceaac4eb7e636e85f9e6161005701d

Work around a Mesa bug wrt. mipmap generation.
---

diff --git a/effect_chain.cpp b/effect_chain.cpp
index 270eae6..462633c 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -303,6 +303,11 @@ void EffectChain::render_to_screen(unsigned char *src)
 	check_error();
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 	check_error();
+
+	// Intel/Mesa seems to have a broken glGenerateMipmap() for non-FBO textures, so do it here.
+	glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, phases[0].input_needs_mipmaps ? GL_TRUE : GL_FALSE);
+	check_error();
+
 	glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
 	check_error();
 
@@ -336,8 +341,11 @@ void EffectChain::render_to_screen(unsigned char *src)
 			check_error();
 		}
 		if (phases[phase].input_needs_mipmaps) {
-			glGenerateMipmap(GL_TEXTURE_2D);
-			check_error();
+			if (phase != 0) {
+				// For phase 0, it's done further up.
+				glGenerateMipmap(GL_TEXTURE_2D);
+				check_error();
+			}
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
 			check_error();
 		} else {