From 8d2e936dbecbd53bf87e953c0bf4e2c9c60c8f62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Mon, 11 Jun 2018 09:24:54 -0700 Subject: [PATCH] Fixed merge issue. --- src/renderer_gl.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index 07b6c8806..ef3c5c958 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -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