Add class MeshBuilder

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

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 8a93d031b6fd36a781ab5916e7019ba6036b0388..baee22eefc56b31f9fe41c44c53a888598c3cbba 100644 (file)
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -35,7 +35,7 @@ void Texture2D::storage(PixelFormat fmt, sizei wd, sizei ht, int brd)
        border=brd;
 }
 
-void Texture2D::image(int level, PixelFormat fmt, GLenum type, const void *data)
+void Texture2D::image(int level, PixelFormat fmt, DataType type, const void *data)
 {
        if(width==0)
                throw InvalidState("Texture storage has not been specified");
@@ -45,7 +45,7 @@ void Texture2D::image(int level, PixelFormat fmt, GLenum type, const void *data)
        glTexImage2D(target, level, ifmt, width, height, border, fmt, type, data);
 }
 
-void Texture2D::sub_image(int level, int x, int y, sizei wd, sizei ht, PixelFormat fmt, GLenum type, const void *data)
+void Texture2D::sub_image(int level, int x, int y, sizei wd, sizei ht, PixelFormat fmt, DataType type, const void *data)
 {
        if(width==0)
                throw InvalidState("Texture storage has not been specified");
@@ -73,7 +73,7 @@ void Texture2D::image(const Image &img)
        else if(w!=width || h!=height)
                throw IncompatibleData("Image does not match texture storage");
 
-       image(0, fmt, GL_UNSIGNED_BYTE, img.get_data());
+       image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
 
@@ -96,7 +96,7 @@ void Texture2D::Loader::image_data(const string &data)
 void Texture2D::Loader::raw_data(const string &data)
 {
        Texture2D &t2d=static_cast<Texture2D &>(tex);;
-       t2d.image(0, t2d.ifmt, GL_UNSIGNED_BYTE, data.data());
+       t2d.image(0, t2d.ifmt, UNSIGNED_BYTE, data.data());
 }
 
 void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h, unsigned b)