Get rid of the generic Texture::parameter method

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

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 2fc4f997396e3dcf7f3f1a9417532c8cd3364f9c..7edc908098c73ed0866ff6d9733874f4efa7993d 100644 (file)
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -7,6 +7,7 @@ Distributed under the LGPL
 
 #include <cmath>
 #include <msp/gbase/image.h>
+#include "bindable.h"
 #include "except.h"
 #include "extension.h"
 #include "texture3d.h"
@@ -18,35 +19,36 @@ namespace Msp {
 namespace GL {
 
 Texture3D::Texture3D():
+       Texture(GL_TEXTURE_3D),
        width(0),
        height(0),
        depth(0)
 {
-       require_version(1, 3);
-
-       target=GL_TEXTURE_3D;
-       bind();
+       static RequireVersion _ver(1, 2);
 }
 
-void Texture3D::storage(PixelFormat f, sizei w, sizei h, sizei d, int b)
+void Texture3D::storage(PixelFormat f, unsigned w, unsigned h, unsigned d, int b)
 {
        if(width>0)
-               throw InvalidState("Textures may only be created once");
+               throw InvalidState("Textures storage may only be specified once");
        if(w==0 || h==0 || d==0)
                throw InvalidParameterValue("Invalid texture dimensions");
 
-       width=w;
-       height=h;
-       depth=d;
-       ifmt=f;
-       border=b;
+       width = w;
+       height = h;
+       depth = d;
+       ifmt = f;
+       border = b;
 
        image(0, ifmt, UNSIGNED_BYTE, 0);
 }
 
 void Texture3D::image(int level, PixelFormat fmt, DataType type, const void *data)
 {
-       maybe_bind();
+       if(width==0)
+               throw InvalidState("Texture storage has not been specified");
+
+       Bind _bind(this, true);
        glTexImage3D(target, level, ifmt, width, height, depth, border, fmt, type, data);
 }
 
@@ -55,16 +57,16 @@ 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;
+               d = h/w;
+               h = w;
        }
        else if(dp==-2)
        {
@@ -72,12 +74,12 @@ void Texture3D::load_image(const string &fn, int dp)
                for(; d*d<h; ++d) ;
                if(d*d!=h)
                        throw IncompatibleData("Could not find a square root of texture height");
-               h=d;
+               h = d;
        }
        else if(dp>0)
-               d=dp;
+               d = dp;
 
-       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);
        else if(w!=width || h!=height || d!=depth)