]> git.tdb.fi Git - libs/gl.git/blobdiff - source/texture2d.cpp
Add more public methods to Transform
[libs/gl.git] / source / texture2d.cpp
index 52144e59c397d240444bfb3bb3e98a6bafb3b650..806e4a179bded9f8a71264ecce78bccafc529870 100644 (file)
@@ -1,12 +1,11 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <png.h>
-#include <msp/core/error.h>
+#include <msp/core/raii.h>
+#include <msp/gl/extensions/arb_direct_state_access.h>
+#include <msp/gl/extensions/arb_texture_storage.h>
+#include "bindable.h"
+#include "buffer.h"
+#include "error.h"
+#include "pixelstore.h"
+#include "resources.h"
 #include "texture2d.h"
 
 using namespace std;
@@ -14,113 +13,269 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Texture2D::Texture2D()
+class Texture2D::AsyncLoader: public Resource::AsyncLoader
 {
-       target=GL_TEXTURE_2D;
+private:
+       Texture2D &texture;
+       IO::Seekable &io;
+       bool srgb_conversion;
+       Buffer pixel_buffer;
+       char *mapped_address;
+       Graphics::Image image;
+       unsigned n_bytes;
+       int phase;
+
+public:
+       AsyncLoader(Texture2D &, IO::Seekable &);
+
+       void set_srgb_conversion(bool);
+       virtual bool needs_sync() const;
+       virtual bool process();
+};
+
+
+Texture2D::Texture2D(ResourceManager *m):
+       Texture(GL_TEXTURE_2D, m),
+       width(0),
+       height(0),
+       allocated(0)
+{ }
+
+Texture2D::~Texture2D()
+{
+       set_manager(0);
 }
 
-/**
-Uploads an image into the texture.  Direct wrapper for glTexImage2D.
-*/
-void Texture2D::image(int level, int ifmt, sizei wd, sizei ht, int border, GLenum fmt, GLenum type, void *data)
+void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv)
 {
-       maybe_bind();
+       if(width>0)
+               throw invalid_operation("Texture2D::storage");
+       if(wd==0 || ht==0)
+               throw invalid_argument("Texture2D::storage");
 
-       glTexImage2D(target, level, ifmt, wd, ht, border, fmt, type, data);
-       width_=wd;
-       height_=ht;
+       set_internal_format(fmt);
+       width = wd;
+       height = ht;
+       levels = get_n_levels();
+       if(lv>0)
+               levels = min(levels, lv);
 }
 
-/**
-Uploads an image into the texture, with a simpler interface.
-*/
-void Texture2D::image(int level, sizei wd, sizei ht, TextureFormat tfmt, void *data)
+void Texture2D::allocate(unsigned level)
 {
-       int ifmt;
-       int fmt;
-       int type;
+       if(width==0 || height==0)
+               throw invalid_operation("Texture2D::allocate");
+       if(level>=levels)
+               throw invalid_argument("Texture2D::allocate");
+       if(allocated&(1<<level))
+               return;
 
-       switch(tfmt)
+       if(ARB_texture_storage)
        {
-       case LUMINANCE8:        ifmt=GL_LUMINANCE;       fmt=GL_LUMINANCE;       type=GL_UNSIGNED_BYTE; break;
-       case LUMINANCE8_ALPHA8: ifmt=GL_LUMINANCE_ALPHA; fmt=GL_LUMINANCE_ALPHA; type=GL_UNSIGNED_BYTE; break;
-       case RGB8:  ifmt=GL_RGB;  fmt=GL_RGB;  type=GL_UNSIGNED_BYTE;        break;
-       case RGBA8: ifmt=GL_RGBA; fmt=GL_RGBA; type=GL_UNSIGNED_INT_8_8_8_8_REV; break;
-       case BGR8:  ifmt=GL_RGB;  fmt=GL_BGR;  type=GL_UNSIGNED_BYTE;        break;
-       case BGRA8: ifmt=GL_RGBA; fmt=GL_BGRA; type=GL_UNSIGNED_INT_8_8_8_8_REV; break;
-       default: throw InvalidParameterValue("Invalid texture format");
+               if(ARB_direct_state_access)
+                       glTextureStorage2D(id, levels, ifmt, width, height);
+               else
+               {
+                       BindRestore _bind(this);
+                       glTexStorage2D(target, levels, ifmt, width, height);
+               }
+               allocated |= (1<<levels)-1;
+       }
+       else
+       {
+               PixelFormat base_fmt = get_base_pixelformat(ifmt);
+               image(level, base_fmt, get_alloc_type(base_fmt), 0);
        }
-
-       image(level, ifmt, wd, ht, 0, fmt, type, data);
 }
 
-/**
-Loads an image from a file and uploads it into the texture.  Currently assumes
-the file to be a PNG image.
-*/
-void Texture2D::image(const string &fn)
+void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
 {
-       FILE *file=fopen(fn.c_str(), "r");
-       if(!file) throw Exception("Couldn't open "+fn);
+       if(width==0 || height==0)
+               throw invalid_operation("Texture2D::image");
+
+       unsigned w = width;
+       unsigned h = height;
+       get_level_size(level, w, h);
 
-       char sig[8];
-       fread(sig, 8, 1, file);
-       if(png_sig_cmp((png_byte *)sig, 0, 8))
-                throw Exception("Not a PNG image");
+       if(ARB_texture_storage)
+               return sub_image(level, 0, 0, w, h, fmt, type, data);
 
-       png_struct *pngs=png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0);
-       png_info   *pngi=png_create_info_struct(pngs);
+       BindRestore _bind(this);
+       glTexImage2D(target, level, ifmt, w, h, 0, get_upload_format(fmt), type, data);
 
-       if(setjmp(png_jmpbuf(pngs)))
+       allocated |= 1<<level;
+       if(gen_mipmap && level==0)
        {
-               png_destroy_read_struct(&pngs, &pngi, 0);
-               fclose(file);
-               throw Exception("PNG error");
+               auto_generate_mipmap();
+               allocated |= (1<<get_n_levels())-1;
        }
-       png_init_io(pngs, file);
-       png_set_sig_bytes(pngs, 8);
+}
 
-       png_read_info(pngs, pngi);
+void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
+{
+       if(width==0 || height==0)
+               throw invalid_operation("Texture2D::sub_image");
 
-       unsigned wd=png_get_image_width(pngs, pngi);
-       unsigned ht=png_get_image_height(pngs, pngi);
-       unsigned depth=png_get_bit_depth(pngs, pngi);
-       unsigned ctype=png_get_color_type(pngs, pngi);
+       Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
+       allocate(level);
 
-       if(ctype==PNG_COLOR_TYPE_PALETTE || depth<8)
-       {
-               png_destroy_read_struct(&pngs, &pngi, 0);
-               fclose(file);
-               throw Exception("Invalid color type or bit depth");
-       }
+       fmt = get_upload_format(fmt);
+       if(ARB_direct_state_access)
+               glTextureSubImage2D(id, level, x, y, wd, ht, fmt, type, data);
+       else
+               glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
 
-       if(depth==16)
-               png_set_strip_16(pngs);
+       if(gen_mipmap && level==0)
+               auto_generate_mipmap();
+}
 
-       TextureFormat fmt;
-       unsigned planes;
+void Texture2D::image(const Graphics::Image &img, bool srgb)
+{
+       image(img, srgb, false);
+}
 
-       switch(ctype)
+void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer)
+{
+       unsigned w = img.get_width();
+       unsigned h = img.get_height();
+       PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+       if(width==0)
        {
-       case PNG_COLOR_TYPE_GRAY: fmt=LUMINANCE8; planes=1; break;
-       case PNG_COLOR_TYPE_GRAY_ALPHA: fmt=LUMINANCE8_ALPHA8; planes=2; break;
-       case PNG_COLOR_TYPE_RGB: fmt=RGB8; planes=3; break;
-       case PNG_COLOR_TYPE_RGB_ALPHA: fmt=RGBA8; planes=4; break;
-       default: throw Exception("Invalid color type");
+               unsigned l = (is_mipmapped(min_filter) ? mipmap_levels ? mipmap_levels : 0 : 1);
+               storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, l);
        }
+       else if(w!=width || h!=height)
+               throw incompatible_data("Texture2D::image");
+
+       PixelStore pstore = PixelStore::from_image(img);
+       BindRestore _bind_ps(pstore);
+
+       image(0, fmt, UNSIGNED_BYTE, from_buffer ? 0 : img.get_data());
+}
+
+unsigned Texture2D::get_n_levels() const
+{
+       unsigned n = 0;
+       for(unsigned s=max(width, height); s; s>>=1, ++n) ;
+       return n;
+}
+
+void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h) const
+{
+       w >>= level;
+       h >>= level;
 
-       png_byte *data=new png_byte[wd*ht*planes];
-       png_byte *row_ptrs[ht];
-       for(unsigned i=0; i<ht; ++i)
-               row_ptrs[i]=data+(ht-1-i)*wd*planes;
+       if(!w && h)
+               w = 1;
+       else if(!h && w)
+               h = 1;
+}
 
-       png_read_image(pngs, row_ptrs);
+Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *res)
+{
+       AsyncLoader *ldr = new AsyncLoader(*this, io);
+       if(res)
+               ldr->set_srgb_conversion(res->get_srgb_conversion());
+       return ldr;
+}
 
-       image(0, wd, ht, fmt, data);
-       delete[] data;
+UInt64 Texture2D::get_data_size() const
+{
+       return id ? width*height*get_pixel_size(ifmt) : 0;
+}
+
+void Texture2D::unload()
+{
+       glDeleteTextures(1, &id);
+       id = 0;
+       // TODO check which params actually need refreshing
+       dirty_params = -1;
+}
+
+
+Texture2D::Loader::Loader(Texture2D &t):
+       DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>(t)
+{
+       init();
+}
+
+Texture2D::Loader::Loader(Texture2D &t, Collection &c):
+       DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>(t, c)
+{
+       init();
+}
+
+void Texture2D::Loader::init()
+{
+       add("raw_data", &Loader::raw_data);
+       add("storage", &Loader::storage);
+}
+
+void Texture2D::Loader::raw_data(const string &data)
+{
+       obj.image(0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
+}
+
+void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
+{
+       obj.storage(fmt, w, h);
+}
+
+
+Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i):
+       texture(t),
+       io(i),
+       srgb_conversion(false),
+       pixel_buffer(PIXEL_UNPACK_BUFFER),
+       mapped_address(0),
+       phase(0)
+{ }
+
+void Texture2D::AsyncLoader::set_srgb_conversion(bool c)
+{
+       srgb_conversion = c;
+}
+
+bool Texture2D::AsyncLoader::needs_sync() const
+{
+       return phase%2;
+}
+
+bool Texture2D::AsyncLoader::process()
+{
+       if(phase==0)
+       {
+               /* TODO Enhance the ImageLoader system so that the image can be loaded
+               directly to the buffer */
+               image.load_io(io);
+               n_bytes = image.get_stride()*image.get_height();
+       }
+       else if(phase==1)
+       {
+               pixel_buffer.data(n_bytes, 0);
+               mapped_address = reinterpret_cast<char *>(pixel_buffer.map(WRITE_ONLY));
+       }
+       else if(phase==2)
+       {
+               const char *data = reinterpret_cast<const char *>(image.get_data());
+               copy(data, data+n_bytes, mapped_address);
+       }
+       else if(phase==3)
+       {
+               Bind _bind_buf(pixel_buffer, PIXEL_UNPACK_BUFFER);
+               if(!pixel_buffer.unmap())
+               {
+                       phase = 1;
+                       return false;
+               }
+
+               if(!texture.id)
+                       glGenTextures(1, &texture.id);
+               texture.image(image, srgb_conversion, true);
+       }
 
-       png_destroy_read_struct(&pngs, &pngi, 0);
-       fclose(file);
+       ++phase;
+       return phase>3;
 }
 
 } // namespace GL