X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture2d.cpp;h=857ef17a69b7c501706c235e888e78ccc8f83856;hp=0e76128c7bc5666da5828f11fe98f5398ecaf380;hb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266 diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp index 0e76128c..857ef17a 100644 --- a/source/core/texture2d.cpp +++ b/source/core/texture2d.cpp @@ -2,10 +2,8 @@ #include #include #include -#include "bindable.h" #include "buffer.h" #include "error.h" -#include "pixelstore.h" #include "resources.h" #include "texture2d.h" @@ -50,7 +48,11 @@ Texture2D::~Texture2D() void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv) { if(width>0) - throw invalid_operation("Texture2D::storage"); + { + if(fmt!=format || wd!=width || ht!=height || (lv && lv!=levels)) + throw incompatible_data("Texture2D::storage"); + return; + } if(wd==0 || ht==0) throw invalid_argument("Texture2D::storage"); @@ -73,11 +75,14 @@ void Texture2D::allocate(unsigned level) if(ARB_texture_storage) { - Conditional _bind(!ARB_direct_state_access, this); + 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); + { + bind_scratch(); + glTexStorage2D(target, levels, fmt, width, height); + } apply_swizzle(); allocated |= (1<=levels) + throw out_of_range("Texture2D::image"); - unsigned w = width; - unsigned h = height; - get_level_size(level, w, h); + LinAl::Vector size = get_level_size(level); if(ARB_texture_storage) - return sub_image(level, 0, 0, w, h, data); + return sub_image(level, 0, 0, size.x, size.y, data); - BindRestore _bind(this); + bind_scratch(); if(!allocated) { @@ -105,16 +110,12 @@ void Texture2D::image(unsigned level, const void *data) apply_swizzle(); } - PixelComponents comp = get_components(storage_fmt); - DataType type = get_component_type(storage_fmt); - glTexImage2D(target, level, storage_fmt, w, h, 0, comp, type, data); + 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, fmt, size.x, size.y, 0, comp, type, data); allocated |= 1<=levels) + throw out_of_range("Texture2D::sub_image"); - Conditional _bind(!ARB_direct_state_access, this); allocate(level); - PixelComponents comp = get_components(storage_fmt); - DataType type = get_component_type(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); else + { + bind_scratch(); glTexSubImage2D(target, level, x, y, wd, ht, comp, type, data); - - if(auto_gen_mipmap && level==0) - generate_mipmap(); + } } void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data) @@ -160,13 +162,7 @@ void Texture2D::image(const Graphics::Image &img, unsigned lv, bool from_buffer) unsigned w = img.get_width(); unsigned h = img.get_height(); PixelFormat fmt = pixelformat_from_image(img); - if(width==0) - storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, lv); - else if(w!=width || h!=height || (lv && lv!=levels)) - throw incompatible_data("Texture2D::image"); - - PixelStore pstore = PixelStore::from_image(img); - BindRestore _bind_ps(pstore); + storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, lv); image(0, from_buffer ? 0 : img.get_pixels()); } @@ -178,15 +174,17 @@ unsigned Texture2D::get_n_levels() const return n; } -void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h) const +LinAl::Vector Texture2D::get_level_size(unsigned level) const { - w >>= level; - h >>= level; + unsigned w = width>>level; + unsigned h = height>>level; if(!w && h) w = 1; else if(!h && w) h = 1; + + return LinAl::Vector(w, h); } Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *) @@ -195,7 +193,7 @@ Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *) return ldr; } -UInt64 Texture2D::get_data_size() const +uint64_t Texture2D::get_data_size() const { return id ? width*height*get_pixel_size(format) : 0; } @@ -205,7 +203,6 @@ void Texture2D::unload() glDeleteTextures(1, &id); id = 0; allocated = 0; - default_sampler.unload(); } @@ -230,6 +227,12 @@ void Texture2D::Loader::init() void Texture2D::Loader::raw_data(const string &data) { + if(obj.manager) + { + obj.set_manager(0); + if(!obj.id) + obj.generate_id(); + } obj.image(0, data.data()); } @@ -247,7 +250,6 @@ void Texture2D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned h, Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i): texture(t), io(i), - pixel_buffer(PIXEL_UNPACK_BUFFER), mapped_address(0), img_loader(Graphics::ImageLoader::open_io(io)), phase(0) @@ -281,7 +283,6 @@ bool Texture2D::AsyncLoader::process() image.load_into(*img_loader, mapped_address); else if(phase==3) { - Bind _bind_buf(pixel_buffer, PIXEL_UNPACK_BUFFER); mapped_address = 0; if(!pixel_buffer.unmap()) { @@ -290,13 +291,12 @@ bool Texture2D::AsyncLoader::process() } if(!texture.id) - { - if(ARB_direct_state_access) - glCreateTextures(texture.target, 1, &texture.id); - else - glGenTextures(1, &texture.id); - } + texture.generate_id(); + glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pixel_buffer.get_id()); texture.image(image, 0, true); + glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); + if(texture.auto_gen_mipmap) + texture.generate_mipmap(); } ++phase;