Use standard fixed-size integer types

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

diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp
index 543bb9d40ec00e954ce894d9699e86c364405dd8..c56094c9cb0bd36e837db1df0c1c115fc38ad876 100644 (file)
--- a/source/core/texturecube.cpp
+++ b/source/core/texturecube.cpp
@@ -5,9 +5,7 @@
 #include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/io/memory.h>
 #include <msp/strings/format.h>
-#include "bindable.h"
 #include "error.h"
-#include "pixelstore.h"
 #include "texturecube.h"
 
 using namespace std;
@@ -84,11 +82,14 @@ void TextureCube::allocate(unsigned level)
 
        if(ARB_texture_storage)
        {
-               Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
+               GLenum fmt = get_gl_pixelformat(storage_fmt);
                if(ARB_direct_state_access)
-                       glTextureStorage2D(id, levels, storage_fmt, size, size);
+                       glTextureStorage2D(id, levels, fmt, size, size);
                else
-                       glTexStorage2D(target, levels, storage_fmt, size, size);
+               {
+                       bind_scratch();
+                       glTexStorage2D(target, levels, fmt, size, size);
+               }
                apply_swizzle();
                allocated |= (64<<levels)-1;
        }
@@ -106,12 +107,10 @@ void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
        if(level>=levels)
                throw out_of_range("TextureCube::image");
 
-       unsigned s = get_level_size(level);
+       unsigned lsz = get_level_size(level);
 
        if(ARB_texture_storage)
-               return sub_image(face, level, 0, 0, s, s, data);
-
-       BindRestore _bind(this);
+               return sub_image(face, level, 0, 0, lsz, lsz, data);
 
        if(!allocated)
        {
@@ -119,28 +118,22 @@ void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
                apply_swizzle();
        }
 
-       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));
-       glTexImage2D(face, level, storage_fmt, s, s, 0, comp, type, data);
+       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;
-                       if(auto_gen_mipmap)
-                       {
-                               generate_mipmap();
-                               allocated |= (64<<levels)-1;
-                       }
-               }
        }
        else if(!(allocated&(64<<level)))
        {
                for(unsigned i=0; i<6; ++i)
                        if(enumerate_faces(i)!=face)
-                               glTexImage2D(enumerate_faces(i), level, storage_fmt, s, s, 0, comp, type, 0);
+                               glTexImage2D(enumerate_faces(i), level, fmt, lsz, lsz, 0, comp, type, 0);
 
                allocated |= 64<<level;
        }
@@ -160,18 +153,17 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
        if(level>=levels)
                throw out_of_range("TextureCube::sub_image");
 
-       Conditional<BindRestore> _bind(!ARB_direct_state_acess, this);
        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, get_face_index(face), wd, ht, 1, comp, type, data);
        else
+       {
+               bind_scratch();
                glTexSubImage2D(face, level, x, y, wd, ht, comp, type, data);
-
-       if(auto_gen_mipmap && level==0)
-               generate_mipmap();
+       }
 }
 
 void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
@@ -191,9 +183,6 @@ void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
        PixelFormat fmt = pixelformat_from_image(img);
        storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w);
 
-       PixelStore pstore = PixelStore::from_image(img);
-       BindRestore _bind_ps(pstore);
-
        image(face, 0, img.get_pixels());
 }
 
@@ -217,9 +206,6 @@ void TextureCube::image(const Graphics::Image &img, unsigned lv)
        else if(w!=size || h!=size)
                throw incompatible_data("TextureCube::image");
 
-       PixelStore pstore = PixelStore::from_image(img);
-       BindRestore _bind_ps(pstore);
-
        const char *pixels = reinterpret_cast<const char *>(img.get_pixels());
        unsigned face_size = img.get_stride()*size;
        for(unsigned i=0; i<6; ++i)
@@ -284,7 +270,7 @@ Vector3 TextureCube::get_texel_direction(TextureCubeFace face, unsigned u, unsig
        return fv+s*sv+t*tv;
 }
 
-UInt64 TextureCube::get_data_size() const
+uint64_t TextureCube::get_data_size() const
 {
        return id ? size*size*6*get_pixel_size(storage_fmt) : 0;
 }