Check the flat qualifier from the correct member

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

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
deleted file mode 100644 (file)
index b6b5954..0000000
--- a/source/texture2d.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-#include "bindable.h"
-#include "except.h"
-#include "texture2d.h"
-
-using namespace std;
-
-namespace Msp {
-namespace GL {
-
-Texture2D::Texture2D():
-       Texture(GL_TEXTURE_2D),
-       width(0),
-       height(0),
-       allocated(0)
-{ }
-
-void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
-{
-       if(width>0)
-               throw InvalidState("Texture storage may only be specified once");
-       if(wd==0 || ht==0)
-               throw InvalidParameterValue("Invalid texture dimensions");
-
-       ifmt = fmt;
-       width = wd;
-       height = ht;
-}
-
-void Texture2D::allocate(unsigned level)
-{
-       if(allocated&(1<<level))
-               return;
-
-       image(level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
-}
-
-void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
-{
-       require_storage();
-
-       unsigned w = width;
-       unsigned h = height;
-       get_level_size(level, w, h);
-
-       Bind _bind(this, true);
-       glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
-
-       allocated |= 1<<level;
-       if(gen_mipmap && level==0)
-       {
-               for(; (w || h); w>>=1, h>>=1, ++level) ;
-               allocated |= (1<<level)-1;
-       }
-}
-
-void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
-{
-       require_storage();
-       allocate(level);
-
-       Bind _bind(this, true);
-       glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
-}
-
-void Texture2D::load_image(const string &fn)
-{
-       Graphics::Image img;
-       img.load_file(fn);
-
-       image(img);
-}
-
-void Texture2D::image(const Graphics::Image &img)
-{
-       unsigned w = img.get_width();
-       unsigned h = img.get_height();
-       PixelFormat fmt = pixelformat_from_graphics(img.get_format());
-       if(width==0)
-               storage(fmt, w, h);
-       else if(w!=width || h!=height)
-               throw IncompatibleData("Image does not match texture storage");
-
-       image(0, fmt, UNSIGNED_BYTE, img.get_data());
-}
-
-void Texture2D::require_storage()
-{
-       if(width==0 || height==0)
-               throw InvalidState("Texture storage has not been specified");
-}
-
-void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h)
-{
-       w >>= level;
-       h >>= level;
-
-       if(!w && h)
-               w = 1;
-       else if(!h && w)
-               h = 1;
-}
-
-
-Texture2D::Loader::Loader(Texture2D &t):
-       Texture::Loader(t)
-{
-       add("image_data", &Loader::image_data);
-       add("raw_data", &Loader::raw_data);
-       add("storage", &Loader::storage);
-       add("storage", &Loader::storage_b);
-}
-
-void Texture2D::Loader::image_data(const string &data)
-{
-       Graphics::Image img;
-       img.load_memory(data.data(), data.size());
-
-       static_cast<Texture2D &>(obj).image(img);
-}
-
-void Texture2D::Loader::raw_data(const string &data)
-{
-       Texture2D &t2d = static_cast<Texture2D &>(obj);
-       t2d.image(0, t2d.ifmt, UNSIGNED_BYTE, data.data());
-}
-
-void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
-{
-       static_cast<Texture2D &>(obj).storage(fmt, w, h);
-}
-
-void Texture2D::Loader::storage_b(PixelFormat fmt, unsigned w, unsigned h, unsigned)
-{
-       storage(fmt, w, h);
-}
-
-} // namespace GL
-} // namespace Msp