yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

opengl: Drop unnecessary 16 bit texture support checks

Browse source 
16 bit textures are supported universally in OpenGL.
This commit is contained in:
Vlad Zahorodnii 2024-08-19 18:27:25 +03:00
parent f3406a033c
commit 315fff68e9
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/opengl/gltexture.cpp
View file

@ -161,8 +161,7 @@ void GLTexture::update(const QImage &image, const QRegion &region, const QPoint
if (!context->isOpenGLES()) { if (!context->isOpenGLES()) {
const QImage::Format index = image.format(); const QImage::Format index = image.format();
if (index < sizeof(formatTable) / sizeof(formatTable[0]) && formatTable[index].internalFormat if (index < sizeof(formatTable) / sizeof(formatTable[0]) && formatTable[index].internalFormat) {
&& !(formatTable[index].type == GL_UNSIGNED_SHORT && !context->supports16BitTextures())) {
glFormat = formatTable[index].format; glFormat = formatTable[index].format;
type = formatTable[index].type; type = formatTable[index].type;
uploadFormat = index; uploadFormat = index;
@ -555,8 +554,7 @@ std::unique_ptr<GLTexture> GLTexture::upload(const QImage &image)
QImage::Format uploadFormat; QImage::Format uploadFormat;
if (!context->isOpenGLES()) { if (!context->isOpenGLES()) {
const QImage::Format index = image.format(); const QImage::Format index = image.format();
if (index < sizeof(formatTable) / sizeof(formatTable[0]) && formatTable[index].internalFormat if (index < sizeof(formatTable) / sizeof(formatTable[0]) && formatTable[index].internalFormat) {
&& !(formatTable[index].type == GL_UNSIGNED_SHORT && !context->supports16BitTextures())) {
internalFormat = formatTable[index].internalFormat; internalFormat = formatTable[index].internalFormat;
format = formatTable[index].format; format = formatTable[index].format;
type = formatTable[index].type; type = formatTable[index].type;