Use standard fixed-size integer types

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

diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp
index c0a96a4e7e2d43e10e14b58f268d8952fe0ac90c..857ef17a69b7c501706c235e888e78ccc8f83856 100644 (file)
--- a/source/core/texture2d.cpp
+++ b/source/core/texture2d.cpp
@@ -2,10 +2,8 @@
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/graphics/imageloader.h>
-#include "bindable.h"
 #include "buffer.h"
 #include "error.h"
-#include "pixelstore.h"
 #include "resources.h"
 #include "texture2d.h"
 
@@ -77,11 +75,14 @@ void Texture2D::allocate(unsigned level)
 
        if(ARB_texture_storage)
        {
-               Conditional<BindRestore> _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)-1;
        }
@@ -93,15 +94,15 @@ 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");
 
-       unsigned w = width;
-       unsigned h = height;
-       get_level_size(level, w, h);
+       LinAl::Vector<unsigned, 2> 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)
        {
@@ -109,16 +110,12 @@ void Texture2D::image(unsigned level, const void *data)
                apply_swizzle();
        }
 
-       PixelComponents comp = get_components(storage_fmt);
+       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, storage_fmt, w, h, 0, comp, type, data);
+       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;
-       }
 }
 
 void Texture2D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
@@ -132,19 +129,20 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 {
        if(width==0 || height==0)
                throw invalid_operation("Texture2D::sub_image");
+       if(level>=levels)
+               throw out_of_range("Texture2D::sub_image");
 
-       Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
        allocate(level);
 
-       PixelComponents comp = get_components(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)
@@ -166,9 +164,6 @@ void Texture2D::image(const Graphics::Image &img, unsigned lv, bool from_buffer)
        PixelFormat fmt = pixelformat_from_image(img);
        storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, lv);
 
-       PixelStore pstore = PixelStore::from_image(img);
-       BindRestore _bind_ps(pstore);
-
        image(0, from_buffer ? 0 : img.get_pixels());
 }
 
@@ -179,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<unsigned, 2> 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<unsigned, 2>(w, h);
 }
 
 Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *)
@@ -196,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;
 }
@@ -206,7 +203,6 @@ void Texture2D::unload()
        glDeleteTextures(1, &id);
        id = 0;
        allocated = 0;
-       default_sampler.unload();
 }
 
 
@@ -287,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())
                {
@@ -297,7 +292,11 @@ 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);
+               if(texture.auto_gen_mipmap)
+                       texture.generate_mipmap();
        }
 
        ++phase;