Use standard fixed-size integer types

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

diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index 1681f83c6f528b949be627adb9fddf311556806a..285abeb957665b3cad558f2caf62d2d29b04166e 100644 (file)
--- a/source/core/texture3d.cpp
+++ b/source/core/texture3d.cpp
@@ -5,9 +5,7 @@
 #include <msp/gl/extensions/ext_texture3d.h>
 #include <msp/gl/extensions/ext_texture_array.h>
 #include <msp/graphics/image.h>
-#include "bindable.h"
 #include "error.h"
-#include "pixelstore.h"
 #include "texture3d.h"
 
 using namespace std;
@@ -36,7 +34,11 @@ Texture3D::Texture3D():
 void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp, unsigned lv)
 {
        if(width>0)
-               throw invalid_operation("Texture3D::storage");
+       {
+               if(fmt!=format || wd!=width || ht!=height || dp!=depth || (lv && lv!=levels))
+                       throw incompatible_data("Texture3D::storage");
+               return;
+       }
        if(wd==0 || ht==0 || dp==0)
                throw invalid_argument("Texture3D::storage");
 
@@ -60,11 +62,14 @@ void Texture3D::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)
-                       glTextureStorage3D(id, levels, storage_fmt, width, height, depth);
+                       glTextureStorage3D(id, levels, fmt, width, height, depth);
                else
-                       glTexStorage3D(target, levels, storage_fmt, width, height, depth);
+               {
+                       bind_scratch();
+                       glTexStorage3D(target, levels, fmt, width, height, depth);
+               }
                apply_swizzle();
                allocated |= (1<<levels)-1;
        }
@@ -76,16 +81,15 @@ void Texture3D::image(unsigned level, const void *data)
 {
        if(width==0 || height==0 || depth==0)
                throw invalid_operation("Texture3D::image");
+       if(level>=levels)
+               throw out_of_range("Texture3D::image");
 
-       unsigned w = width;
-       unsigned h = height;
-       unsigned d = depth;
-       get_level_size(level, w, h, d);
+       LinAl::Vector<unsigned, 3> size = get_level_size(level);
 
        if(ARB_texture_storage)
-               return sub_image(level, 0, 0, 0, w, h, d, data);
+               return sub_image(level, 0, 0, 0, size.x, size.y, size.z, data);
 
-       BindRestore _bind(this);
+       bind_scratch();
 
        if(!allocated)
        {
@@ -93,16 +97,12 @@ void Texture3D::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));
-       glTexImage3D(target, level, storage_fmt, width, height, depth, 0, comp, type, data);
+       glTexImage3D(target, level, fmt, size.x, size.y, size.z, 0, comp, type, data);
 
        allocated |= 1<<level;
-       if(auto_gen_mipmap && level==0)
-       {
-               generate_mipmap();
-               allocated |= (1<<levels)-1;
-       }
 }
 
 void Texture3D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
@@ -115,20 +115,21 @@ void Texture3D::image(unsigned level, PixelComponents comp, DataType type, const
 void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, const void *data)
 {
        if(width==0 || height==0 || depth==0)
-               throw invalid_operation("Texture3D::image");
+               throw invalid_operation("Texture3D::sub_image");
+       if(level>=levels)
+               throw out_of_range("Texture3D::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)
                glTextureSubImage3D(id, level, x, y, z, wd, ht, dp, comp, type, data);
        else
+       {
+               bind_scratch();
                glTexSubImage3D(target, level, x, y, z, wd, ht, dp, comp, type, data);
-
-       if(auto_gen_mipmap && level==0)
-               generate_mipmap();
+       }
 }
 
 void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, PixelComponents comp, DataType type, const void *data)
@@ -149,13 +150,7 @@ void Texture3D::image(const Graphics::Image &img, unsigned lv)
        h = w;
 
        PixelFormat fmt = pixelformat_from_image(img);
-       if(width==0)
-               storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, d, lv);
-       else if(w!=width || h!=height || d!=depth)
-               throw incompatible_data("Texture3D::load_image");
-
-       PixelStore pstore = PixelStore::from_image(img);
-       BindRestore _bind_ps(pstore);
+       storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, d, lv);
 
        image(0, img.get_pixels());
 }
@@ -170,10 +165,11 @@ unsigned Texture3D::get_n_levels() const
        return n;
 }
 
-void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d) const
+LinAl::Vector<unsigned, 3> Texture3D::get_level_size(unsigned level) const
 {
-       w >>= level;
-       h >>= level;
+       unsigned w = width>>level;
+       unsigned h = height>>level;
+       unsigned d = depth;
        if(target!=GL_TEXTURE_2D_ARRAY)
                d >>= level;
 
@@ -183,9 +179,11 @@ void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigne
                h = 1;
        if(!d && (w || h))
                d = 1;
+
+       return LinAl::Vector<unsigned, 3>(w, h, d);
 }
 
-UInt64 Texture3D::get_data_size() const
+uint64_t Texture3D::get_data_size() const
 {
        return id ? width*height*depth*get_pixel_size(storage_fmt) : 0;
 }