Merge branch 'master' into jgrpp
# Conflicts: # .github/workflows/ci-build.yml # .github/workflows/commit-checker.yml # src/command.cpp # src/company_cmd.cpp # src/company_gui.cpp # src/crashlog.cpp # src/economy.cpp # src/lang/english.txt # src/lang/german.txt # src/lang/korean.txt # src/misc_gui.cpp # src/newgrf_config.cpp # src/openttd.cpp # src/settings_gui.cpp # src/ship_cmd.cpp # src/table/settings/gui_settings.ini
This commit is contained in:
@@ -745,6 +745,16 @@ void OpenGLBackend::PrepareContext()
|
||||
_glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
}
|
||||
|
||||
std::string OpenGLBackend::GetDriverName()
|
||||
{
|
||||
std::string res{};
|
||||
/* Skipping GL_VENDOR as it tends to be "obvious" from the renderer and version data, and just makes the string pointlessly longer */
|
||||
res += reinterpret_cast<const char *>(_glGetString(GL_RENDERER));
|
||||
res += ", ";
|
||||
res += reinterpret_cast<const char *>(_glGetString(GL_VERSION));
|
||||
return res;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check a shader for compilation errors and log them if necessary.
|
||||
* @param shader Shader to check.
|
||||
|
||||
Reference in New Issue
Block a user