QOpenGLTextureHelper: de-inline the DSA / DSA emulator wrappers

There's no advantage at keeping them inline because we never call them
directly: we take pointers to them. This can actually cause
multiple copies of the function to be emitted, then the linker may or
may not decide to discard N-1 copies. Just avoid this route
and deinline them.

Change-Id: I5adc704b50ec7f26498846fcbb86cb5b5d016b4b
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 364 insertions, 0 deletions

diff --git a/src/gui/opengl/qopengltexturehelper.cpp b/src/gui/opengl/qopengltexturehelper.cpp
index 676c0802de..4da9b3f164 100644
--- a/src/gui/opengl/qopengltexturehelper.cpp
+++ b/src/gui/opengl/qopengltexturehelper.cpp
@@ -233,4 +233,368 @@ QOpenGLTextureHelper::QOpenGLTextureHelper(QOpenGLContext *context)
     TextureView = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint , GLenum , GLuint , GLuint , GLuint , GLuint )>(context->getProcAddress(QByteArrayLiteral("glTextureView")));
 }
 
+#if !defined(QT_OPENGL_ES_2)
+
+void QOpenGLTextureHelper::dsa_TextureParameteri(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLint param)
+{
+    Q_UNUSED(bindingTarget);
+    TextureParameteriEXT(texture, target, pname, param);
+}
+
+void QOpenGLTextureHelper::dsa_TextureParameteriv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLint *params)
+{
+    Q_UNUSED(bindingTarget);
+    TextureParameterivEXT(texture, target, pname, params);
+}
+
+void QOpenGLTextureHelper::dsa_TextureParameterf(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLfloat param)
+{
+    Q_UNUSED(bindingTarget);
+    TextureParameterfEXT(texture, target, pname, param);
+}
+
+void QOpenGLTextureHelper::dsa_TextureParameterfv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLfloat *params)
+{
+    Q_UNUSED(bindingTarget);
+    TextureParameterfvEXT(texture, target, pname, params);
+}
+
+void QOpenGLTextureHelper::dsa_GenerateTextureMipmap(GLuint texture, GLenum target, GLenum bindingTarget)
+{
+    Q_UNUSED(bindingTarget);
+    GenerateTextureMipmapEXT(texture, target);
+}
+
+void QOpenGLTextureHelper::dsa_TextureStorage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth)
+{
+    Q_UNUSED(bindingTarget);
+    TextureStorage3DEXT(texture, target, levels, internalFormat, width, height, depth);
+}
+
+void QOpenGLTextureHelper::dsa_TextureStorage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height)
+{
+    Q_UNUSED(bindingTarget);
+    TextureStorage2DEXT(texture, target, levels, internalFormat, width, height);
+}
+
+void QOpenGLTextureHelper::dsa_TextureStorage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width)
+{
+    Q_UNUSED(bindingTarget);
+    TextureStorage1DEXT(texture, target, levels, internalFormat, width);
+}
+
+void QOpenGLTextureHelper::dsa_TextureStorage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
+{
+    Q_UNUSED(bindingTarget);
+    TextureStorage3DMultisampleEXT(texture, target, samples, internalFormat, width, height, depth, fixedSampleLocations);
+}
+
+void QOpenGLTextureHelper::dsa_TextureStorage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
+{
+    Q_UNUSED(bindingTarget);
+    TextureStorage2DMultisampleEXT(texture, target, samples, internalFormat, width, height, fixedSampleLocations);
+}
+
+void QOpenGLTextureHelper::dsa_TextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    Q_UNUSED(bindingTarget);
+    TextureImage3DEXT(texture, target, level, internalFormat, width, height, depth, border, format, type, pixels);
+}
+
+void QOpenGLTextureHelper::dsa_TextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    Q_UNUSED(bindingTarget);
+    TextureImage2DEXT(texture, target, level, internalFormat, width, height, border, format, type, pixels);
+}
+
+void QOpenGLTextureHelper::dsa_TextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    Q_UNUSED(bindingTarget);
+    TextureImage1DEXT(texture, target, level, internalFormat, width, border, format, type, pixels);
+}
+
+void QOpenGLTextureHelper::dsa_TextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    Q_UNUSED(bindingTarget);
+    TextureSubImage3DEXT(texture, target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+}
+
+void QOpenGLTextureHelper::dsa_TextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    Q_UNUSED(bindingTarget);
+    TextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, type, pixels);
+}
+
+void QOpenGLTextureHelper::dsa_TextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    Q_UNUSED(bindingTarget);
+    TextureSubImage1DEXT(texture, target, level, xoffset, width, format, type, pixels);
+}
+
+void QOpenGLTextureHelper::dsa_TextureImage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
+{
+    Q_UNUSED(bindingTarget);
+    TextureImage3DMultisampleNV(texture, target, samples, internalFormat, width, height, depth, fixedSampleLocations);
+}
+
+void QOpenGLTextureHelper::dsa_TextureImage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
+{
+    Q_UNUSED(bindingTarget);
+    TextureImage2DMultisampleNV(texture, target, samples, internalFormat, width, height, fixedSampleLocations);
+}
+
+void QOpenGLTextureHelper::dsa_CompressedTextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits)
+{
+    Q_UNUSED(bindingTarget);
+    CompressedTextureSubImage1DEXT(texture, target, level, xoffset, width, format, imageSize, bits);
+}
+
+void QOpenGLTextureHelper::dsa_CompressedTextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits)
+{
+    Q_UNUSED(bindingTarget);
+    CompressedTextureSubImage2DEXT(texture, target, level, xoffset, yoffset, width, height, format, imageSize, bits);
+}
+
+void QOpenGLTextureHelper::dsa_CompressedTextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits)
+{
+    Q_UNUSED(bindingTarget);
+    CompressedTextureSubImage3DEXT(texture, target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, bits);
+}
+
+void QOpenGLTextureHelper::dsa_CompressedTextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits)
+{
+    Q_UNUSED(bindingTarget);
+    CompressedTextureImage1DEXT(texture, target, level, internalFormat, width, border, imageSize, bits);
+}
+
+void QOpenGLTextureHelper::dsa_CompressedTextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits)
+{
+    Q_UNUSED(bindingTarget);
+    CompressedTextureImage2DEXT(texture, target, level, internalFormat, width, height, border, imageSize, bits);
+}
+
+void QOpenGLTextureHelper::dsa_CompressedTextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits)
+{
+    Q_UNUSED(bindingTarget);
+    CompressedTextureImage3DEXT(texture, target, level, internalFormat, width, height, depth, border, imageSize, bits);
+}
+
+#endif // !defined(QT_OPENGL_ES_2)
+
+void QOpenGLTextureHelper::qt_TextureParameteri(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLint param)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glTexParameteri(target, pname, param);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_TextureParameteriv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLint *params)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glTexParameteriv(target, pname, params);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_TextureParameterf(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLfloat param)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glTexParameterf(target, pname, param);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_TextureParameterfv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLfloat *params)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glTexParameterfv(target, pname, params);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_GenerateTextureMipmap(GLuint texture, GLenum target, GLenum bindingTarget)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glGenerateMipmap(target);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_TextureStorage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glTexStorage3D(target, levels, internalFormat, width, height, depth);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_TextureStorage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glTexStorage2D(target, levels, internalFormat, width, height);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_TextureStorage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glTexStorage1D(target, levels, internalFormat, width);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_TextureStorage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glTexStorage3DMultisample(target, samples, internalFormat, width, height, depth, fixedSampleLocations);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_TextureStorage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glTexStorage2DMultisample(target, samples, internalFormat, width, height, fixedSampleLocations);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_TextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_TextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glTexImage2D(target, level, internalFormat, width, height, border, format, type, pixels);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_TextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glTexImage1D(target, level, internalFormat, width, border, format, type, pixels);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_TextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_TextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_TextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glTexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_TextureImage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glTexImage3DMultisample(target, samples, internalFormat, width, height, depth, fixedSampleLocations);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_TextureImage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glTexImage2DMultisample(target, samples, internalFormat, width, height, fixedSampleLocations);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_CompressedTextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, bits);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_CompressedTextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, bits);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_CompressedTextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, bits);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_CompressedTextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glCompressedTexImage1D(target, level, internalFormat, width, border, imageSize, bits);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_CompressedTextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glCompressedTexImage2D(target, level, internalFormat, width, height, border, imageSize, bits);
+    glBindTexture(target, oldTexture);
+}
+
+void QOpenGLTextureHelper::qt_CompressedTextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits)
+{
+    GLint oldTexture;
+    glGetIntegerv(bindingTarget, &oldTexture);
+    glBindTexture(target, texture);
+    glCompressedTexImage3D(target, level, internalFormat, width, height, depth, border, imageSize, bits);
+    glBindTexture(target, oldTexture);
+}
+
 QT_END_NAMESPACE