-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <msp/io/memory.h>
#include "bindable.h"
-#include "except.h"
+#include "error.h"
+#include "pixelstore.h"
#include "texture2d.h"
using namespace std;
Texture2D::Texture2D():
Texture(GL_TEXTURE_2D),
width(0),
- height(0)
+ height(0),
+ allocated(0)
{ }
-void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, int brd)
+void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
{
if(width>0)
- throw InvalidState("Texture storage may only be specified once");
+ throw invalid_operation("Texture2D::storage");
if(wd==0 || ht==0)
- throw InvalidParameterValue("Invalid texture dimensions");
+ throw invalid_argument("Texture2D::storage");
+ require_pixelformat(fmt);
ifmt = fmt;
width = wd;
height = ht;
- border = brd;
}
-void Texture2D::image(int level, PixelFormat fmt, DataType type, const void *data)
+void Texture2D::allocate(unsigned level)
{
- if(width==0)
- throw InvalidState("Texture storage has not been specified");
+ 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)
+{
+ if(width==0 || height==0)
+ throw invalid_operation("Texture2D::image");
+
+ unsigned w = width;
+ unsigned h = height;
+ get_level_size(level, w, h);
Bind _bind(this, true);
- glTexImage2D(target, level, ifmt, width, height, border, fmt, type, data);
+ 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(int level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
+void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
{
- if(width==0)
- throw InvalidState("Texture storage has not been specified");
+ if(width==0 || height==0)
+ throw invalid_operation("Texture2D::sub_image");
+
+ allocate(level);
Bind _bind(this, true);
glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
unsigned h = img.get_height();
PixelFormat fmt = pixelformat_from_graphics(img.get_format());
if(width==0)
- storage(fmt, w, h, 0);
+ storage(storage_pixelformat_from_graphics(img.get_format()), w, h);
else if(w!=width || h!=height)
- throw IncompatibleData("Image does not match texture storage");
+ throw incompatible_data("Texture2D::image");
+
+ PixelStore pstore = PixelStore::from_image(img);
+ Bind _bind_ps(pstore, true);
image(0, fmt, UNSIGNED_BYTE, img.get_data());
}
+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)
+ DataFile::DerivedObjectLoader<Texture2D, 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());
+ IO::Memory mem(data.data(), data.size());
+ img.load_io(mem);
- static_cast<Texture2D &>(obj).image(img);
+ 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());
+ obj.image(0, obj.ifmt, UNSIGNED_BYTE, data.data());
+}
+
+void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
+{
+ obj.storage(fmt, w, h);
}
-void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h, unsigned b)
+void Texture2D::Loader::storage_b(PixelFormat fmt, unsigned w, unsigned h, unsigned)
{
- static_cast<Texture2D &>(obj).storage(fmt, w, h, b);
+ storage(fmt, w, h);
}
} // namespace GL