Merge "vulkan/opengl: rename some vars and comments"