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;
height(0),
depth(0)
{
+ require_version(1, 3);
+
target=GL_TEXTURE_3D;
bind();
}
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);
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();
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