OpenGL can now be required as a package on all archs

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

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 858ca47826afbdc7470df2d91970ba9909a22761..fdf61cde4366600f2f37438a5824f25299b07f87 100644 (file)
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -5,11 +5,12 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#define GL_GLEXT_PROTOTYPES
 #include <cmath>
 #include "except.h"
+#include "extension.h"
 #include "ilwrap.h"
 #include "texture3d.h"
+#include "version_1_2.h"
 
 using namespace std;
 
@@ -21,6 +22,8 @@ Texture3D::Texture3D():
        height(0),
        depth(0)
 {
+       require_version(1, 3);
+
        target=GL_TEXTURE_3D;
        bind();
 }
@@ -38,10 +41,10 @@ void Texture3D::storage(PixelFormat f, sizei w, sizei h, sizei d, int b)
        ifmt=f;
        border=b;
 
-       image(0, ifmt, GL_UNSIGNED_BYTE, 0);
+       image(0, ifmt, UNSIGNED_BYTE, 0);
 }
 
-void Texture3D::image(int level, PixelFormat fmt, GLenum type, const void *data)
+void Texture3D::image(int level, PixelFormat fmt, DataType type, const void *data)
 {
        maybe_bind();
        glTexImage3D(target, level, ifmt, width, height, depth, border, fmt, type, data);
@@ -50,7 +53,7 @@ void Texture3D::image(int level, PixelFormat fmt, GLenum type, const void *data)
 void Texture3D::load_image(const string &fn, int dp)
 {
        Image img;
-       img.load(fn);
+       img.load_file(fn);
 
        unsigned w=img.get_width();
        unsigned h=img.get_height();
@@ -80,7 +83,7 @@ void Texture3D::load_image(const string &fn, int dp)
        else if(w!=width || h!=height || d!=depth)
                throw IncompatibleData("Image does not match texture storage");
 
-       image(0, fmt, GL_UNSIGNED_INT, img.get_data());
+       image(0, fmt, UNSIGNED_INT, img.get_data());
 }
 
 } // namespace GL