1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QOpenGLFramebufferObject: Avoid illegal call to glTexImage2D

Browse Source 
According to the documentation:
GL_INVALID_OPERATION is generated if the combination of internalFormat, format and type is not one of those in the tables above.
https://registry.khronos.org/OpenGL-Refpages/es3.0/html/glTexImage2D.xhtml

We were allowing the RGB values be passed as RGBA, after this change we
don't do so anymore.
This would result for KWin in:
Mesa: User error: GL_INVALID_OPERATION in glTexImage2D(format = GL_RGBA, type = GL_UNSIGNED_BYTE, internalformat = GL_RGB8)

Pick-to: 6.5
Change-Id: Ifde8a570eff01be573f780655d8cedbb96f5ba2b
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit ba9e57d65f15c935632b0ad22db0bead9a7d5f90)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 9483d87ef3b208afa1523a7c87813f2567f01aad)
This commit is contained in:
Aleix Pol 2023-11-14 01:23:35 +01:00 committed by Qt Cherry-pick Bot
parent 56e0239646
commit 1a643cfda0
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/opengl/qopenglframebufferobject.cpp
View File

@ -550,8 +550,20 @@ void QOpenGLFramebufferObjectPrivate::initTexture(int idx)
else if (color.internalFormat == GL_RGB16F || color.internalFormat == GL_RGBA16F) else if (color.internalFormat == GL_RGB16F || color.internalFormat == GL_RGBA16F)
pixelType = GL_HALF_FLOAT; pixelType = GL_HALF_FLOAT;
bool isOpaque = false;
switch (color.internalFormat) {
case GL_RGB8:
case GL_RGB10:
case GL_RGB16:
case GL_RGB16F:
case GL_RGB32F:
isOpaque = true;
break;
}
const GLuint textureFormat = isOpaque ? GL_RGB : GL_RGBA;
funcs.glTexImage2D(target, 0, color.internalFormat, color.size.width(), color.size.height(), 0, funcs.glTexImage2D(target, 0, color.internalFormat, color.size.width(), color.size.height(), 0,
GL_RGBA, pixelType, nullptr); textureFormat, pixelType, nullptr);
if (format.mipmap()) { if (format.mipmap()) {
int width = color.size.width(); int width = color.size.width();
int height = color.size.height(); int height = color.size.height();
@ -560,8 +572,8 @@ void QOpenGLFramebufferObjectPrivate::initTexture(int idx)
width = qMax(1, width >> 1); width = qMax(1, width >> 1);
height = qMax(1, height >> 1); height = qMax(1, height >> 1);
++level; ++level;
funcs.glTexImage2D(target, level, color.internalFormat, width, height, 0, funcs.glTexImage2D(target, level, color.internalFormat, width, height, 0, textureFormat,
GL_RGBA, pixelType, nullptr); pixelType, nullptr);
} }
} }
funcs.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + idx, funcs.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + idx,