X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resource_pool.cpp;h=eba79237678611bf474c065f81111e49531cfb94;hp=19c26a093f989b5f18d21d626a0ed95c8bbbc7d4;hb=61e2a7671f7b22227dcdc34dd303ae4fcc802aaa;hpb=86cdfc6ea4318cfe6fd5d4bef51daf00f480973a

diff --git a/resource_pool.cpp b/resource_pool.cpp
index 19c26a0..eba7923 100644
--- a/resource_pool.cpp
+++ b/resource_pool.cpp
@@ -6,8 +6,8 @@
 #include <map>
 #include <string>
 #include <utility>
+#include <epoxy/gl.h>
 
-#include "glew.h"
 #include "init.h"
 #include "resource_pool.h"
 #include "util.h"
@@ -186,6 +186,9 @@ void ResourcePool::release_glsl_program(GLuint glsl_program_num)
 
 GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLsizei height)
 {
+	assert(width > 0);
+	assert(height > 0);
+
 	pthread_mutex_lock(&lock);
 	// See if there's a texture on the freelist we can use.
 	for (list<GLuint>::iterator freelist_it = texture_freelist.begin();
@@ -214,16 +217,19 @@ GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLs
 	case GL_SRGB8_ALPHA8:
 		format = GL_RGBA;
 		break;
-	case GL_RGB32F_ARB:
-	case GL_RGB16F_ARB:
+	case GL_RGB32F:
+	case GL_RGB16F:
 	case GL_RGB8:
 	case GL_SRGB8:
 		format = GL_RGB;
 		break;
 	case GL_RG32F:
 	case GL_RG16F:
+	case GL_RG8:
 		format = GL_RG;
 		break;
+	case GL_R32F:
+	case GL_R16F:
 	case GL_R8:
 		format = GL_RED;
 		break;
@@ -232,12 +238,39 @@ GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLs
 		assert(false);
 	}
 
+	// Same with type; GLES is stricter than desktop OpenGL here.
+	GLenum type;
+	switch (internal_format) {
+	case GL_RGBA32F_ARB:
+	case GL_RGBA16F_ARB:
+	case GL_RGB32F:
+	case GL_RGB16F:
+	case GL_RG32F:
+	case GL_RG16F:
+	case GL_R32F:
+	case GL_R16F:
+		type = GL_FLOAT;
+		break;
+	case GL_SRGB8_ALPHA8:
+	case GL_SRGB8:
+	case GL_RGBA8:
+	case GL_RGB8:
+	case GL_RG8:
+	case GL_R8:
+		type = GL_UNSIGNED_BYTE;
+		break;
+	default:
+		// TODO: Add more here as needed.
+		assert(false);
+	}
+
+
 	GLuint texture_num;
 	glGenTextures(1, &texture_num);
 	check_error();
 	glBindTexture(GL_TEXTURE_2D, texture_num);
 	check_error();
-	glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, GL_UNSIGNED_BYTE, NULL);
+	glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, format, type, NULL);
 	check_error();
 	glBindTexture(GL_TEXTURE_2D, 0);
 	check_error();
@@ -261,8 +294,8 @@ void ResourcePool::release_2d_texture(GLuint texture_num)
 	texture_freelist_bytes += estimate_texture_size(texture_formats[texture_num]);
 
 	while (texture_freelist_bytes > texture_freelist_max_bytes) {
-		GLuint free_texture_num = texture_freelist.front();
-		texture_freelist.pop_front();
+		GLuint free_texture_num = texture_freelist.back();
+		texture_freelist.pop_back();
 		assert(texture_formats.count(free_texture_num) != 0);
 		texture_freelist_bytes -= estimate_texture_size(texture_formats[free_texture_num]);
 		texture_formats.erase(free_texture_num);
@@ -368,6 +401,7 @@ void ResourcePool::cleanup_unlinked_fbos(void *context)
 		pair<void *, GLuint> key(context, fbo_num);
 		assert(fbo_formats.count(key) != 0);
 		if (fbo_formats[key].texture_num == 0) {
+			fbo_formats.erase(key);
 			glDeleteFramebuffers(1, &fbo_num);
 			check_error();
 			fbo_freelist[context].erase(freelist_it++);
@@ -401,16 +435,16 @@ size_t ResourcePool::estimate_texture_size(const Texture2D &texture_format)
 	case GL_RGBA16F_ARB:
 		bytes_per_pixel = 8;
 		break;
-	case GL_RGBA8:
-	case GL_SRGB8_ALPHA8:
-		bytes_per_pixel = 4;
-		break;
 	case GL_RGB32F_ARB:
 		bytes_per_pixel = 12;
 		break;
 	case GL_RGB16F_ARB:
 		bytes_per_pixel = 6;
 		break;
+	case GL_RGBA8:
+	case GL_SRGB8_ALPHA8:
+		bytes_per_pixel = 4;
+		break;
 	case GL_RGB8:
 	case GL_SRGB8:
 		bytes_per_pixel = 3;
@@ -421,6 +455,12 @@ size_t ResourcePool::estimate_texture_size(const Texture2D &texture_format)
 	case GL_RG16F:
 		bytes_per_pixel = 4;
 		break;
+	case GL_R32F:
+		bytes_per_pixel = 4;
+		break;
+	case GL_R16F:
+		bytes_per_pixel = 2;
+		break;
 	case GL_R8:
 		bytes_per_pixel = 1;
 		break;