Fix reflection of image types from Spir-V modules

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

diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index c35d45741ed14aa71bca1c1b2420ab785476dc5d..496b5f1fbe80370fefda9e169ad428d98464d274 100644 (file)
--- a/source/core/texture3d.cpp
+++ b/source/core/texture3d.cpp
@@ -1,8 +1,4 @@
 #include <cmath>
-#include <msp/gl/extensions/arb_direct_state_access.h>
-#include <msp/gl/extensions/arb_texture_storage.h>
-#include <msp/gl/extensions/ext_texture3d.h>
-#include <msp/gl/extensions/ext_texture_array.h>
 #include "error.h"
 #include "texture3d.h"
 
@@ -11,22 +7,10 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Texture3D::Texture3D(GLenum t):
-       Texture(t),
-       width(0),
-       height(0),
-       depth(0)
+Texture3D::Texture3D(unsigned t):
+       Texture3DBackend(t)
 { }
 
-Texture3D::Texture3D():
-       Texture(GL_TEXTURE_3D),
-       width(0),
-       height(0),
-       depth(0)
-{
-       static Require _req(EXT_texture3D);
-}
-
 void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp, unsigned lv)
 {
        if(width>0)
@@ -46,31 +30,7 @@ void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp,
        if(lv>0)
                levels = min(levels, lv);
 
-       GLenum gl_fmt = get_gl_pixelformat(storage_fmt);
-       if(ARB_texture_storage)
-       {
-               if(ARB_direct_state_access)
-                       glTextureStorage3D(id, levels, gl_fmt, width, height, depth);
-               else
-               {
-                       bind_scratch();
-                       glTexStorage3D(target, levels, gl_fmt, width, height, depth);
-               }
-       }
-       else
-       {
-               bind_scratch();
-               GLenum comp = get_gl_components(get_components(storage_fmt));
-               GLenum type = get_gl_type(get_component_type(storage_fmt));
-               for(unsigned i=0; i<levels; ++i)
-               {
-                       LinAl::Vector<unsigned, 3> lv_size = get_level_size(i);
-                       glTexImage3D(target, i, gl_fmt, lv_size.x, lv_size.y, lv_size.z, 0, comp, type, 0);
-               }
-               glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
-       }
-
-       apply_swizzle();
+       allocate();
 }
 
 void Texture3D::image(unsigned level, const void *data)
@@ -79,22 +39,14 @@ void Texture3D::image(unsigned level, const void *data)
        return sub_image(level, 0, 0, 0, size.x, size.y, size.z, data);
 }
 
-void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, const void *data)
+void Texture3D::sub_image(unsigned level, unsigned x, unsigned y, unsigned z, unsigned wd, unsigned ht, unsigned dp, const void *data)
 {
        if(width==0 || height==0 || depth==0)
                throw invalid_operation("Texture3D::sub_image");
-       if(level>=levels)
+       if(level>=levels || x>width || x+wd>width || y>height || y+ht>height || z>depth || z+dp>depth)
                throw out_of_range("Texture3D::sub_image");
 
-       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);
-       else
-       {
-               bind_scratch();
-               glTexSubImage3D(target, level, x, y, z, wd, ht, dp, comp, type, data);
-       }
+       Texture3DBackend::sub_image(level, x, y, z, wd, ht, dp, data);
 }
 
 void Texture3D::image(const Graphics::Image &img, unsigned lv)
@@ -114,7 +66,7 @@ void Texture3D::image(const Graphics::Image &img, unsigned lv)
 unsigned Texture3D::get_n_levels() const
 {
        unsigned s = max(width, height);
-       if(target!=GL_TEXTURE_2D_ARRAY)
+       if(!is_array())
                s = max(s, depth);
        unsigned n = 0;
        for(; s; s>>=1, ++n) ;
@@ -126,7 +78,7 @@ LinAl::Vector<unsigned, 3> Texture3D::get_level_size(unsigned level) const
        unsigned w = width>>level;
        unsigned h = height>>level;
        unsigned d = depth;
-       if(target!=GL_TEXTURE_2D_ARRAY)
+       if(!is_array())
                d >>= level;
 
        if(!w && (h || d))
@@ -139,11 +91,6 @@ LinAl::Vector<unsigned, 3> Texture3D::get_level_size(unsigned level) const
        return LinAl::Vector<unsigned, 3>(w, h, d);
 }
 
-uint64_t Texture3D::get_data_size() const
-{
-       return id ? width*height*depth*get_pixel_size(storage_fmt) : 0;
-}
-
 
 Texture3D::Loader::Loader(Texture3D &t):
        DataFile::DerivedObjectLoader<Texture3D, Texture::Loader>(t)
@@ -159,16 +106,10 @@ Texture3D::Loader::Loader(Texture3D &t, Collection &c):
 
 void Texture3D::Loader::init()
 {
-       add("raw_data", &Loader::raw_data);
        add("storage", &Loader::storage);
        add("storage", &Loader::storage_levels);
 }
 
-void Texture3D::Loader::raw_data(const string &data)
-{
-       obj.image(0, data.data());
-}
-
 void Texture3D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h, unsigned d)
 {
        obj.storage(fmt, w, h, d);