Throw an exception if Texture*::allocate is called before storage

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

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 680880a820be1507ba81fb0c252eafdcd98677ad..5e1f9866e185e6ecdb047f167a26ffa8054d03ea 100644 (file)
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -3,6 +3,7 @@
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/gl/extensions/ext_texture3d.h>
+#include <msp/gl/extensions/ext_texture_array.h>
 #include <msp/graphics/image.h>
 #include "bindable.h"
 #include "error.h"
@@ -47,6 +48,8 @@ void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp)
 
 void Texture3D::allocate(unsigned level)
 {
+       if(width==0 || height==0 || depth==0)
+               throw invalid_operation("Texture3D::allocate");
        if(allocated&(1<<level))
                return;
 
@@ -83,7 +86,7 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
                return sub_image(level, 0, 0, 0, w, h, d, fmt, type, data);
 
        BindRestore _bind(this);
-       glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
+       glTexImage3D(target, level, ifmt, width, height, depth, 0, get_upload_format(fmt), type, data);
 
        allocated |= 1<<level;
        if(gen_mipmap && level==0)
@@ -101,6 +104,7 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
        Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
        allocate(level);
 
+       fmt = get_upload_format(fmt);
        if(ARB_direct_state_access)
                glTextureSubImage3D(id, level, x, y, z, wd, ht, dp, fmt, type, data);
        else