Fixed merge issue.

This commit is contained in:
Branimir Karadžić
2018-06-11 09:24:54 -07:00
parent acd99728b7
commit 8d2e936dbe

View File

@@ -211,16 +211,6 @@ namespace bgfx { namespace gl
{ GL_COMPRESSED_RGBA_ASTC_8x6_KHR, GL_COMPRESSED_SRGB8_ASTC_8x6_KHR, GL_COMPRESSED_RGBA_ASTC_8x6_KHR, GL_ZERO, false }, // ASTC8x6
{ GL_COMPRESSED_RGBA_ASTC_10x5_KHR, GL_COMPRESSED_SRGB8_ASTC_10x5_KHR, GL_COMPRESSED_RGBA_ASTC_10x5_KHR, GL_ZERO, false }, // ASTC10x5
{ GL_ZERO, GL_ZERO, GL_ZERO, GL_ZERO, false }, // Unknown
{ GL_ZERO, GL_ZERO, GL_ZERO, GL_ZERO, false }, // ATC
{ GL_ZERO, GL_ZERO, GL_ZERO, GL_ZERO, false }, // ATCE
{ GL_ZERO, GL_ZERO, GL_ZERO, GL_ZERO, false }, // ATCI
{ GL_ZERO, GL_ZERO, GL_ZERO, GL_ZERO, false }, // ASTC4x4
{ GL_ZERO, GL_ZERO, GL_ZERO, GL_ZERO, false }, // ASTC5x5
{ GL_ZERO, GL_ZERO, GL_ZERO, GL_ZERO, false }, // ASTC6x6
{ GL_ZERO, GL_ZERO, GL_ZERO, GL_ZERO, false }, // ASTC8x5
{ GL_ZERO, GL_ZERO, GL_ZERO, GL_ZERO, false }, // ASTC8x6
{ GL_ZERO, GL_ZERO, GL_ZERO, GL_ZERO, false }, // ASTC10x5
{ GL_ZERO, GL_ZERO, GL_ZERO, GL_ZERO, false }, // R1
{ GL_ALPHA, GL_ZERO, GL_ALPHA, GL_UNSIGNED_BYTE, false }, // A8
{ GL_R8, GL_ZERO, GL_RED, GL_UNSIGNED_BYTE, false }, // R8