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 09831cb3385abcc5eeaf5f9e5404e33a6a427f3f..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"
 
@@ -72,36 +70,24 @@ void Texture2D::allocate(unsigned level)
                throw invalid_operation("Texture2D::allocate");
        if(level>=levels)
                throw invalid_argument("Texture2D::allocate");
-
-       bool direct = ARB_texture_storage && ARB_direct_state_access;
-       if(!direct)
-       {
-               glActiveTexture(GL_TEXTURE0);
-               glBindTexture(target, id);
-       }
-
-       allocate_(level);
-
-       if(!direct)
-               glBindTexture(target, 0);
-}
-
-void Texture2D::allocate_(unsigned level)
-{
        if(allocated&(1<<level))
                return;
 
        if(ARB_texture_storage)
        {
+               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;
        }
        else
-               image_(level, 0);
+               image(level, 0);
 }
 
 void Texture2D::image(unsigned level, const void *data)
@@ -111,38 +97,23 @@ void Texture2D::image(unsigned level, const void *data)
        if(level>=levels)
                throw out_of_range("Texture2D::image");
 
+       LinAl::Vector<unsigned, 2> size = get_level_size(level);
+
        if(ARB_texture_storage)
-       {
-               LinAl::Vector<unsigned, 2> size = get_level_size(level);
                return sub_image(level, 0, 0, size.x, size.y, data);
-       }
 
-       glActiveTexture(GL_TEXTURE0);
-       glBindTexture(target, id);
+       bind_scratch();
 
-       image_(level, data);
-
-       if(auto_gen_mipmap && level==0)
-       {
-               generate_mipmap_();
-               allocated |= (1<<levels)-1;
-       }
-
-       glBindTexture(target, 0);
-}
-
-void Texture2D::image_(unsigned level, const void *data)
-{
        if(!allocated)
        {
                glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
                apply_swizzle();
        }
 
-       LinAl::Vector<unsigned, 2> size = get_level_size(level);
-       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, size.x, size.y, 0, comp, type, data);
+       glTexImage2D(target, level, fmt, size.x, size.y, 0, comp, type, data);
 
        allocated |= 1<<level;
 }
@@ -161,27 +132,17 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
        if(level>=levels)
                throw out_of_range("Texture2D::sub_image");
 
-       bool direct = (ARB_direct_state_access && (ARB_texture_storage || (allocated&(1<<level))));
-       if(!direct)
-       {
-               glActiveTexture(GL_TEXTURE0);
-               glBindTexture(target, id);
-       }
-
-       allocate_(level);
+       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_();
-
-       if(!direct)
-               glBindTexture(target, 0);
+       }
 }
 
 void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
@@ -203,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());
 }
 
@@ -235,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;
 }
@@ -337,6 +295,8 @@ bool Texture2D::AsyncLoader::process()
                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;