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.

Sign up for GitHub

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

Jump to bottom

Glsl override for nouveau #681

Draft
wants to merge 3 commits into
base: rolling
Choose a base branch
from
Draft

Glsl override for nouveau #681

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8994a5d
Glsl version override for nouveau driver
pijaro May 6, 2021
a7b5e4d
Ifdef linux for nouveau check
pijaro May 6, 2021
cae7c16
Added Intel drives to glsl150 exclude vendors
pijaro May 13, 2021
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
10 changes: 10 additions & 0 deletions rviz_rendering/src/rviz_rendering/render_system.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,16 @@ RenderSystem::detectGlVersion()
}
break;
}

#ifdef __linux__
// TODO(pijaro): Nouveanu and Intel drivers don't support glsl150 even if they "should".
// We fix version to 120 since this is the one we are currently using in materials.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pijaro Sorry, this PR dropped off my radar.

It sounds like it would be good to merge this workaround until we resolve the core issue.
Could you reference the open ticket here in this comment? #691

std::string vendor_name = (const char *)glGetString(GL_VENDOR);
if ((vendor_name == "nouveau" || vendor_name == "Intel") && glsl_version_ > 120) {
glsl_version_ = 120;
}
#endif

RVIZ_RENDERING_LOG_INFO_STREAM(
"OpenGl version: " << gl_version_ / 100.0 << " (GLSL " << glsl_version_ / 100.0 << ")"
);
Expand Down