More general texture handling. Some cleanup.

Change-Id: Ia1b14dcb922bda62f380e419281d6e027ad86ecd
7 files changed