DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Impeller] Fix GL_NUM_EXTENSIONS check for desktop GL (flutter/engine#43785)

Browse Source 
Follow-up fix for https://github.com/flutter/engine/pull/43727.

Fixes the GL playground on MacOS.
This commit is contained in:
Brandon DeRosier 2023-07-18 14:52:13 -07:00 committed by GitHub
parent 5b1d0f082f
commit 0d61edb7a7
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
engine/src/flutter/impeller/renderer/backend/gles/description_gles.cc
View File

@ -82,21 +82,6 @@ DescriptionGLES::DescriptionGLES(const ProcTableGLES& gl)
sl_version_string_(GetGLString(gl, GL_SHADING_LANGUAGE_VERSION)) {
is_es_ = DetermineIfES(gl_version_string_);
if (is_es_) {
const auto extensions = GetGLString(gl, GL_EXTENSIONS);
std::stringstream extensions_stream(extensions);
std::string extension;
while (std::getline(extensions_stream, extension, ' ')) {
extensions_.insert(extension);
}
} else {
int extension_count = 0;
gl.GetIntegerv(GL_NUM_EXTENSIONS, &extension_count);
for (auto i = 0; i < extension_count; i++) {
extensions_.insert(GetGLStringi(gl, GL_EXTENSIONS, i));
}
}
auto gl_version = DetermineVersion(gl_version_string_);
if (!gl_version.has_value()) {
VALIDATION_LOG << "Could not determine GL version.";
@ -104,6 +89,22 @@ DescriptionGLES::DescriptionGLES(const ProcTableGLES& gl)
}
gl_version_ = gl_version.value();
// GL_NUM_EXTENSIONS is only available in OpenGL 3+ and OpenGL ES 3+
if (gl_version_.IsAtLeast(Version(3, 0, 0))) {
int extension_count = 0;
gl.GetIntegerv(GL_NUM_EXTENSIONS, &extension_count);
for (auto i = 0; i < extension_count; i++) {
extensions_.insert(GetGLStringi(gl, GL_EXTENSIONS, i));
}
} else {
const auto extensions = GetGLString(gl, GL_EXTENSIONS);
std::stringstream extensions_stream(extensions);
std::string extension;
while (std::getline(extensions_stream, extension, ' ')) {
extensions_.insert(extension);
}
}
auto sl_version = DetermineVersion(sl_version_string_);
if (!sl_version.has_value()) {
VALIDATION_LOG << "Could not determine SL version.";