Revert and Fix

Reverted earlier changes and still fixed texture bug, glGet is extremely
expensive.