[ros-diffs] [jgardou] 60519: [OPENGL32] - Assorted changes of previous commit CORE-7499