X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=flat_input.cpp;h=b14772554b720486fa842c1b27ec4b23639b9715;hb=99d570aa1e5e72e6c2adcb8401b1451738e7dec2;hp=28380f4ad19a94a763292ae85f79ab6578e1b216;hpb=9cf78e3b5a801b7841133011f74fc7962861705d;p=movit

diff --git a/flat_input.cpp b/flat_input.cpp
index 28380f4..b147725 100644
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -39,7 +39,7 @@ void FlatInput::finalize()
 	// Translate the input format to OpenGL's enums.
 	GLenum internal_format;
 	if (type == GL_FLOAT) {
-		internal_format = GL_RGBA16F_ARB;
+		internal_format = GL_RGBA32F_ARB;
 	} else if (output_linear_gamma) {
 		assert(type == GL_UNSIGNED_BYTE);
 		internal_format = GL_SRGB8_ALPHA8;
@@ -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);