Merge commit 'b2c315ebe79359fa443533f9ab55e9b730938e41' * commit 'b2c315ebe79359fa443533f9ab55e9b730938e41': fix a typo that prevented glTexImage2D codepath to work
Merge commit 'b2c315ebe79359fa443533f9ab55e9b730938e41' * commit 'b2c315ebe79359fa443533f9ab55e9b730938e41': fix a typo that prevented glTexImage2D codepath to work