Throw an exception if Texture*::allocate is called before storage

[libs/gl.git] / source / texturecube.cpp

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index 26402695880dc12eba847ccb443fa8cb90fbb02c..b9a8f5dd02b8cacb73f63df7bce028a5920035cd 100644 (file)
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -1,5 +1,6 @@
 #include <msp/datafile/collection.h>
 #include <msp/gl/extensions/arb_texture_cube_map.h>
+#include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/io/memory.h>
 #include <msp/strings/format.h>
 #include "bindable.h"
@@ -12,6 +13,16 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+TextureCubeFace TextureCube::face_order[6] =
+{
+       POSITIVE_X,
+       NEGATIVE_X,
+       POSITIVE_Y,
+       NEGATIVE_Y,
+       POSITIVE_Z,
+       NEGATIVE_Z
+};
+
 Vector3 TextureCube::directions[6] =
 {
        Vector3(1, 0, 0),
@@ -22,9 +33,18 @@ Vector3 TextureCube::directions[6] =
        Vector3(0, 0, -1)
 };
 
+unsigned TextureCube::orientations[12] =
+{
+       5, 3,
+       4, 3,
+       0, 4,
+       0, 5,
+       0, 3,
+       1, 3
+};
+
 TextureCube::TextureCube():
        Texture(GL_TEXTURE_CUBE_MAP),
-       ifmt(RGB),
        size(0),
        allocated(0)
 {
@@ -38,23 +58,31 @@ void TextureCube::storage(PixelFormat fmt, unsigned sz)
        if(sz==0)
                throw invalid_argument("TextureCube::storage");
 
-       if(MSP_sized_internal_formats)
-               fmt = get_sized_pixelformat(fmt);
-       require_pixelformat(fmt);
-
-       ifmt = fmt;
+       set_internal_format(fmt);
        size = sz;
 }
 
 void TextureCube::allocate(unsigned level)
 {
+       if(size==0)
+               throw invalid_operation("TextureCube::allocate");
        if(allocated&(1<<level))
                return;
 
-       PixelFormat base_fmt = get_base_pixelformat(ifmt);
-       DataType type = get_alloc_type(base_fmt);
-       for(unsigned i=0; i<6; ++i)
-               image(enumerate_faces(i), level, base_fmt, type, 0);
+       if(ARB_texture_storage)
+       {
+               BindRestore _bind(this);
+               unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
+               glTexStorage2D(target, n_levels, ifmt, size, size);
+               allocated |= (1<<n_levels)-1;
+       }
+       else
+       {
+               PixelFormat base_fmt = get_base_pixelformat(ifmt);
+               DataType type = get_alloc_type(base_fmt);
+               for(unsigned i=0; i<6; ++i)
+                       image(enumerate_faces(i), level, base_fmt, type, 0);
+       }
 }
 
 void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -66,8 +94,11 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
        if(s==0)
                throw out_of_range("TextureCube::image");
 
+       if(ARB_texture_storage)
+               return sub_image(face, level, 0, 0, s, s, fmt, type, data);
+
        BindRestore _bind(this);
-       glTexImage2D(face, level, ifmt, s, s, 0, fmt, type, data);
+       glTexImage2D(face, level, ifmt, s, s, 0, get_upload_format(fmt), type, data);
 
        // XXX Allocation should be tracked per-face, but we'll run out of bits
        allocated |= 1<<level;
@@ -75,8 +106,7 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
        {
                // TODO Only do this once all faces are created
                auto_generate_mipmap();
-               for(; s; s>>=1, ++level) ;
-               allocated |= (1<<level)-1;
+               allocated |= (1<<get_n_levels())-1;
        }
 }
 
@@ -85,10 +115,13 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
        if(size==0)
                throw invalid_operation("TextureCube::sub_image");
 
+       BindRestore _bind(this);
        allocate(level);
 
-       BindRestore _bind(this);
-       glTexSubImage2D(face, level, x, y, wd, ht, fmt, type, data);
+       glTexSubImage2D(face, level, x, y, wd, ht, get_upload_format(fmt), type, data);
+
+       if(gen_mipmap && level==0)
+               auto_generate_mipmap();
 }
 
 void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool srgb)
@@ -136,65 +169,52 @@ void TextureCube::image(const Graphics::Image &img, bool srgb)
                image(enumerate_faces(i), 0, fmt, UNSIGNED_BYTE, cdata+i*face_size);
 }
 
-unsigned TextureCube::get_level_size(unsigned level)
+unsigned TextureCube::get_n_levels() const
+{
+       unsigned n = 0;
+       for(unsigned s=size; s; s>>=1, ++n) ;
+       return n;
+}
+
+unsigned TextureCube::get_level_size(unsigned level) const
 {
        return size>>level;
 }
 
 TextureCubeFace TextureCube::enumerate_faces(unsigned i)
 {
-       switch(i)
-       {
-       case 0: return POSITIVE_X;
-       case 1: return NEGATIVE_X;
-       case 2: return POSITIVE_Y;
-       case 3: return NEGATIVE_Y;
-       case 4: return POSITIVE_Z;
-       case 5: return NEGATIVE_Z;
-       default: throw out_of_range("TextureCube::enumerate_faces");
-       }
+       if(i>=6)
+               throw out_of_range("TextureCube::enumerate_faces");
+       return face_order[i];
 }
 
-const Vector3 &TextureCube::get_face_direction(TextureCubeFace face)
+unsigned TextureCube::get_face_index(TextureCubeFace face)
 {
        switch(face)
        {
-       case POSITIVE_X: return directions[0];
-       case NEGATIVE_X: return directions[1];
-       case POSITIVE_Y: return directions[2];
-       case NEGATIVE_Y: return directions[3];
-       case POSITIVE_Z: return directions[4];
-       case NEGATIVE_Z: return directions[5];
-       default: throw invalid_argument("TextureCube::get_face_direction");
+       case POSITIVE_X: return 0;
+       case NEGATIVE_X: return 1;
+       case POSITIVE_Y: return 2;
+       case NEGATIVE_Y: return 3;
+       case POSITIVE_Z: return 4;
+       case NEGATIVE_Z: return 5;
+       default: throw invalid_argument("TextureCube::get_face_index");
        }
 }
 
+const Vector3 &TextureCube::get_face_direction(TextureCubeFace face)
+{
+       return directions[get_face_index(face)];
+}
+
 const Vector3 &TextureCube::get_s_direction(TextureCubeFace face)
 {
-       switch(face)
-       {
-       case POSITIVE_X: return directions[5];
-       case NEGATIVE_X: return directions[4];
-       case POSITIVE_Y: return directions[0];
-       case NEGATIVE_Y: return directions[0];
-       case POSITIVE_Z: return directions[0];
-       case NEGATIVE_Z: return directions[1];
-       default: throw invalid_argument("TextureCube::get_s_direction");
-       }
+       return directions[orientations[get_face_index(face)*2]];
 }
 
 const Vector3 &TextureCube::get_t_direction(TextureCubeFace face)
 {
-       switch(face)
-       {
-       case POSITIVE_X: return directions[3];
-       case NEGATIVE_X: return directions[3];
-       case POSITIVE_Y: return directions[4];
-       case NEGATIVE_Y: return directions[5];
-       case POSITIVE_Z: return directions[3];
-       case NEGATIVE_Z: return directions[3];
-       default: throw invalid_argument("TextureCube::get_t_direction");
-       }
+       return directions[orientations[get_face_index(face)*2+1]];
 }
 
 Vector3 TextureCube::get_texel_direction(TextureCubeFace face, unsigned u, unsigned v)