Add texture cube map initialization utility function

Author: scheibel

source/globjects/include/globjects/Texture.h

@@ -125,6 +125,9 @@ class GLOBJECTS_API Texture : public Object
 
     void generateMipmap();
 
+    void cubeMapImage(gl::GLint level, gl::GLenum internalFormat, gl::GLsizei width, gl::GLsizei height, gl::GLint border, gl::GLenum format, gl::GLenum type, const gl::GLvoid * data);
+    void cubeMapImage(gl::GLint level, gl::GLenum internalFormat, const glm::ivec2 & size, gl::GLint border, gl::GLenum format, gl::GLenum type, const gl::GLvoid * data);
+
     TextureHandle textureHandle() const;
     TextureHandle textureHandle(Sampler * sampler) const;
 

source/globjects/source/Texture.cpp

@@ -404,6 +404,16 @@ void Texture::generateMipmap()
     implementation().generateMipMap(this);
 }
 
+void Texture::cubeMapImage(gl::GLint level, gl::GLenum internalFormat, gl::GLsizei width, gl::GLsizei height, gl::GLint border, gl::GLenum format, gl::GLenum type, const gl::GLvoid * data)
+{
+    implementation().cubeMapImage(this, level, internalFormat, width, height, border, format, type, data);
+}
+
+void Texture::cubeMapImage(gl::GLint level, gl::GLenum internalFormat, const glm::ivec2 & size, gl::GLint border, gl::GLenum format, gl::GLenum type, const gl::GLvoid * data)
+{
+    cubeMapImage(level, internalFormat, size.x, size.y, border, format, type, data);
+}
+
 void Texture::accept(ObjectVisitor& visitor)
 {
 	visitor.visitTexture(this);

source/globjects/source/implementations/AbstractTextureImplementation.h

@@ -47,6 +47,8 @@ class AbstractTextureImplementation
     virtual void storage2D(const Texture * texture, gl::GLsizei levels, gl::GLenum internalFormat, gl::GLsizei width, gl::GLsizei height) const  = 0;
     virtual void storage3D(const Texture * texture, gl::GLsizei levels, gl::GLenum internalFormat, gl::GLsizei width, gl::GLsizei height, gl::GLsizei depth) const  = 0;
 
+    virtual void cubeMapImage(const Texture * texture, gl::GLint level, gl::GLenum internalFormat, gl::GLsizei width, gl::GLsizei height, gl::GLint border, gl::GLenum format, gl::GLenum type, const gl::GLvoid * data) const  = 0;
+
     virtual void texBuffer(const Texture * texture, const gl::GLenum internalFormat, Buffer * buffer) const = 0;
     virtual void texBufferRange(const Texture * texture, const gl::GLenum internalFormat, Buffer * buffer, const gl::GLintptr offset, const gl::GLsizeiptr size) const = 0;
 

source/globjects/source/implementations/TextureImplementation_DirectStateAccessARB.cpp

@@ -144,6 +144,11 @@ void TextureImplementation_DirectStateAccessARB::storage3D(const Texture * textu
     gl::glTextureStorage3D(texture->id(), levels, internalFormat, width, height, depth);
 }
 
+void TextureImplementation_DirectStateAccessARB::cubeMapImage(const Texture * texture, gl::GLint level, gl::GLenum internalFormat, gl::GLsizei width, gl::GLsizei height, gl::GLint border, gl::GLenum format, gl::GLenum type, const gl::GLvoid * data) const
+{
+    get(Texture::BindlessImplementation::DirectStateAccessEXT)->cubeMapImage(texture, level, internalFormat, width, height, border, format, type, data);
+}
+
 void TextureImplementation_DirectStateAccessARB::texBuffer(const Texture * texture, const gl::GLenum internalFormat, Buffer * buffer) const
 {
     gl::glTextureBuffer(texture->id(), internalFormat, buffer ? buffer->id() : 0);

source/globjects/source/implementations/TextureImplementation_DirectStateAccessARB.h

@@ -45,6 +45,8 @@ class TextureImplementation_DirectStateAccessARB : public AbstractTextureImpleme
     virtual void storage2D(const Texture * texture, gl::GLsizei levels, gl::GLenum internalFormat, gl::GLsizei width, gl::GLsizei height) const override;
     virtual void storage3D(const Texture * texture, gl::GLsizei levels, gl::GLenum internalFormat, gl::GLsizei width, gl::GLsizei height, gl::GLsizei depth) const override;
 
+    virtual void cubeMapImage(const Texture * texture, gl::GLint level, gl::GLenum internalFormat, gl::GLsizei width, gl::GLsizei height, gl::GLint border, gl::GLenum format, gl::GLenum type, const gl::GLvoid * data) const override;
+
     virtual void texBuffer(const Texture * texture, const gl::GLenum internalFormat, Buffer * buffer) const override;
     virtual void texBufferRange(const Texture * texture, const gl::GLenum internalFormat, Buffer * buffer, const gl::GLintptr offset, const gl::GLsizeiptr size) const override;
 

source/globjects/source/implementations/TextureImplementation_DirectStateAccessEXT.cpp

@@ -139,6 +139,16 @@ void TextureImplementation_DirectStateAccessEXT::storage3D(const Texture * textu
     gl::glTextureStorage3DEXT(texture->id(), texture->target(), levels, internalFormat, width, height, depth);
 }
 
+void TextureImplementation_DirectStateAccessEXT::cubeMapImage(const Texture * texture, gl::GLint level, gl::GLenum internalFormat, gl::GLsizei width, gl::GLsizei height, gl::GLint border, gl::GLenum format, gl::GLenum type, const gl::GLvoid * data) const
+{
+    texture->bind();
+
+    for (int i = 0; i < 6; ++i)
+    {
+        gl::glTextureImage2DEXT(texture->id(), gl::GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, level, static_cast<gl::GLint>(internalFormat), width, height, border, format, type, data);
+    }
+}
+
 void TextureImplementation_DirectStateAccessEXT::texBuffer(const Texture * texture, const gl::GLenum internalFormat, Buffer * buffer) const
 {
     gl::glTextureBufferEXT(texture->id(), texture->target(), internalFormat, buffer ? buffer->id() : 0);

source/globjects/source/implementations/TextureImplementation_DirectStateAccessEXT.h

@@ -45,6 +45,8 @@ class TextureImplementation_DirectStateAccessEXT : public AbstractTextureImpleme
     virtual void storage2D(const Texture * texture, gl::GLsizei levels, gl::GLenum internalFormat, gl::GLsizei width, gl::GLsizei height) const override;
     virtual void storage3D(const Texture * texture, gl::GLsizei levels, gl::GLenum internalFormat, gl::GLsizei width, gl::GLsizei height, gl::GLsizei depth) const override;
 
+    virtual void cubeMapImage(const Texture * texture, gl::GLint level, gl::GLenum internalFormat, gl::GLsizei width, gl::GLsizei height, gl::GLint border, gl::GLenum format, gl::GLenum type, const gl::GLvoid * data) const override;
+
     virtual void texBuffer(const Texture * texture, const gl::GLenum internalFormat, Buffer * buffer) const override;
     virtual void texBufferRange(const Texture * texture, const gl::GLenum internalFormat, Buffer * buffer, const gl::GLintptr offset, const gl::GLsizeiptr size) const override;
 

source/globjects/source/implementations/TextureImplementation_Legacy.cpp

@@ -4,6 +4,7 @@
 #include <glm/gtc/type_ptr.hpp>
 
 #include <glbinding/gl/functions.h>
+#include <glbinding/gl/enum.h>
 
 #include <globjects/globjects.h>
 
@@ -180,6 +181,16 @@ void TextureImplementation_Legacy::storage3D(const Texture * texture, gl::GLsize
     gl::glTexStorage3D(texture->target(), levels, internalFormat, width, height, depth);
 }
 
+void TextureImplementation_Legacy::cubeMapImage(const Texture * texture, gl::GLint level, gl::GLenum internalFormat, gl::GLsizei width, gl::GLsizei height, gl::GLint border, gl::GLenum format, gl::GLenum type, const gl::GLvoid * data) const
+{
+    texture->bind();
+
+    for (int i = 0; i < 6; ++i)
+    {
+        gl::glTexImage2D(gl::GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, level, static_cast<gl::GLint>(internalFormat), width, height, border, format, type, data);
+    }
+}
+
 void TextureImplementation_Legacy::texBuffer(const Texture * texture, const gl::GLenum internalFormat, Buffer * buffer) const
 {
     texture->bind();

source/globjects/source/implementations/TextureImplementation_Legacy.h

@@ -45,6 +45,8 @@ class TextureImplementation_Legacy : public AbstractTextureImplementation
     virtual void storage2D(const Texture * texture, gl::GLsizei levels, gl::GLenum internalFormat, gl::GLsizei width, gl::GLsizei height) const override;
     virtual void storage3D(const Texture * texture, gl::GLsizei levels, gl::GLenum internalFormat, gl::GLsizei width, gl::GLsizei height, gl::GLsizei depth) const override;
 
+    virtual void cubeMapImage(const Texture * texture, gl::GLint level, gl::GLenum internalFormat, gl::GLsizei width, gl::GLsizei height, gl::GLint border, gl::GLenum format, gl::GLenum type, const gl::GLvoid * data) const override;
+
     virtual void texBuffer(const Texture * texture, const gl::GLenum internalFormat, Buffer * buffer) const override;
     virtual void texBufferRange(const Texture * texture, const gl::GLenum internalFormat, Buffer * buffer, const gl::GLintptr offset, const gl::GLsizeiptr size) const override;