Clean up includes and forward declarations for the core classes

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

diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp
index ed0b206c1e05069ada3d8e677c84995b706e920b..70a9528d9af9b030dec83c6c88f18dfedce47bd4 100644 (file)
--- a/source/core/texture2d.cpp
+++ b/source/core/texture2d.cpp
@@ -1,10 +1,9 @@
-#include <msp/core/raii.h>
 #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;
@@ -36,8 +35,7 @@ public:
 Texture2D::Texture2D(ResourceManager *m):
        Texture(GL_TEXTURE_2D, m),
        width(0),
-       height(0),
-       allocated(0)
+       height(0)
 { }
 
 Texture2D::~Texture2D()
@@ -62,72 +60,38 @@ void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv)
        levels = get_n_levels();
        if(lv>0)
                levels = min(levels, lv);
-}
-
-void Texture2D::allocate(unsigned level)
-{
-       if(width==0 || height==0)
-               throw invalid_operation("Texture2D::allocate");
-       if(level>=levels)
-               throw invalid_argument("Texture2D::allocate");
-       if(allocated&(1<<level))
-               return;
 
+       GLenum gl_fmt = get_gl_pixelformat(storage_fmt);
        if(ARB_texture_storage)
        {
-               GLenum fmt = get_gl_pixelformat(storage_fmt);
                if(ARB_direct_state_access)
-                       glTextureStorage2D(id, levels, fmt, width, height);
+                       glTextureStorage2D(id, levels, gl_fmt, width, height);
                else
                {
                        bind_scratch();
-                       glTexStorage2D(target, levels, fmt, width, height);
+                       glTexStorage2D(target, levels, gl_fmt, width, height);
                }
-               apply_swizzle();
-               allocated |= (1<<levels)-1;
        }
        else
-               image(level, 0);
-}
-
-void Texture2D::image(unsigned level, const void *data)
-{
-       if(width==0 || height==0)
-               throw invalid_operation("Texture2D::image");
-       if(level>=levels)
-               throw out_of_range("Texture2D::image");
-
-       LinAl::Vector<unsigned, 2> size = get_level_size(level);
-
-       if(ARB_texture_storage)
-               return sub_image(level, 0, 0, size.x, size.y, data);
-
-       bind_scratch();
-
-       if(!allocated)
        {
+               bind_scratch();
                glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
-               apply_swizzle();
+               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);
+               }
        }
 
-       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<<level;
-       if(auto_gen_mipmap && level==0)
-       {
-               generate_mipmap();
-               allocated |= (1<<levels)-1;
-       }
+       apply_swizzle();
 }
 
-void Texture2D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
+void Texture2D::image(unsigned level, const void *data)
 {
-       if(comp!=get_components(format) || type!=get_component_type(format))
-               throw incompatible_data("Texture2D::image");
-       image(level, data);
+       LinAl::Vector<unsigned, 2> size = get_level_size(level);
+       return sub_image(level, 0, 0, size.x, size.y, data);
 }
 
 void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data)
@@ -137,8 +101,6 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
        if(level>=levels)
                throw out_of_range("Texture2D::sub_image");
 
-       allocate(level);
-
        GLenum comp = get_gl_components(get_components(storage_fmt));
        GLenum type = get_gl_type(get_component_type(storage_fmt));
        if(ARB_direct_state_access)
@@ -148,31 +110,19 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
                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)
+void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const Buffer &buffer, unsigned offset)
 {
-       if(comp!=get_components(format) || type!=get_component_type(format))
-               throw incompatible_data("Texture2D::sub_image");
-       sub_image(level, x, y, wd, ht, data);
+       glBindBuffer(GL_PIXEL_UNPACK_BUFFER, buffer.id);
+       sub_image(level, x, y, wd, ht, reinterpret_cast<void *>(offset));
+       glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
 }
 
 void Texture2D::image(const Graphics::Image &img, unsigned lv)
 {
-       image(img, lv, false);
-}
-
-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);
-       storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, lv);
-
-       image(0, from_buffer ? 0 : img.get_pixels());
+       storage(pixelformat_from_image(img, use_srgb_format), img.get_width(), img.get_height(), lv);
+       image(0, img.get_pixels());
 }
 
 unsigned Texture2D::get_n_levels() const
@@ -201,7 +151,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;
 }
@@ -210,7 +160,6 @@ void Texture2D::unload()
 {
        glDeleteTextures(1, &id);
        id = 0;
-       allocated = 0;
 }
 
 
@@ -300,9 +249,14 @@ bool Texture2D::AsyncLoader::process()
 
                if(!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);
+
+               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;