Get rid of the typedefs for fundamental types

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

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index a2d371e7856c108b6c7eac2de3284119bc735e1a..b34e20cd5d4f757ca9e663bcf3053b00799419b0 100644 (file)
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -6,9 +6,9 @@ Distributed under the LGPL
 */
 
 #include <cmath>
+#include <msp/gbase/image.h>
 #include "except.h"
 #include "extension.h"
-#include "ilwrap.h"
 #include "texture3d.h"
 #include "version_1_2.h"
 
@@ -22,13 +22,13 @@ Texture3D::Texture3D():
        height(0),
        depth(0)
 {
-       require_version(1, 3);
+       static RequireVersion _ver(1, 3);
 
        target=GL_TEXTURE_3D;
        bind();
 }
 
-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");
@@ -52,7 +52,7 @@ void Texture3D::image(int level, PixelFormat fmt, DataType type, const void *dat
 
 void Texture3D::load_image(const string &fn, int dp)
 {
-       Image img;
+       Graphics::Image img;
        img.load_file(fn);
 
        unsigned w=img.get_width();
@@ -77,7 +77,7 @@ void Texture3D::load_image(const string &fn, int dp)
        else if(dp>0)
                d=dp;
 
-       PixelFormat fmt=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)