X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.cpp;h=b14772554b720486fa842c1b27ec4b23639b9715;hp=cf53034a372078dadf56d99e280397c5d236bd04;hb=99d570aa1e5e72e6c2adcb8401b1451738e7dec2;hpb=88add60f9ee1049ebd39ef3e1903e2636bdac313

diff --git a/flat_input.cpp b/flat_input.cpp
index cf53034..b147725 100644
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -70,10 +70,6 @@ void FlatInput::finalize()
 	check_error();
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, needs_mipmaps ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR);
 	check_error();
-	// Intel/Mesa seems to have a broken glGenerateMipmap() for non-FBO textures, so do it here
-	// instead of calling glGenerateMipmap().
-	glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, needs_mipmaps ? GL_TRUE : GL_FALSE);
-	check_error();
 	glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, type, NULL);
 	check_error();
 	glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
@@ -102,6 +98,10 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const std::string& prefix,
 		check_error();
 		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, format, type, pixel_data);
 		check_error();
+		if (needs_mipmaps) {
+			glGenerateMipmap(GL_TEXTURE_2D);
+			check_error();
+		}
 		glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
 		check_error();
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);