#include <msp/gl/extensions/ext_texture3d.h>
#include <msp/gl/extensions/ext_texture_array.h>
#include <msp/graphics/image.h>
-#include "bindable.h"
#include "error.h"
#include "texture3d.h"
throw invalid_operation("Texture3D::allocate");
if(level>=levels)
throw invalid_argument("Texture3D::allocate");
- if(allocated&(1<<level))
- return;
bool direct = ARB_texture_storage && ARB_direct_state_access;
if(!direct)
void Texture3D::allocate_(unsigned level)
{
+ if(allocated&(1<<level))
+ return;
+
if(ARB_texture_storage)
{
+ GLenum fmt = get_gl_pixelformat(storage_fmt);
if(ARB_direct_state_access)
- glTextureStorage3D(id, levels, storage_fmt, width, height, depth);
+ glTextureStorage3D(id, levels, fmt, width, height, depth);
else
- glTexStorage3D(target, levels, storage_fmt, width, height, depth);
+ glTexStorage3D(target, levels, fmt, width, height, depth);
apply_swizzle();
allocated |= (1<<levels)-1;
}
}
LinAl::Vector<unsigned, 3> size = get_level_size(level);
- PixelComponents comp = get_components(storage_fmt);
+ GLenum fmt = get_gl_pixelformat(storage_fmt);
+ GLenum comp = get_gl_components(get_components(storage_fmt));
GLenum type = get_gl_type(get_component_type(storage_fmt));
- glTexImage3D(target, level, storage_fmt, size.x, size.y, size.z, 0, comp, type, data);
+ glTexImage3D(target, level, fmt, size.x, size.y, size.z, 0, comp, type, data);
allocated |= 1<<level;
}
allocate_(level);
- PixelComponents comp = get_components(storage_fmt);
+ GLenum comp = get_gl_components(get_components(storage_fmt));
GLenum type = get_gl_type(get_component_type(storage_fmt));
if(ARB_direct_state_access)
glTextureSubImage3D(id, level, x, y, z, wd, ht, dp, comp, type, data);