Clean up includes and forward declarations for the core classes

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

diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index 984ffac7d4ef1a07985b3bf033915bbac3cf5b57..c35d45741ed14aa71bca1c1b2420ab785476dc5d 100644 (file)
--- a/source/core/texture3d.cpp
+++ b/source/core/texture3d.cpp
@@ -3,7 +3,6 @@
 #include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/gl/extensions/ext_texture3d.h>
 #include <msp/gl/extensions/ext_texture_array.h>
-#include <msp/graphics/image.h>
 #include "error.h"
 #include "texture3d.h"
 
@@ -16,16 +15,14 @@ Texture3D::Texture3D(GLenum t):
        Texture(t),
        width(0),
        height(0),
-       depth(0),
-       allocated(0)
+       depth(0)
 { }
 
 Texture3D::Texture3D():
        Texture(GL_TEXTURE_3D),
        width(0),
        height(0),
-       depth(0),
-       allocated(0)
+       depth(0)
 {
        static Require _req(EXT_texture3D);
 }
@@ -48,60 +45,38 @@ void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp,
        levels = get_n_levels();
        if(lv>0)
                levels = min(levels, lv);
-}
-
-void Texture3D::allocate(unsigned level)
-{
-       if(width==0 || height==0 || depth==0)
-               throw invalid_operation("Texture3D::allocate");
-       if(level>=levels)
-               throw invalid_argument("Texture3D::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)
-                       glTextureStorage3D(id, levels, fmt, width, height, depth);
+                       glTextureStorage3D(id, levels, gl_fmt, width, height, depth);
                else
                {
                        bind_scratch();
-                       glTexStorage3D(target, levels, fmt, width, height, depth);
+                       glTexStorage3D(target, levels, gl_fmt, width, height, depth);
                }
-               apply_swizzle();
-               allocated |= (1<<levels)-1;
        }
        else
-               image(level, 0);
-}
-
-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");
-
-       LinAl::Vector<unsigned, 3> size = get_level_size(level);
-
-       if(ARB_texture_storage)
-               return sub_image(level, 0, 0, 0, size.x, size.y, size.z, data);
-
-       bind_scratch();
-
-       if(!allocated)
        {
+               bind_scratch();
+               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, 3> lv_size = get_level_size(i);
+                       glTexImage3D(target, i, gl_fmt, lv_size.x, lv_size.y, lv_size.z, 0, comp, type, 0);
+               }
                glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
-               apply_swizzle();
        }
 
-       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, fmt, size.x, size.y, size.z, 0, comp, type, data);
+       apply_swizzle();
+}
 
-       allocated |= 1<<level;
+void Texture3D::image(unsigned level, const void *data)
+{
+       LinAl::Vector<unsigned, 3> size = get_level_size(level);
+       return sub_image(level, 0, 0, 0, size.x, size.y, size.z, data);
 }
 
 void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, const void *data)
@@ -111,8 +86,6 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
        if(level>=levels)
                throw out_of_range("Texture3D::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)
@@ -134,9 +107,7 @@ void Texture3D::image(const Graphics::Image &img, unsigned lv)
        unsigned d = h/w;
        h = w;
 
-       PixelFormat fmt = pixelformat_from_image(img);
-       storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, d, lv);
-
+       storage(pixelformat_from_image(img, use_srgb_format), w, h, d, lv);
        image(0, img.get_pixels());
 }