#include <msp/gl/extensions/arb_direct_state_access.h>
#include <msp/gl/extensions/arb_texture_storage.h>
#include <msp/graphics/imageloader.h>
-#include "bindable.h"
#include "buffer.h"
#include "error.h"
#include "resources.h"
if(ARB_texture_storage)
{
+ GLenum fmt = get_gl_pixelformat(storage_fmt);
if(ARB_direct_state_access)
- glTextureStorage2D(id, levels, storage_fmt, width, height);
+ glTextureStorage2D(id, levels, fmt, width, height);
else
- glTexStorage2D(target, levels, storage_fmt, width, height);
+ glTexStorage2D(target, levels, fmt, width, height);
apply_swizzle();
allocated |= (1<<levels)-1;
}
}
LinAl::Vector<unsigned, 2> 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));
- glTexImage2D(target, level, storage_fmt, size.x, size.y, 0, comp, type, data);
+ glTexImage2D(target, level, fmt, size.x, size.y, 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)
glTextureSubImage2D(id, level, x, y, wd, ht, comp, type, data);