Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ogre2RenderEngine: on Windows if useCurrentGLContext is specified, set the externalWindowHandle ogre-next option #992

Merged
merged 1 commit into from
Apr 24, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions ogre2/src/Ogre2RenderEngine.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1263,6 +1263,22 @@ std::string Ogre2RenderEngine::CreateRenderWindow(const std::string &_handle,
{
params["externalGLControl"] = "true";
params["currentGLContext"] = "true";

#if defined(_MSC_VER)
if (!this->winID.empty())
{
params["externalWindowHandle"] = this->winID;
}
else
{
gzerr << "useCurrentGLContext option specified, "
<< "but no winID specified." << std::endl
<< "On Windows if useCurrentGLContext is specified, "
<< "the ogre2 rendering requires that also winID is specified."
<< std::endl;
return std::string();
}
#endif
}

#if !defined(__APPLE__) && !defined(_MSC_VER)
Expand Down