Use ARB_geometry_shader4 rather than the EXT version

[libs/gl.git] / source / texture2d.cpp

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 41763586c7dcfc9e81572907b44d00069e5dbf70..64ad124f97a1952f19307d429c8f9acd427d76c1 100644 (file)
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -40,6 +40,11 @@ Texture2D::Texture2D(ResourceManager *m):
        allocated(0)
 { }
 
+Texture2D::~Texture2D()
+{
+       set_manager(0);
+}
+
 void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
 {
        if(width>0)
@@ -58,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)