Texture(GL_TEXTURE_3D),
width(0),
height(0),
- depth(0)
+ depth(0),
+ allocated(0)
{
static RequireVersion _ver(1, 2);
}
-void Texture3D::storage(PixelFormat f, unsigned w, unsigned h, unsigned d, int b)
+void Texture3D::storage(PixelFormat f, unsigned w, unsigned h, unsigned d)
{
if(width>0)
throw InvalidState("Textures storage may only be specified once");
height = h;
depth = d;
ifmt = f;
- border = b;
+}
+
+void Texture3D::allocate(unsigned level)
+{
+ if(allocated&(1<<level))
+ return;
- image(0, ifmt, UNSIGNED_BYTE, 0);
+ image(level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
}
-void Texture3D::image(int level, PixelFormat fmt, DataType type, const void *data)
+void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
{
- if(width==0)
- throw InvalidState("Texture storage has not been specified");
+ require_storage();
+
+ unsigned w = width;
+ unsigned h = height;
+ unsigned d = depth;
+ get_level_size(level, w, h, d);
Bind _bind(this, true);
- glTexImage3D(target, level, ifmt, width, height, depth, border, fmt, type, data);
+ glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
+
+ allocated |= 1<<level;
+ if(gen_mipmap && level==0)
+ {
+ for(; (w || h || d); w>>=1, h>>=1, d>>=1, ++level) ;
+ allocated |= (1<<level)-1;
+ }
+}
+
+void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, PixelFormat fmt, DataType type, const void *data)
+{
+ require_storage();
+ allocate(level);
+
+ Bind _bind(this, true);
+ glTexSubImage3D(target, level, x, y, z, wd, ht, dp, fmt, type, data);
}
void Texture3D::load_image(const string &fn, int dp)
PixelFormat fmt = pixelformat_from_graphics(img.get_format());
if(width==0)
- storage(fmt, w, h, d, 0);
+ storage(fmt, w, h, d);
else if(w!=width || h!=height || d!=depth)
throw IncompatibleData("Image does not match texture storage");
image(0, fmt, UNSIGNED_INT, img.get_data());
}
+void Texture3D::require_storage()
+{
+ if(width==0 || height==0 || depth==0)
+ throw InvalidState("Texture storage has not been specified");
+}
+
+void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d)
+{
+ w >>= level;
+ h >>= level;
+ d >>= level;
+
+ if(!w && (h || d))
+ w = 1;
+ if(!h && (w || d))
+ h = 1;
+ if(!d && (w || h))
+ d = 1;
+}
+
} // namespace GL
} // namespace Msp