From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 23 Jan 2016 02:56:04 +0000 (+0200)
Subject: Use UNSIGNED_SHORT for allocating DEPTH_COMPONENT textures
X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=commitdiff_plain;h=f35535633aab06e80f0666d8551431364654c6dc

Use UNSIGNED_SHORT for allocating DEPTH_COMPONENT textures

OpenGL ES doesn't accept DEPTH_COMPONENT together with BYTE types.
---

diff --git a/source/texture.cpp b/source/texture.cpp
index 6484440e..8d43143c 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -75,6 +75,11 @@ Texture::~Texture()
 		glDeleteTextures(1, &id);
 }
 
+DataType Texture::get_alloc_type(PixelFormat fmt)
+{
+	return (fmt==DEPTH_COMPONENT ? UNSIGNED_SHORT : UNSIGNED_BYTE);
+}
+
 void Texture::update_parameter(int mask) const
 {
 	if(TexUnit::current().get_texture()!=this)
diff --git a/source/texture.h b/source/texture.h
index db6165fe..4cd5481e 100644
--- a/source/texture.h
+++ b/source/texture.h
@@ -2,7 +2,9 @@
 #define MSP_GL_TEXTURE_H_
 
 #include <msp/datafile/objectloader.h>
+#include "datatype.h"
 #include "gl.h"
+#include "pixelformat.h"
 #include "predicate.h"
 #include "resource.h"
 
@@ -122,6 +124,8 @@ public:
 	~Texture();
 
 protected:
+	static DataType get_alloc_type(PixelFormat);
+
 	void update_parameter(int) const;
 public:
 	void set_min_filter(TextureFilter);
diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index accd0e0c..046fca6f 100644
--- a/source/texture1d.cpp
+++ b/source/texture1d.cpp
@@ -34,7 +34,8 @@ void Texture1D::allocate(unsigned level)
 	if(allocated&(1<<level))
 		return;
 
-	image(level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
+	PixelFormat base_fmt = get_base_pixelformat(ifmt);
+	image(level, base_fmt, get_alloc_type(base_fmt), 0);
 }
 
 void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
diff --git a/source/texture1d.h b/source/texture1d.h
index 63b25c13..20b1d35c 100644
--- a/source/texture1d.h
+++ b/source/texture1d.h
@@ -1,8 +1,6 @@
 #ifndef MSP_GL_TEXTURE1D_H_
 #define MSP_GL_TEXTURE1D_H_
 
-#include "datatype.h"
-#include "pixelformat.h"
 #include "texture.h"
 
 namespace Msp {
diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index de754209..64ad124f 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -63,7 +63,8 @@ void Texture2D::allocate(unsigned level)
 	if(allocated&(1<<level))
 		return;
 
-	image(level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
+	PixelFormat base_fmt = get_base_pixelformat(ifmt);
+	image(level, base_fmt, get_alloc_type(base_fmt), 0);
 }
 
 void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
diff --git a/source/texture2d.h b/source/texture2d.h
index 71e04b57..030fe408 100644
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -3,8 +3,6 @@
 
 #include <string>
 #include <msp/graphics/image.h>
-#include "datatype.h"
-#include "pixelformat.h"
 #include "resource.h"
 #include "texture.h"
 
diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 7b9c3590..d5badc72 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -41,7 +41,8 @@ void Texture3D::allocate(unsigned level)
 	if(allocated&(1<<level))
 		return;
 
-	image(level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
+	PixelFormat base_fmt = get_base_pixelformat(ifmt);
+	image(level, base_fmt, get_alloc_type(base_fmt), 0);
 }
 
 void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
diff --git a/source/texture3d.h b/source/texture3d.h
index c55a3c1a..93cae7e8 100644
--- a/source/texture3d.h
+++ b/source/texture3d.h
@@ -2,8 +2,6 @@
 #define MSP_GL_TEXTURE3D_H_
 
 #include <string>
-#include "datatype.h"
-#include "pixelformat.h"
 #include "texture.h"
 
 namespace Msp {
diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index 37390a85..24d02f40 100644
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -47,8 +47,10 @@ void TextureCube::allocate(unsigned level)
 	if(allocated&(1<<level))
 		return;
 
+	PixelFormat base_fmt = get_base_pixelformat(ifmt);
+	DataType type = get_alloc_type(base_fmt);
 	for(unsigned i=0; i<6; ++i)
-		image(enumerate_faces(i), level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
+		image(enumerate_faces(i), level, base_fmt, type, 0);
 }
 
 void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, DataType type, const void *data)
diff --git a/source/texturecube.h b/source/texturecube.h
index 4530a97a..f65ec059 100644
--- a/source/texturecube.h
+++ b/source/texturecube.h
@@ -2,8 +2,6 @@
 #define MSP_GL_TEXTURECUBE_H_
 
 #include <msp/graphics/image.h>
-#include "datatype.h"
-#include "pixelformat.h"
 #include "texture.h"
 #include "vector.h"
 #include <msp/gl/extensions/arb_texture_cube_map.h>