Complete rewrite of extension handling

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

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 4aac49edfaf82f27eaf4c3eef8c7021596d5033e..0ad65f8887437da0bf1283c93ed00b7628efdc36 100644 (file)
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -2,9 +2,8 @@
 #include <msp/graphics/image.h>
 #include "bindable.h"
 #include "error.h"
-#include "extension.h"
+#include "ext_texture3d.h"
 #include "texture3d.h"
-#include "version_1_2.h"
 
 using namespace std;
 
@@ -18,20 +17,20 @@ Texture3D::Texture3D():
        depth(0),
        allocated(0)
 {
-       static RequireVersion _ver(1, 2);
+       static Require _req(EXT_texture3D);
 }
 
-void Texture3D::storage(PixelFormat f, unsigned w, unsigned h, unsigned d)
+void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp)
 {
        if(width>0)
                throw invalid_operation("Texture3D::storage");
-       if(w==0 || h==0 || d==0)
+       if(wd==0 || ht==0 || dp==0)
                throw invalid_argument("Texture3D::storage");
 
-       width = w;
-       height = h;
-       depth = d;
-       ifmt = f;
+       width = wd;
+       height = ht;
+       depth = dp;
+       ifmt = fmt;
 }
 
 void Texture3D::allocate(unsigned level)
@@ -99,7 +98,14 @@ void Texture3D::load_image(const string &fn, int dp)
                h = d;
        }
        else if(dp>0)
+       {
                d = dp;
+               if(h%d)
+                       throw incompatible_data("Texture3D::load_image");
+               h /= d;
+       }
+       else
+               throw invalid_argument("Texture3D::load_image");
 
        PixelFormat fmt = pixelformat_from_graphics(img.get_format());
        if(width==0)