#include "effect_util.h"
#include "flat_input.h"
+#include "resource_pool.h"
#include "util.h"
FlatInput::FlatInput(ImageFormat image_format, MovitPixelFormat pixel_format, GLenum type, unsigned width, unsigned height)
FlatInput::~FlatInput()
{
if (texture_num != 0) {
- glDeleteTextures(1, &texture_num);
- check_error();
+ resource_pool->release_2d_texture(texture_num);
}
}
}
// Create the texture itself.
- glGenTextures(1, &texture_num);
- check_error();
+ texture_num = resource_pool->create_2d_texture(internal_format, width, height);
glBindTexture(GL_TEXTURE_2D, texture_num);
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);
- check_error();
glBindTexture(GL_TEXTURE_2D, 0);
check_error();
check_error();
glBindTexture(GL_TEXTURE_2D, texture_num);
check_error();
+ glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+ check_error();
if (needs_update) {
// Re-upload the texture.
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);