Remove the PixelStore class

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

diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp
index 3e0b9fc14d2b430cd16040f743294b0aae502419..5c7f61029c3c736eb3245e99b559b29c7e79f2aa 100644 (file)
--- a/source/core/texturecube.cpp
+++ b/source/core/texturecube.cpp
@@ -1,11 +1,12 @@
 #include <msp/datafile/collection.h>
+#include <msp/gl/extensions/arb_direct_state_access.h>
+#include <msp/gl/extensions/arb_seamless_cube_map.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"
 #include "error.h"
-#include "pixelstore.h"
 #include "texturecube.h"
 
 using namespace std;
@@ -49,12 +50,18 @@ TextureCube::TextureCube():
        allocated(0)
 {
        static Require _req(ARB_texture_cube_map);
+       if(ARB_seamless_cube_map)
+               glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
 }
 
 void TextureCube::storage(PixelFormat fmt, unsigned sz, unsigned lv)
 {
        if(size>0)
-               throw invalid_operation("TextureCube::storage");
+       {
+               if(fmt!=format || sz!=size || (lv && lv!=levels))
+                       throw incompatible_data("TextureCube::storage");
+               return;
+       }
        if(sz==0)
                throw invalid_argument("TextureCube::storage");
 
@@ -74,17 +81,34 @@ void TextureCube::allocate(unsigned level)
        if(allocated&(64<<level))
                return;
 
+       bool direct = ARB_texture_storage && ARB_direct_state_access;
+       if(!direct)
+       {
+               glActiveTexture(GL_TEXTURE0);
+               glBindTexture(target, id);
+       }
+
+       allocate_(level);
+
+       if(!direct)
+               glBindTexture(target, 0);
+}
+
+void TextureCube::allocate_(unsigned level)
+{
        if(ARB_texture_storage)
        {
-               BindRestore _bind(this);
-               glTexStorage2D(target, levels, storage_fmt, size, size);
+               if(ARB_direct_state_access)
+                       glTextureStorage2D(id, levels, storage_fmt, size, size);
+               else
+                       glTexStorage2D(target, levels, storage_fmt, size, size);
                apply_swizzle();
                allocated |= (64<<levels)-1;
        }
        else
        {
                for(unsigned i=0; i<6; ++i)
-                       image(enumerate_faces(i), level, 0);
+                       image_(enumerate_faces(i), level, 0);
        }
 }
 
@@ -92,44 +116,53 @@ void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
 {
        if(size==0)
                throw invalid_operation("TextureCube::image");
-
-       unsigned s = get_level_size(level);
-       if(s==0)
+       if(level>=levels)
                throw out_of_range("TextureCube::image");
 
        if(ARB_texture_storage)
-               return sub_image(face, level, 0, 0, s, s, data);
+       {
+               unsigned lsz = get_level_size(level);
+               return sub_image(face, level, 0, 0, lsz, lsz, data);
+       }
+
+       glActiveTexture(GL_TEXTURE0);
+       glBindTexture(target, id);
+
+       image_(face, level, data);
+
+       if(auto_gen_mipmap && level==0 && (allocated&63)==63)
+       {
+               generate_mipmap_();
+               allocated |= (64<<levels)-1;
+       }
 
-       BindRestore _bind(this);
+       glBindTexture(target, 0);
+}
 
+void TextureCube::image_(TextureCubeFace face, unsigned level, const void *data)
+{
        if(!allocated)
        {
                glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
                apply_swizzle();
        }
 
+       unsigned lsz = get_level_size(level);
        PixelComponents comp = 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, storage_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, storage_fmt, lsz, lsz, 0, comp, type, 0);
 
                allocated |= 64<<level;
        }
@@ -146,16 +179,30 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
 {
        if(size==0)
                throw invalid_operation("TextureCube::sub_image");
+       if(level>=levels)
+               throw out_of_range("TextureCube::sub_image");
 
-       BindRestore _bind(this);
-       allocate(level);
+       bool direct = (ARB_direct_state_access && (ARB_texture_storage || (allocated&(1<<level))));
+       if(!direct)
+       {
+               glActiveTexture(GL_TEXTURE0);
+               glBindTexture(target, id);
+       }
+
+       allocate_(level);
 
        PixelComponents comp = get_components(storage_fmt);
        GLenum type = get_gl_type(get_component_type(storage_fmt));
-       glTexSubImage2D(face, level, x, y, wd, ht, comp, type, data);
+       if(ARB_direct_state_access)
+               glTextureSubImage3D(id, level, x, y, get_face_index(face), wd, ht, 1, comp, type, data);
+       else
+               glTexSubImage2D(face, level, x, y, wd, ht, comp, type, data);
 
        if(auto_gen_mipmap && level==0)
-               generate_mipmap();
+               generate_mipmap_();
+
+       if(!direct)
+               glBindTexture(target, 0);
 }
 
 void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
@@ -169,19 +216,11 @@ void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
 {
        unsigned w = img.get_width();
        unsigned h = img.get_height();
-       PixelFormat fmt = pixelformat_from_image(img);
-       if(size==0)
-       {
-               if(w!=h)
-                       throw incompatible_data("TextureCube::image");
-
-               storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w);
-       }
-       else if(w!=size || h!=size)
+       if(w!=h)
                throw incompatible_data("TextureCube::image");
 
-       PixelStore pstore = PixelStore::from_image(img);
-       BindRestore _bind_ps(pstore);
+       PixelFormat fmt = pixelformat_from_image(img);
+       storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w);
 
        image(face, 0, img.get_pixels());
 }
@@ -206,9 +245,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)