Merge branch 'jbolz_astc_srgb_5x4_8x5' into 'master'
authorPyry Haulos <phaulos@google.com>
Wed, 13 Jan 2016 17:07:52 +0000 (12:07 -0500)
committerPyry Haulos <phaulos@google.com>
Wed, 13 Jan 2016 17:07:52 +0000 (12:07 -0500)
commitb25db9187022e5dc2e4f993361fda201ec8a7ef1
tree1b082532383ccaae01a7a41518b37f45f6307fe1
parentf1914604bdff6b3e08261bd85618ec4fd0ed3d4d
parent0c2823db759e010370880055298ba7802b855a73
Merge branch 'jbolz_astc_srgb_5x4_8x5' into 'master'

Fix mapping of ASTC/sRGB formats for 5x4 and 8x5 block sizes

See merge request !284