X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbackends%2Fopengl%2Ftexture3d_backend.cpp;h=f446e653cfc4a90df6cabc3ce3fe8661541de24d;hp=961dd7e721766596f439312c45d11348e4eaebc7;hb=3b98e13c823d4cb7e4d2d4d14e8440b44bc71f91;hpb=0d89e19481d4d5f770411141906f9df344c6b823 diff --git a/source/backends/opengl/texture3d_backend.cpp b/source/backends/opengl/texture3d_backend.cpp index 961dd7e7..f446e653 100644 --- a/source/backends/opengl/texture3d_backend.cpp +++ b/source/backends/opengl/texture3d_backend.cpp @@ -21,10 +21,7 @@ OpenGLTexture3D::OpenGLTexture3D(unsigned t): void OpenGLTexture3D::allocate() { - unsigned width = static_cast(this)->width; - unsigned height = static_cast(this)->height; - unsigned depth = static_cast(this)->depth; - unsigned levels = static_cast(this)->levels; + const Texture3D &self = *static_cast(this); if(!id) create(); @@ -33,11 +30,11 @@ void OpenGLTexture3D::allocate() if(ARB_texture_storage) { if(ARB_direct_state_access) - glTextureStorage3D(id, levels, gl_fmt, width, height, depth); + glTextureStorage3D(id, self.levels, gl_fmt, self.width, self.height, self.depth); else { bind_scratch(); - glTexStorage3D(target, levels, gl_fmt, width, height, depth); + glTexStorage3D(target, self.levels, gl_fmt, self.width, self.height, self.depth); } } else @@ -45,12 +42,12 @@ void OpenGLTexture3D::allocate() 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(this)->get_level_size(i); + auto lv_size = self.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); + glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, self.levels-1); } apply_swizzle(); @@ -79,14 +76,11 @@ size_t OpenGLTexture3D::get_data_size() const if(!id) return 0; - unsigned width = static_cast(this)->width; - unsigned height = static_cast(this)->height; - unsigned depth = static_cast(this)->depth; - unsigned levels = static_cast(this)->levels; + const Texture3D &self = *static_cast(this); - size_t level_size = width*height*depth*get_pixel_size(format); + size_t level_size = self.width*self.height*self.depth*get_pixel_size(format); size_t total_size = level_size; - for(unsigned i=0; i>=2) + for(unsigned i=0; i>=2) total_size += level_size; return total_size; }