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

libkwineffects: don't query OpenGL extensions twice

Browse source
This commit is contained in:
Xaver Hugl 2023-09-07 15:09:27 +02:00
parent ed02051a4a
commit 0a58bd04d5
2 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/libkwineffects/glplatform.cpp
View file

@ -736,20 +736,6 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
m_context = std::make_unique<OpenGlContext>(); m_context = std::make_unique<OpenGlContext>();
if (!isGLES() && m_context->hasVersion(Version(3, 0))) {
int count;
glGetIntegerv(GL_NUM_EXTENSIONS, &count);
for (int i = 0; i < count; i++) {
const char *name = (const char *)glGetStringi(GL_EXTENSIONS, i);
m_extensions.insert(name);
}
} else {
const QByteArray extensions = (const char *)glGetString(GL_EXTENSIONS);
QList<QByteArray> extensionsList = extensions.split(' ');
m_extensions = {extensionsList.constBegin(), extensionsList.constEnd()};
}
// Parse the Mesa version // Parse the Mesa version
const auto versionTokens = m_context->openglVersionString().toByteArray().split(' '); const auto versionTokens = m_context->openglVersionString().toByteArray().split(' ');
const int mesaIndex = versionTokens.indexOf("Mesa"); const int mesaIndex = versionTokens.indexOf("Mesa");
@ -761,20 +747,20 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
m_supportsGLSL = true; m_supportsGLSL = true;
m_textureNPOT = true; m_textureNPOT = true;
} else { } else {
m_supportsGLSL = (m_extensions.contains("GL_ARB_shader_objects") m_supportsGLSL = (m_context->hasOpenglExtension("GL_ARB_shader_objects")
&& m_extensions.contains("GL_ARB_fragment_shader") && m_context->hasOpenglExtension("GL_ARB_fragment_shader")
&& m_extensions.contains("GL_ARB_vertex_shader")); && m_context->hasOpenglExtension("GL_ARB_vertex_shader"));
m_textureNPOT = m_extensions.contains("GL_ARB_texture_non_power_of_two"); m_textureNPOT = m_context->hasOpenglExtension("GL_ARB_texture_non_power_of_two");
} }
if (!qEnvironmentVariableIsSet("KWIN_NO_TIMER_QUERY")) { if (!qEnvironmentVariableIsSet("KWIN_NO_TIMER_QUERY")) {
if (isGLES()) { if (isGLES()) {
// 3.0 is required so query functions can be used without "EXT" suffix. // 3.0 is required so query functions can be used without "EXT" suffix.
// Timer queries are still not part of the core OpenGL ES specification. // Timer queries are still not part of the core OpenGL ES specification.
m_supportsTimerQuery = glVersion() >= Version(3, 0) && m_extensions.contains("GL_EXT_disjoint_timer_query"); m_supportsTimerQuery = glVersion() >= Version(3, 0) && m_context->hasOpenglExtension("GL_EXT_disjoint_timer_query");
} else { } else {
m_supportsTimerQuery = glVersion() >= Version(3, 3) || m_extensions.contains("GL_ARB_timer_query"); m_supportsTimerQuery = glVersion() >= Version(3, 3) || m_context->hasOpenglExtension("GL_ARB_timer_query");
} }
} }
@ -789,7 +775,7 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
m_chipset = QByteArrayLiteral("Unknown"); m_chipset = QByteArrayLiteral("Unknown");
m_preferBufferSubData = false; m_preferBufferSubData = false;
m_packInvert = m_extensions.contains("GL_MESA_pack_invert"); m_packInvert = m_context->hasOpenglExtension("GL_MESA_pack_invert");
// Mesa classic drivers // Mesa classic drivers
// ==================================================== // ====================================================

1
src/libkwineffects/glplatform.h
View file

@ -413,7 +413,6 @@ private:
private: private:
QByteArray m_glsl_version; QByteArray m_glsl_version;
QByteArrayView m_chipset; QByteArrayView m_chipset;
QSet<QByteArray> m_extensions;
Driver m_driver; Driver m_driver;
ChipClass m_chipClass; ChipClass m_chipClass;
CompositingType m_recommendedCompositor; CompositingType m_recommendedCompositor;