Mark constant data as const

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

diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp
index c56094c9cb0bd36e837db1df0c1c115fc38ad876..516dca5209c9e571c7dc1a19093712fdfda201e1 100644 (file)
--- a/source/core/texturecube.cpp
+++ b/source/core/texturecube.cpp
@@ -13,7 +13,7 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-TextureCubeFace TextureCube::face_order[6] =
+const TextureCubeFace TextureCube::face_order[6] =
 {
        POSITIVE_X,
        NEGATIVE_X,
@@ -23,7 +23,7 @@ TextureCubeFace TextureCube::face_order[6] =
        NEGATIVE_Z
 };
 
-Vector3 TextureCube::directions[6] =
+const Vector3 TextureCube::directions[6] =
 {
        Vector3(1, 0, 0),
        Vector3(-1, 0, 0),
@@ -33,7 +33,7 @@ Vector3 TextureCube::directions[6] =
        Vector3(0, 0, -1)
 };
 
-unsigned TextureCube::orientations[12] =
+const unsigned TextureCube::orientations[12] =
 {
        5, 3,
        4, 3,
@@ -45,12 +45,18 @@ unsigned TextureCube::orientations[12] =
 
 TextureCube::TextureCube():
        Texture(GL_TEXTURE_CUBE_MAP),
-       size(0),
-       allocated(0)
+       size(0)
 {
        static Require _req(ARB_texture_cube_map);
        if(ARB_seamless_cube_map)
-               glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
+       {
+               static bool seamless_init = false;
+               if(!seamless_init)
+               {
+                       glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
+                       seamless_init = true;
+               }
+       }
 }
 
 void TextureCube::storage(PixelFormat fmt, unsigned sz, unsigned lv)
@@ -69,81 +75,39 @@ void TextureCube::storage(PixelFormat fmt, unsigned sz, unsigned lv)
        levels = get_n_levels();
        if(lv>0)
                levels = min(levels, lv);
-}
-
-void TextureCube::allocate(unsigned level)
-{
-       if(size==0)
-               throw invalid_operation("TextureCube::allocate");
-       if(level>=levels)
-               throw invalid_argument("TextureCube::allocate");
-       if(allocated&(64<<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)
-                       glTextureStorage2D(id, levels, fmt, size, size);
+                       glTextureStorage2D(id, levels, gl_fmt, size, size);
                else
                {
                        bind_scratch();
-                       glTexStorage2D(target, levels, fmt, size, size);
+                       glTexStorage2D(target, levels, gl_fmt, size, size);
                }
-               apply_swizzle();
-               allocated |= (64<<levels)-1;
        }
        else
        {
-               for(unsigned i=0; i<6; ++i)
-                       image(enumerate_faces(i), level, 0);
-       }
-}
-
-void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
-{
-       if(size==0)
-               throw invalid_operation("TextureCube::image");
-       if(level>=levels)
-               throw out_of_range("TextureCube::image");
-
-       unsigned lsz = get_level_size(level);
-
-       if(ARB_texture_storage)
-               return sub_image(face, level, 0, 0, lsz, lsz, data);
-
-       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)
+               {
+                       unsigned lv_size = get_level_size(i);
+                       for(unsigned j=0; j<6; ++j)
+                               glTexImage2D(enumerate_faces(j), i, gl_fmt, lv_size, lv_size, 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));
-       glTexImage2D(face, level, fmt, lsz, lsz, 0, comp, type, data);
-
-       if(level==0)
-       {
-               allocated |= 1<<get_face_index(face);
-               if((allocated&63)==63)
-                       allocated |= 64;
-       }
-       else if(!(allocated&(64<<level)))
-       {
-               for(unsigned i=0; i<6; ++i)
-                       if(enumerate_faces(i)!=face)
-                               glTexImage2D(enumerate_faces(i), level, fmt, lsz, lsz, 0, comp, type, 0);
-
-               allocated |= 64<<level;
-       }
+       apply_swizzle();
 }
 
-void TextureCube::image(TextureCubeFace face, unsigned level, PixelComponents comp, DataType type, const void *data)
+void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
 {
-       if(comp!=get_components(format) || type!=get_component_type(format))
-               throw incompatible_data("TextureCube::image");
-       image(face, level, data);
+       unsigned lsz = get_level_size(level);
+       return sub_image(face, level, 0, 0, lsz, lsz, data);
 }
 
 void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data)
@@ -153,8 +117,6 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
        if(level>=levels)
                throw out_of_range("TextureCube::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)
@@ -166,13 +128,6 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
        }
 }
 
-void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
-{
-       if(comp!=get_components(format) || type!=get_component_type(format))
-               throw incompatible_data("TextureCube::subimage");
-       sub_image(face, level, x, y, wd, ht, data);
-}
-
 void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
 {
        unsigned w = img.get_width();
@@ -186,11 +141,6 @@ void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
        image(face, 0, img.get_pixels());
 }
 
-void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool)
-{
-       image(face, img);
-}
-
 void TextureCube::image(const Graphics::Image &img, unsigned lv)
 {
        unsigned w = img.get_width();