Add support for integer vertex attributes

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

diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index ab8bca7cba1c8cfd4f5598b73c8dfa759d96488c..bdb87882e878333c23e88373bc85b57d277c7e74 100644 (file)
--- a/source/core/texture3d.cpp
+++ b/source/core/texture3d.cpp
@@ -5,7 +5,6 @@
 #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 "texture3d.h"
 
@@ -58,8 +57,6 @@ void Texture3D::allocate(unsigned level)
                throw invalid_operation("Texture3D::allocate");
        if(level>=levels)
                throw invalid_argument("Texture3D::allocate");
-       if(allocated&(1<<level))
-               return;
 
        bool direct = ARB_texture_storage && ARB_direct_state_access;
        if(!direct)
@@ -76,12 +73,16 @@ void Texture3D::allocate(unsigned level)
 
 void Texture3D::allocate_(unsigned level)
 {
+       if(allocated&(1<<level))
+               return;
+
        if(ARB_texture_storage)
        {
+               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);
+                       glTexStorage3D(target, levels, fmt, width, height, depth);
                apply_swizzle();
                allocated |= (1<<levels)-1;
        }
@@ -125,9 +126,10 @@ void Texture3D::image_(unsigned level, const void *data)
        }
 
        LinAl::Vector<unsigned, 3> 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));
-       glTexImage3D(target, level, storage_fmt, size.x, size.y, size.z, 0, comp, type, data);
+       glTexImage3D(target, level, fmt, size.x, size.y, size.z, 0, comp, type, data);
 
        allocated |= 1<<level;
 }
@@ -155,7 +157,7 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
 
        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);