X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resource_pool.cpp;fp=resource_pool.cpp;h=5b0499972121934a643c5351f8b62cf4a94bc1d1;hp=b560f1530bf4599692fdb1f63e026cc3cfa07994;hb=76d3f4f3c75111cc8c59a08396c5ad60c712c9a5;hpb=04ea19a8d042805d1483d1478a0dd74fb18eca24

diff --git a/resource_pool.cpp b/resource_pool.cpp
index b560f15..5b04999 100644
--- a/resource_pool.cpp
+++ b/resource_pool.cpp
@@ -307,6 +307,7 @@ GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLs
 	switch (internal_format) {
 	case GL_RGBA32F_ARB:
 	case GL_RGBA16F_ARB:
+	case GL_RGBA16:
 	case GL_RGBA8:
 	case GL_RGB10_A2:
 	case GL_SRGB8_ALPHA8:
@@ -314,6 +315,7 @@ GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLs
 		break;
 	case GL_RGB32F:
 	case GL_RGB16F:
+	case GL_RGB16:
 	case GL_R11F_G11F_B10F:
 	case GL_RGB8:
 	case GL_RGB10:
@@ -324,11 +326,13 @@ GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLs
 		break;
 	case GL_RG32F:
 	case GL_RG16F:
+	case GL_RG16:
 	case GL_RG8:
 		format = GL_RG;
 		break;
 	case GL_R32F:
 	case GL_R16F:
+	case GL_R16:
 	case GL_R8:
 		format = GL_RED;
 		break;
@@ -352,6 +356,12 @@ GLuint ResourcePool::create_2d_texture(GLint internal_format, GLsizei width, GLs
 	case GL_R16F:
 		type = GL_FLOAT;
 		break;
+	case GL_RGBA16:
+	case GL_RGB16:
+	case GL_RG16:
+	case GL_R16:
+		type = GL_UNSIGNED_SHORT;
+		break;
 	case GL_SRGB8_ALPHA8:
 	case GL_SRGB8:
 	case GL_RGBA8:
@@ -618,6 +628,18 @@ size_t ResourcePool::estimate_texture_size(const Texture2D &texture_format)
 	case GL_RGB565:
 		bytes_per_pixel = 2;
 		break;
+	case GL_RGBA16:
+		bytes_per_pixel = 8;
+		break;
+	case GL_RGB16:
+		bytes_per_pixel = 6;
+		break;
+	case GL_RG16:
+		bytes_per_pixel = 4;
+		break;
+	case GL_R16:
+		bytes_per_pixel = 2;
+		break;
 	default:
 		// TODO: Add more here as needed.
 		assert(false);