-
Notifications
You must be signed in to change notification settings - Fork 205
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
Fix map after upgrade #459
Conversation
The shader was incomplete: Without declaring textures, of the texture is assumed to be 2d, which is incompatible with the fragment shader sampler1d variable. Previously, this did not manifest at all because no texture units were assigned while now they may be
Previously the old texture was replaced but not rebound. Now we only delete the texture when actually binding it to the shader unit state
This might cause problems because Ogre vectors are not initialised
Fixes issue on my machine |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Though the map is rendering for me now, I do get the following error printed to the screen when the first map message is received:
[ERROR] [rviz2]: Vertex Program:rviz/glsl120/indexed_8bit_image.vert Fragment Program:rviz/glsl120/indexed_8bit_image.frag GLSL link result :
active samplers with a different type refer to the same texture image unit
I'm not sure what is causing it.
rviz_default_plugins/src/rviz_default_plugins/displays/map/swatch.cpp
Outdated
Show resolved
Hide resolved
@jacobperron: Yes, I also see this message, but actually I also see it without the upgrade. The message seems to be present for other people as well before the upgrade (for instance, see #458 - whatever version was used there, it was definitely before the OGRE upgrade, because the log message reads "Creating 1 swatches_" which was changed in d52e5c1 before the upgrade). I tried to get rid of that message also, but I couldn't do it without going really deep and as it was present before the upgrade, it seems to be a different problem. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Follow-up ticket: #463 |
Fix #453
This fixes the visual test after the latest upgrade and should therefore fix map rendering in general. Now, I only see one instance of
in the log, but I also see this way before the upgrade was done, so it's a different issue altogether.