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 5ee772cab94d742b7939c5373cb36614bca8b4e1..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,
@@ -49,7 +49,14 @@ TextureCube::TextureCube():
 {
        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)