Internal change
PiperOrigin-RevId: 489331826
This commit is contained in:
parent
1fb0902aa0
commit
a7bd725e65
|
@ -290,8 +290,15 @@ absl::Status GlContext::FinishInitialization(bool create_thread) {
|
||||||
// some Emscripten cases), there might be some existing tripped error.
|
// some Emscripten cases), there might be some existing tripped error.
|
||||||
ForceClearExistingGlErrors();
|
ForceClearExistingGlErrors();
|
||||||
|
|
||||||
absl::string_view version_string(
|
absl::string_view version_string;
|
||||||
reinterpret_cast<const char*>(glGetString(GL_VERSION)));
|
const GLubyte* version_string_ptr = glGetString(GL_VERSION);
|
||||||
|
if (version_string_ptr != nullptr) {
|
||||||
|
version_string = reinterpret_cast<const char*>(version_string_ptr);
|
||||||
|
} else {
|
||||||
|
// This may happen when using SwiftShader, but the numeric versions are
|
||||||
|
// available and will be used instead.
|
||||||
|
LOG(WARNING) << "failed to get GL_VERSION string";
|
||||||
|
}
|
||||||
|
|
||||||
// We will decide later whether we want to use the version numbers we query
|
// We will decide later whether we want to use the version numbers we query
|
||||||
// for, or instead derive that information from the context creation result,
|
// for, or instead derive that information from the context creation result,
|
||||||
|
@ -333,7 +340,7 @@ absl::Status GlContext::FinishInitialization(bool create_thread) {
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG(INFO) << "GL version: " << gl_major_version_ << "." << gl_minor_version_
|
LOG(INFO) << "GL version: " << gl_major_version_ << "." << gl_minor_version_
|
||||||
<< " (" << glGetString(GL_VERSION) << ")";
|
<< " (" << version_string << ")";
|
||||||
{
|
{
|
||||||
auto status = GetGlExtensions();
|
auto status = GetGlExtensions();
|
||||||
if (!status.ok()) {
|
if (!status.ok()) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user