Complete rewrite of extension handling

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

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 2fc4f997396e3dcf7f3f1a9417532c8cd3364f9c..0ad65f8887437da0bf1283c93ed00b7628efdc36 100644 (file)
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -1,16 +1,9 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <cmath>
-#include <msp/gbase/image.h>
-#include "except.h"
-#include "extension.h"
+#include <msp/graphics/image.h>
+#include "bindable.h"
+#include "error.h"
+#include "ext_texture3d.h"
 #include "texture3d.h"
-#include "version_1_2.h"
 
 using namespace std;
 
@@ -18,36 +11,66 @@ namespace Msp {
 namespace GL {
 
 Texture3D::Texture3D():
+       Texture(GL_TEXTURE_3D),
        width(0),
        height(0),
-       depth(0)
+       depth(0),
+       allocated(0)
 {
-       require_version(1, 3);
-
-       target=GL_TEXTURE_3D;
-       bind();
+       static Require _req(EXT_texture3D);
 }
 
-void Texture3D::storage(PixelFormat f, sizei w, sizei h, sizei d, int b)
+void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp)
 {
        if(width>0)
-               throw InvalidState("Textures may only be created once");
-       if(w==0 || h==0 || d==0)
-               throw InvalidParameterValue("Invalid texture dimensions");
+               throw invalid_operation("Texture3D::storage");
+       if(wd==0 || ht==0 || dp==0)
+               throw invalid_argument("Texture3D::storage");
+
+       width = wd;
+       height = ht;
+       depth = dp;
+       ifmt = fmt;
+}
+
+void Texture3D::allocate(unsigned level)
+{
+       if(allocated&(1<<level))
+               return;
+
+       image(level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
+}
+
+void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
+{
+       if(width==0 || height==0 || depth==0)
+               throw invalid_operation("Texture3D::image");
 
-       width=w;
-       height=h;
-       depth=d;
-       ifmt=f;
-       border=b;
+       unsigned w = width;
+       unsigned h = height;
+       unsigned d = depth;
+       get_level_size(level, w, h, d);
 
-       image(0, ifmt, UNSIGNED_BYTE, 0);
+       Bind _bind(this, true);
+       glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
+
+       allocated |= 1<<level;
+       if(gen_mipmap && level==0)
+       {
+               for(; (w || h || d); w>>=1, h>>=1, d>>=1, ++level) ;
+               allocated |= (1<<level)-1;
+       }
 }
 
-void Texture3D::image(int level, PixelFormat fmt, DataType type, const void *data)
+void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, PixelFormat fmt, DataType type, const void *data)
 {
-       maybe_bind();
-       glTexImage3D(target, level, ifmt, width, height, depth, border, fmt, type, data);
+       if(width==0 || height==0 || depth==0)
+               throw invalid_operation("Texture3D::image");
+
+       allocate(level);
+
+       Bind _bind(this, true);
+       glTexSubImage3D(target, level, x, y, z, wd, ht, dp, fmt, type, data);
 }
 
 void Texture3D::load_image(const string &fn, int dp)
@@ -55,36 +78,57 @@ void Texture3D::load_image(const string &fn, int dp)
        Graphics::Image img;
        img.load_file(fn);
 
-       unsigned w=img.get_width();
-       unsigned h=img.get_height();
-       unsigned d=1;
+       unsigned w = img.get_width();
+       unsigned h = img.get_height();
+       unsigned d = 1;
 
        if(dp==-1)
        {
                if(h%w)
-                       throw IncompatibleData("Image height is not divisible by its width");
-               d=h/w;
-               h=w;
+                       throw incompatible_data("Texture3D::load_image");
+               d = h/w;
+               h = w;
        }
        else if(dp==-2)
        {
                for(d=h; d*d>h; d>>=2) ;
                for(; d*d<h; ++d) ;
                if(d*d!=h)
-                       throw IncompatibleData("Could not find a square root of texture height");
-               h=d;
+                       throw incompatible_data("Texture3D::load_image");
+               h = d;
        }
        else if(dp>0)
-               d=dp;
+       {
+               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());
+       PixelFormat fmt = pixelformat_from_graphics(img.get_format());
        if(width==0)
-               storage(fmt, w, h, d, 0);
+               storage(fmt, w, h, d);
        else if(w!=width || h!=height || d!=depth)
-               throw IncompatibleData("Image does not match texture storage");
+               throw incompatible_data("Texture3D::load_image");
 
        image(0, fmt, UNSIGNED_INT, img.get_data());
 }
 
+void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d)
+{
+       w >>= level;
+       h >>= level;
+       d >>= level;
+
+       if(!w && (h || d))
+               w = 1;
+       if(!h && (w || d))
+               h = 1;
+       if(!d && (w || h))
+               d = 1;
+}
+
 } // namespace GL
 } // namespace Msp