X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.cpp;h=089008344c3f457468146203b84fbad5a638e527;hp=0516083bf30c13dc32cf2447718141ed08e4a038;hb=abb7221a797bb5332f9ff9346396beb4c95dcc34;hpb=89da3437c862c15acb870fbe3175b9e4a0a8244a

diff --git a/flat_input.cpp b/flat_input.cpp
index 0516083..0890083 100644
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@ -71,13 +71,13 @@ void FlatInput::finalize()
 	check_error();
 	glBindTexture(GL_TEXTURE_2D, texture_num);
 	check_error();
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, needs_mipmaps ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR);
 	check_error();
 	glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch);
 	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);
+	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();
@@ -107,7 +107,7 @@ void FlatInput::set_gl_state(GLuint glsl_program_num, const std::string& prefix,
 		// Re-upload the texture from the PBO.
 		glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch);
 		check_error();
-		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, format, GL_FLOAT, BUFFER_OFFSET(0));
+		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, format, type, BUFFER_OFFSET(0));
 		check_error();
 		glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
 		check_error();