X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture.cpp;h=a65715e716a26c6fbc283655c37c0382fc795010;hp=5c82dbe535d91a3036c4eed0f0f3e4d93a2e2fdb;hb=HEAD;hpb=4e9fe48180c7b4646ac2591e172de61f7a693b32 diff --git a/source/core/texture.cpp b/source/core/texture.cpp index 5c82dbe5..a65715e7 100644 --- a/source/core/texture.cpp +++ b/source/core/texture.cpp @@ -1,157 +1,81 @@ -#include -#include -#include -#include +#include #include #include "error.h" #include "resourcemanager.h" -#include "resources.h" #include "texture.h" +#include "texture1d.h" +#include "texture2d.h" +#include "texture2darray.h" +#include "texture3d.h" +#include "texturecube.h" using namespace std; namespace Msp { namespace GL { -int Texture::swizzle_orders[] = -{ - GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, - GL_RED, GL_RED, GL_RED, GL_ONE, - GL_RED, GL_RED, GL_RED, GL_GREEN, - GL_BLUE, GL_GREEN, GL_RED, GL_ALPHA -}; - -Texture *Texture::scratch_binding = 0; - -Texture::Texture(GLenum t, ResourceManager *m): - id(0), - target(t), - format(RGB8), - storage_fmt(RGB8), - swizzle(NO_SWIZZLE), - use_srgb_format(false), - auto_gen_mipmap(false) -{ - if(m) - set_manager(m); - else - generate_id(); - - static bool alignment_init = false; - if(!alignment_init) - { - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - alignment_init = true; - } -} - -Texture::~Texture() -{ - if(this==scratch_binding) - unbind_scratch(); - if(id) - glDeleteTextures(1, &id); -} - -void Texture::generate_id() -{ - if(id) - throw invalid_operation("Texture::generate_id"); - if(ARB_direct_state_access) - glCreateTextures(target, 1, &id); - else - glGenTextures(1, &id); - -#ifdef DEBUG - if(!debug_name.empty() && KHR_debug) - glObjectLabel(GL_TEXTURE, id, debug_name.size(), debug_name.c_str()); -#endif -} +Texture::Texture(unsigned t): + TextureBackend(t) +{ } void Texture::set_format(PixelFormat fmt) { PixelComponents comp = get_components(fmt); - PixelComponents st_comp = comp; - FormatSwizzle swiz = NO_SWIZZLE; - switch(comp) - { - case LUMINANCE: - st_comp = RED; - swiz = R_TO_LUMINANCE; - break; - case LUMINANCE_ALPHA: - st_comp = RG; - swiz = RG_TO_LUMINANCE_ALPHA; - break; - case BGR: - st_comp = RGB; - swiz = RGB_TO_BGR; - break; - case BGRA: - st_comp = RGBA; - swiz = RGB_TO_BGR; - break; - default:; - } + ComponentSwizzle swiz = get_required_swizzle(comp); + PixelComponents st_comp = unswizzle_components(comp, swiz); PixelFormat st_fmt = make_pixelformat(st_comp, get_component_type(fmt), is_srgb(fmt)); require_pixelformat(st_fmt); if(swiz!=NO_SWIZZLE) - static Require _req(ARB_texture_swizzle); + require_swizzle(); format = fmt; storage_fmt = st_fmt; swizzle = swiz; } -void Texture::apply_swizzle() +unsigned Texture::count_levels(unsigned size) { - if(swizzle==NO_SWIZZLE) - return; - - if(get_gl_api()==OPENGL_ES2) - { - set_parameter_i(GL_TEXTURE_SWIZZLE_R, swizzle_orders[swizzle*4]); - set_parameter_i(GL_TEXTURE_SWIZZLE_G, swizzle_orders[swizzle*4+1]); - set_parameter_i(GL_TEXTURE_SWIZZLE_B, swizzle_orders[swizzle*4+2]); - set_parameter_i(GL_TEXTURE_SWIZZLE_A, swizzle_orders[swizzle*4+3]); - } - else - { - if(ARB_direct_state_access) - glTextureParameteriv(id, GL_TEXTURE_SWIZZLE_RGBA, swizzle_orders+swizzle*4); - else - glTexParameteriv(target, GL_TEXTURE_SWIZZLE_RGBA, swizzle_orders+swizzle*4); - } + unsigned n = 0; + for(; size; size>>=1, ++n) ; + return n; } -void Texture::set_parameter_i(GLenum param, int value) const +void Texture::stage_pixels(void *staging, const void *data, size_t count) { - if(ARB_direct_state_access) - glTextureParameteri(id, param, value); - else - glTexParameteri(target, param, value); -} - -void Texture::generate_mipmap() -{ - // glGenerateMipmap is defined here - static Require _req(EXT_framebuffer_object); - - if(ARB_direct_state_access) - glGenerateTextureMipmap(id); + if(swizzle==RGBA_TO_RGB) + { + const uint32_t *src = static_cast(data); + uint32_t *dst = static_cast(staging); + size_t i = 0; + for(; i+3>24)|(src[1]<<8)|0xFF000000; + dst[2] = (src[1]>>16)|(src[2]<<16)|0xFF000000; + dst[3] = (src[2]>>8)|0xFF000000; + src += 3; + dst += 4; + } + + if(i(src); + for(; i(data); + size_t data_size = count*get_pixel_size(storage_fmt); + copy(src, src+data_size, static_cast(staging)); } } -void Texture::load_image(const string &fn, bool) -{ - load_image(fn, 0U); -} - void Texture::load_image(const string &fn, unsigned lv) { Graphics::Image img; @@ -160,66 +84,34 @@ void Texture::load_image(const string &fn, unsigned lv) image(img, lv); } -void Texture::image(const Graphics::Image &img, bool) +Texture::GenericLoader::TypeRegistry &Texture::get_texture_registry() { - image(img, 0U); -} - -void Texture::set_debug_name(const string &name) -{ -#ifdef DEBUG - debug_name = name; - if(id && KHR_debug) - glObjectLabel(GL_TEXTURE, id, name.size(), name.c_str()); -#else - (void)name; -#endif -} - -void Texture::bind_scratch() -{ - if(!scratch_binding) - glActiveTexture(GL_TEXTURE0); - if(scratch_binding!=this) + static GenericLoader::TypeRegistry registry; + static bool initialized = false; + if(!initialized) { - if(scratch_binding && scratch_binding->target!=target) - glBindTexture(scratch_binding->target, 0); - glBindTexture(target, id); - scratch_binding = this; + initialized = true; + registry.register_type("1d"); + registry.register_type("2d"); + registry.register_type("3d"); + registry.register_type("2d_array"); + registry.register_type("cube"); } + return registry; } -void Texture::unbind_scratch() -{ - if(scratch_binding) - { - glBindTexture(scratch_binding->target, 0); - scratch_binding = 0; - } -} - - -Texture::Loader::Loader(Texture &t): - DataFile::CollectionObjectLoader(t, 0) -{ - init(); -} - -Texture::Loader::Loader(Texture &t, Collection &c): - DataFile::CollectionObjectLoader(t, &c) -{ - init(); -} -void Texture::Loader::init() +Texture::Loader::Loader(Texture &t, Collection *c): + CollectionObjectLoader(t, c), + levels(0) { - levels = 0; - - add("external_image", &Loader::external_image); - add("external_image_srgb", &Loader::external_image_srgb); + add("external_data", &Loader::external_data); + add("external_image", &Loader::external_image, false); + add("external_image_srgb", &Loader::external_image, true); add("generate_mipmap", &Loader::generate_mipmap); add("image_data", &Loader::image_data); add("mipmap_levels", &Loader::mipmap_levels); + add("raw_data", &Loader::raw_data); } void Texture::Loader::finish() @@ -236,20 +128,22 @@ void Texture::Loader::load_external_image(Graphics::Image &img, const string &fn img.load_io(*io); } -void Texture::Loader::external_image(const string &fn) +void Texture::Loader::external_data(const string &fn) { - obj.use_srgb_format = false; - external_image_common(fn); -} - -void Texture::Loader::external_image_srgb(const string &fn) -{ - obj.use_srgb_format = true; - external_image_common(fn); + if(obj.manager) + obj.manager->set_resource_location(obj, get_collection(), fn); + else + { + DataFile::RawData rd; + rd.open_file(get_collection(), fn); + rd.load(); + obj.image(0, rd.get_data()); + } } -void Texture::Loader::external_image_common(const string &fn) +void Texture::Loader::external_image(bool srgb, const string &fn) { + obj.use_srgb_format = srgb; if(obj.manager) obj.manager->set_resource_location(obj, get_collection(), fn); else @@ -268,11 +162,7 @@ void Texture::Loader::generate_mipmap(bool gm) void Texture::Loader::image_data(const string &data) { if(obj.manager) - { obj.set_manager(0); - if(!obj.id) - obj.generate_id(); - } Graphics::Image img; IO::Memory mem(data.data(), data.size()); @@ -286,5 +176,13 @@ void Texture::Loader::mipmap_levels(unsigned l) levels = l; } +void Texture::Loader::raw_data(const string &data) +{ + if(obj.manager) + obj.set_manager(0); + + obj.image(0, data.data()); +} + } // namespace GL } // namespace Msp