Rework PixelComponents and PixelFormat to use custom values

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

diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp
index 09831cb3385abcc5eeaf5f9e5404e33a6a427f3f..9ebc3cc5fc496e0e7afe057f12f26c7796637b10 100644 (file)
--- a/source/core/texture2d.cpp
+++ b/source/core/texture2d.cpp
@@ -2,10 +2,8 @@
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/graphics/imageloader.h>
-#include "bindable.h"
 #include "buffer.h"
 #include "error.h"
-#include "pixelstore.h"
 #include "resources.h"
 #include "texture2d.h"
 
@@ -93,10 +91,11 @@ void Texture2D::allocate_(unsigned level)
 
        if(ARB_texture_storage)
        {
+               GLenum fmt = get_gl_pixelformat(storage_fmt);
                if(ARB_direct_state_access)
-                       glTextureStorage2D(id, levels, storage_fmt, width, height);
+                       glTextureStorage2D(id, levels, fmt, width, height);
                else
-                       glTexStorage2D(target, levels, storage_fmt, width, height);
+                       glTexStorage2D(target, levels, fmt, width, height);
                apply_swizzle();
                allocated |= (1<<levels)-1;
        }
@@ -140,9 +139,10 @@ void Texture2D::image_(unsigned level, const void *data)
        }
 
        LinAl::Vector<unsigned, 2> size = get_level_size(level);
-       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(target, level, storage_fmt, size.x, size.y, 0, comp, type, data);
+       glTexImage2D(target, level, fmt, size.x, size.y, 0, comp, type, data);
 
        allocated |= 1<<level;
 }
@@ -170,7 +170,7 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 
        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)
                glTextureSubImage2D(id, level, x, y, wd, ht, comp, type, data);
@@ -203,9 +203,6 @@ void Texture2D::image(const Graphics::Image &img, unsigned lv, bool from_buffer)
        PixelFormat fmt = pixelformat_from_image(img);
        storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, lv);
 
-       PixelStore pstore = PixelStore::from_image(img);
-       BindRestore _bind_ps(pstore);
-
        image(0, from_buffer ? 0 : img.get_pixels());
 }