Separate abstract pixel compositions from concrete pixel formats

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

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index 8d194c42028bb6a4c6eb56cf2e9c0cb9567eba71..b0887ca85b1e4fca0e88769da87e4621f0d3af54 100644 (file)
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -83,14 +83,14 @@ void TextureCube::allocate(unsigned level)
        }
        else
        {
-               PixelFormat base_fmt = get_base_pixelformat(ifmt);
-               DataType type = get_alloc_type(base_fmt);
+               PixelComponents comp = get_components(ifmt);
+               DataType type = get_component_type(ifmt);
                for(unsigned i=0; i<6; ++i)
-                       image(enumerate_faces(i), level, base_fmt, type, 0);
+                       image(enumerate_faces(i), level, comp, type, 0);
        }
 }
 
-void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, DataType type, const void *data)
+void TextureCube::image(TextureCubeFace face, unsigned level, PixelComponents comp, DataType type, const void *data)
 {
        if(size==0)
                throw invalid_operation("TextureCube::image");
@@ -100,7 +100,7 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
                throw out_of_range("TextureCube::image");
 
        if(ARB_texture_storage)
-               return sub_image(face, level, 0, 0, s, s, fmt, type, data);
+               return sub_image(face, level, 0, 0, s, s, comp, type, data);
 
        BindRestore _bind(this);
 
@@ -109,7 +109,7 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
                glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
                apply_swizzle();
        }
-       glTexImage2D(face, level, ifmt, s, s, 0, get_upload_format(fmt), type, data);
+       glTexImage2D(face, level, ifmt, s, s, 0, get_upload_components(comp), type, data);
 
        if(level==0)
        {
@@ -128,13 +128,13 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
        {
                for(unsigned i=0; i<6; ++i)
                        if(enumerate_faces(i)!=face)
-                               glTexImage2D(enumerate_faces(i), level, ifmt, s, s, 0, get_upload_format(fmt), type, 0);
+                               glTexImage2D(enumerate_faces(i), level, ifmt, s, s, 0, comp, type, 0);
 
                allocated |= 64<<level;
        }
 }
 
-void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
+void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
 {
        if(size==0)
                throw invalid_operation("TextureCube::sub_image");
@@ -142,7 +142,7 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
        BindRestore _bind(this);
        allocate(level);
 
-       glTexSubImage2D(face, level, x, y, wd, ht, get_upload_format(fmt), type, data);
+       glTexSubImage2D(face, level, x, y, wd, ht, get_upload_components(comp), type, data);
 
        if(auto_gen_mipmap && level==0)
                generate_mipmap();
@@ -152,13 +152,13 @@ void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool s
 {
        unsigned w = img.get_width();
        unsigned h = img.get_height();
-       PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+       PixelFormat fmt = pixelformat_from_image(img);
        if(size==0)
        {
                if(w!=h)
                        throw incompatible_data("TextureCube::image");
 
-               storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
+               storage(make_pixelformat(get_components(fmt), get_component_type(fmt), srgb), w);
        }
        else if(w!=size || h!=size)
                throw incompatible_data("TextureCube::image");
@@ -166,7 +166,7 @@ void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool s
        PixelStore pstore = PixelStore::from_image(img);
        BindRestore _bind_ps(pstore);
 
-       image(face, 0, fmt, UNSIGNED_BYTE, img.get_data());
+       image(face, 0, get_components(fmt), get_component_type(fmt), img.get_data());
 }
 
 void TextureCube::image(const Graphics::Image &img, unsigned lv, bool srgb)
@@ -178,9 +178,11 @@ void TextureCube::image(const Graphics::Image &img, unsigned lv, bool srgb)
                throw incompatible_data("TextureCube::image");
        h /= 6;
 
-       PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+       PixelFormat fmt = pixelformat_from_image(img);
+       PixelComponents comp = get_components(fmt);
+       DataType type = get_component_type(fmt);
        if(size==0)
-               storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, lv);
+               storage(make_pixelformat(comp, type, srgb), w, lv);
        else if(w!=size || h!=size)
                throw incompatible_data("TextureCube::image");
 
@@ -190,7 +192,7 @@ void TextureCube::image(const Graphics::Image &img, unsigned lv, bool srgb)
        const char *cdata = reinterpret_cast<const char *>(img.get_data());
        unsigned face_size = img.get_stride()*size;
        for(unsigned i=0; i<6; ++i)
-               image(enumerate_faces(i), 0, fmt, UNSIGNED_BYTE, cdata+i*face_size);
+               image(enumerate_faces(i), 0, comp, type, cdata+i*face_size);
 }
 
 unsigned TextureCube::get_n_levels() const
@@ -298,7 +300,7 @@ void TextureCube::Loader::image_data(TextureCubeFace face, const string &data)
 
 void TextureCube::Loader::raw_data(TextureCubeFace face, const string &data)
 {
-       obj.image(face, 0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
+       obj.image(face, 0, get_components(obj.ifmt), get_component_type(obj.ifmt), data.data());
 }
 
 void TextureCube::Loader::storage(PixelFormat fmt, unsigned s)