Use default member initializers for simple types

[libs/gl.git] / source / core / texture2d.cpp

diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp
index 6edbba0d993a0f3795d264834c43054d5acd23b2..3c3579c1d131137f89ab49b57dd565f15a3ed544 100644 (file)
--- a/source/core/texture2d.cpp
+++ b/source/core/texture2d.cpp
@@ -1,10 +1,4 @@
-#include <msp/gl/extensions/arb_direct_state_access.h>
-#include <msp/gl/extensions/arb_texture_storage.h>
-#include <msp/gl/extensions/arb_vertex_buffer_object.h>
-#include <msp/graphics/imageloader.h>
-#include "buffer.h"
 #include "error.h"
-#include "resources.h"
 #include "texture2d.h"
 
 using namespace std;
@@ -12,33 +6,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-class Texture2D::AsyncLoader: public Resource::AsyncLoader
-{
-private:
-       Texture2D &texture;
-       IO::Seekable &io;
-       Buffer pixel_buffer;
-       char *mapped_address;
-       Graphics::Image image;
-       Graphics::ImageLoader *img_loader;
-       unsigned n_bytes;
-       int phase;
-
-public:
-       AsyncLoader(Texture2D &, IO::Seekable &);
-       ~AsyncLoader();
-
-       virtual bool needs_sync() const;
-       virtual bool process();
-};
-
-
-Texture2D::Texture2D(ResourceManager *m):
-       Texture(GL_TEXTURE_2D, m),
-       width(0),
-       height(0)
-{ }
-
 Texture2D::~Texture2D()
 {
        set_manager(0);
@@ -62,31 +29,7 @@ void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv)
        if(lv>0)
                levels = min(levels, lv);
 
-       GLenum gl_fmt = get_gl_pixelformat(storage_fmt);
-       if(ARB_texture_storage)
-       {
-               if(ARB_direct_state_access)
-                       glTextureStorage2D(id, levels, gl_fmt, width, height);
-               else
-               {
-                       bind_scratch();
-                       glTexStorage2D(target, levels, gl_fmt, width, height);
-               }
-       }
-       else
-       {
-               bind_scratch();
-               glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
-               GLenum comp = get_gl_components(get_components(storage_fmt));
-               GLenum type = get_gl_type(get_component_type(storage_fmt));
-               for(unsigned i=0; i<levels; ++i)
-               {
-                       LinAl::Vector<unsigned, 2> lv_size = get_level_size(i);
-                       glTexImage2D(target, i, gl_fmt, lv_size.x, lv_size.y, 0, comp, type, 0);
-               }
-       }
-
-       apply_swizzle();
+       allocate();
 }
 
 void Texture2D::image(unsigned level, const void *data)
@@ -102,22 +45,7 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
        if(level>=levels)
                throw out_of_range("Texture2D::sub_image");
 
-       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);
-       }
-}
-
-void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const Buffer &buffer, unsigned offset)
-{
-       glBindBuffer(GL_PIXEL_UNPACK_BUFFER, buffer.id);
-       sub_image(level, x, y, wd, ht, reinterpret_cast<void *>(offset));
-       glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
+       Texture2DBackend::sub_image(level, x, y, wd, ht, data);
 }
 
 void Texture2D::image(const Graphics::Image &img, unsigned lv)
@@ -148,8 +76,7 @@ LinAl::Vector<unsigned, 2> Texture2D::get_level_size(unsigned level) const
 
 Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *)
 {
-       AsyncLoader *ldr = new AsyncLoader(*this, io);
-       return ldr;
+       return create_async_loader(io);
 }
 
 uint64_t Texture2D::get_data_size() const
@@ -157,12 +84,6 @@ uint64_t Texture2D::get_data_size() const
        return id ? width*height*get_pixel_size(format) : 0;
 }
 
-void Texture2D::unload()
-{
-       glDeleteTextures(1, &id);
-       id = 0;
-}
-
 
 Texture2D::Loader::Loader(Texture2D &t):
        DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>(t)
@@ -186,11 +107,7 @@ 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());
 }
 
@@ -204,65 +121,5 @@ void Texture2D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned h,
        obj.storage(fmt, w, h, l);
 }
 
-
-Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i):
-       texture(t),
-       io(i),
-       mapped_address(0),
-       img_loader(Graphics::ImageLoader::open_io(io)),
-       phase(0)
-{ }
-
-Texture2D::AsyncLoader::~AsyncLoader()
-{
-       if(mapped_address)
-               pixel_buffer.unmap();
-       delete img_loader;
-}
-
-bool Texture2D::AsyncLoader::needs_sync() const
-{
-       return phase%2;
-}
-
-bool Texture2D::AsyncLoader::process()
-{
-       if(phase==0)
-       {
-               image.load_headers(*img_loader);
-               n_bytes = image.get_stride()*image.get_height();
-       }
-       else if(phase==1)
-       {
-               pixel_buffer.storage(n_bytes);
-               mapped_address = reinterpret_cast<char *>(pixel_buffer.map());
-       }
-       else if(phase==2)
-               image.load_into(*img_loader, mapped_address);
-       else if(phase==3)
-       {
-               mapped_address = 0;
-               if(!pixel_buffer.unmap())
-               {
-                       phase = 1;
-                       return false;
-               }
-
-               if(!texture.id)
-                       texture.generate_id();
-
-               unsigned w = image.get_width();
-               unsigned h = image.get_height();
-               texture.storage(pixelformat_from_image(image, texture.use_srgb_format), w, h);
-               texture.sub_image(0, 0, 0, w, h, pixel_buffer, 0);
-
-               if(texture.auto_gen_mipmap)
-                       texture.generate_mipmap();
-       }
-
-       ++phase;
-       return phase>3;
-}
-
 } // namespace GL
 } // namespace Msp