Rework PixelComponents and PixelFormat to use custom values

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

diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index 3c675dbb705847527586b452f414bdc4b49c1fb1..9db8b06150b110a525e8569a9ee0074badef7f51 100644 (file)
--- a/source/core/texture3d.cpp
+++ b/source/core/texture3d.cpp
@@ -5,9 +5,7 @@
 #include <msp/gl/extensions/ext_texture3d.h>
 #include <msp/gl/extensions/ext_texture_array.h>
 #include <msp/graphics/image.h>
-#include "bindable.h"
 #include "error.h"
-#include "pixelstore.h"
 #include "texture3d.h"
 
 using namespace std;
@@ -79,10 +77,11 @@ void Texture3D::allocate_(unsigned level)
 {
        if(ARB_texture_storage)
        {
+               GLenum fmt = get_gl_pixelformat(storage_fmt);
                if(ARB_direct_state_access)
-                       glTextureStorage3D(id, levels, storage_fmt, width, height, depth);
+                       glTextureStorage3D(id, levels, fmt, width, height, depth);
                else
-                       glTexStorage3D(target, levels, storage_fmt, width, height, depth);
+                       glTexStorage3D(target, levels, fmt, width, height, depth);
                apply_swizzle();
                allocated |= (1<<levels)-1;
        }
@@ -126,9 +125,10 @@ void Texture3D::image_(unsigned level, const void *data)
        }
 
        LinAl::Vector<unsigned, 3> 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));
-       glTexImage3D(target, level, storage_fmt, size.x, size.y, size.z, 0, comp, type, data);
+       glTexImage3D(target, level, fmt, size.x, size.y, size.z, 0, comp, type, data);
 
        allocated |= 1<<level;
 }
@@ -156,7 +156,7 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
 
        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, z, wd, ht, dp, comp, type, data);
@@ -190,9 +190,6 @@ void Texture3D::image(const Graphics::Image &img, unsigned lv)
        PixelFormat fmt = pixelformat_from_image(img);
        storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, d, lv);
 
-       PixelStore pstore = PixelStore::from_image(img);
-       BindRestore _bind_ps(pstore);
-
        image(0, img.get_pixels());
 }