Housekeeping to rename GrGL compressed texture formats to match GL specs
BUG=skia:
Review URL: https://codereview.chromium.org/1035243002
diff --git a/src/gpu/gl/GrGLDefines.h b/src/gpu/gl/GrGLDefines.h
index fc44252..ae40500 100644
--- a/src/gpu/gl/GrGLDefines.h
+++ b/src/gpu/gl/GrGLDefines.h
@@ -211,80 +211,80 @@
#define GR_GL_COMPRESSED_TEXTURE_FORMATS 0x86A3
/* Compressed Texture Formats */
-#define GR_GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0
-#define GR_GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1
-#define GR_GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2
-#define GR_GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3
+#define GR_GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0
+#define GR_GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1
+#define GR_GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2
+#define GR_GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3
-#define GR_GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG 0x8C00
-#define GR_GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG 0x8C01
-#define GR_GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02
-#define GR_GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03
+#define GR_GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG 0x8C00
+#define GR_GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG 0x8C01
+#define GR_GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02
+#define GR_GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03
-#define GR_GL_COMPRESSED_RGBA_PVRTC_2BPPV2_IMG 0x9137
-#define GR_GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG 0x9138
+#define GR_GL_COMPRESSED_RGBA_PVRTC_2BPPV2_IMG 0x9137
+#define GR_GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG 0x9138
-#define GR_GL_COMPRESSED_RGB8_ETC1 0x8D64
+#define GR_GL_COMPRESSED_ETC1_RGB8 0x8D64
-#define GR_GL_COMPRESSED_R11 0x9270
-#define GR_GL_COMPRESSED_SIGNED_R11 0x9271
-#define GR_GL_COMPRESSED_RG11 0x9272
-#define GR_GL_COMPRESSED_SIGNED_RG11 0x9273
+#define GR_GL_COMPRESSED_R11_EAC 0x9270
+#define GR_GL_COMPRESSED_SIGNED_R11_EAC 0x9271
+#define GR_GL_COMPRESSED_RG11_EAC 0x9272
+#define GR_GL_COMPRESSED_SIGNED_RG11_EAC 0x9273
-#define GR_GL_COMPRESSED_RGB8_ETC2 0x9274
-#define GR_GL_COMPRESSED_SRGB8 0x9275
-#define GR_GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1 0x9276
-#define GR_GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1 0x9277
-#define GR_GL_COMPRESSED_RGBA8_ETC2 0x9278
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ETC2 0x9279
+#define GR_GL_COMPRESSED_RGB8_ETC2 0x9274
+#define GR_GL_COMPRESSED_SRGB8 0x9275
+#define GR_GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1 0x9276
+#define GR_GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1 0x9277
+#define GR_GL_COMPRESSED_RGBA8_ETC2 0x9278
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ETC2 0x9279
-#define GR_GL_COMPRESSED_LUMINANCE_LATC1 0x8C70
-#define GR_GL_COMPRESSED_SIGNED_LUMINANCE_LATC1 0x8C71
-#define GR_GL_COMPRESSED_LUMINANCE_ALPHA_LATC2 0x8C72
-#define GR_GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2 0x8C73
+#define GR_GL_COMPRESSED_LUMINANCE_LATC1 0x8C70
+#define GR_GL_COMPRESSED_SIGNED_LUMINANCE_LATC1 0x8C71
+#define GR_GL_COMPRESSED_LUMINANCE_ALPHA_LATC2 0x8C72
+#define GR_GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2 0x8C73
-#define GR_GL_COMPRESSED_RED_RGTC1 0x8DBB
-#define GR_GL_COMPRESSED_SIGNED_RED_RGTC1 0x8DBC
-#define GR_GL_COMPRESSED_RED_GREEN_RGTC2 0x8DBD
-#define GR_GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2 0x8DBE
+#define GR_GL_COMPRESSED_RED_RGTC1 0x8DBB
+#define GR_GL_COMPRESSED_SIGNED_RED_RGTC1 0x8DBC
+#define GR_GL_COMPRESSED_RED_GREEN_RGTC2 0x8DBD
+#define GR_GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2 0x8DBE
-#define GR_GL_COMPRESSED_3DC_X 0x87F9
-#define GR_GL_COMPRESSED_3DC_XY 0x87FA
+#define GR_GL_COMPRESSED_3DC_X 0x87F9
+#define GR_GL_COMPRESSED_3DC_XY 0x87FA
-#define GR_GL_COMPRESSED_RGBA_BPTC_UNORM 0x8E8C
-#define GR_GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM 0x8E8D
-#define GR_GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT 0x8E8E
-#define GR_GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT 0x8E8F
+#define GR_GL_COMPRESSED_RGBA_BPTC_UNORM 0x8E8C
+#define GR_GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM 0x8E8D
+#define GR_GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT 0x8E8E
+#define GR_GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT 0x8E8F
-#define GR_GL_COMPRESSED_RGBA_ASTC_4x4 0x93B0
-#define GR_GL_COMPRESSED_RGBA_ASTC_5x4 0x93B1
-#define GR_GL_COMPRESSED_RGBA_ASTC_5x5 0x93B2
-#define GR_GL_COMPRESSED_RGBA_ASTC_6x5 0x93B3
-#define GR_GL_COMPRESSED_RGBA_ASTC_6x6 0x93B4
-#define GR_GL_COMPRESSED_RGBA_ASTC_8x5 0x93B5
-#define GR_GL_COMPRESSED_RGBA_ASTC_8x6 0x93B6
-#define GR_GL_COMPRESSED_RGBA_ASTC_8x8 0x93B7
-#define GR_GL_COMPRESSED_RGBA_ASTC_10x5 0x93B8
-#define GR_GL_COMPRESSED_RGBA_ASTC_10x6 0x93B9
-#define GR_GL_COMPRESSED_RGBA_ASTC_10x8 0x93BA
-#define GR_GL_COMPRESSED_RGBA_ASTC_10x10 0x93BB
-#define GR_GL_COMPRESSED_RGBA_ASTC_12x10 0x93BC
-#define GR_GL_COMPRESSED_RGBA_ASTC_12x12 0x93BD
+#define GR_GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0
+#define GR_GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1
+#define GR_GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2
+#define GR_GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3
+#define GR_GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4
+#define GR_GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5
+#define GR_GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6
+#define GR_GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7
+#define GR_GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8
+#define GR_GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9
+#define GR_GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA
+#define GR_GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB
+#define GR_GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC
+#define GR_GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4 0x93D0
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4 0x93D1
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5 0x93D2
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5 0x93D3
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6 0x93D4
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5 0x93D5
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6 0x93D6
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8 0x93D7
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5 0x93D8
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6 0x93D9
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8 0x93DA
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10 0x93DB
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10 0x93DC
-#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12 0x93DD
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC
+#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD
/* HintMode */
#define GR_GL_DONT_CARE 0x1100
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
index 0f7a0c1..566c8c5 100644
--- a/src/gpu/gl/GrGLGpu.cpp
+++ b/src/gpu/gl/GrGLGpu.cpp
@@ -2422,7 +2422,7 @@
}
break;
case kETC1_GrPixelConfig:
- *internalFormat = GR_GL_COMPRESSED_RGB8_ETC1;
+ *internalFormat = GR_GL_COMPRESSED_ETC1_RGB8;
break;
case kLATC_GrPixelConfig:
switch(this->glCaps().latcAlias()) {
@@ -2438,11 +2438,11 @@
}
break;
case kR11_EAC_GrPixelConfig:
- *internalFormat = GR_GL_COMPRESSED_R11;
+ *internalFormat = GR_GL_COMPRESSED_R11_EAC;
break;
case kASTC_12x12_GrPixelConfig:
- *internalFormat = GR_GL_COMPRESSED_RGBA_ASTC_12x12;
+ *internalFormat = GR_GL_COMPRESSED_RGBA_ASTC_12x12_KHR;
break;
case kRGBA_float_GrPixelConfig:
diff --git a/third_party/ktx/ktx.cpp b/third_party/ktx/ktx.cpp
index 42b3ca1..5e24581 100644
--- a/third_party/ktx/ktx.cpp
+++ b/third_party/ktx/ktx.cpp
@@ -18,23 +18,23 @@
static inline uint32_t compressed_fmt_to_gl_define(SkTextureCompressor::Format fmt) {
static const uint32_t kGLDefineMap[SkTextureCompressor::kFormatCnt] = {
- GR_GL_COMPRESSED_LUMINANCE_LATC1, // kLATC_Format
- GR_GL_COMPRESSED_R11, // kR11_EAC_Format
- GR_GL_COMPRESSED_RGB8_ETC1, // kETC1_Format
- GR_GL_COMPRESSED_RGBA_ASTC_4x4, // kASTC_4x4_Format
- GR_GL_COMPRESSED_RGBA_ASTC_5x4, // kASTC_5x4_Format
- GR_GL_COMPRESSED_RGBA_ASTC_5x5, // kASTC_5x5_Format
- GR_GL_COMPRESSED_RGBA_ASTC_6x5, // kASTC_6x5_Format
- GR_GL_COMPRESSED_RGBA_ASTC_6x6, // kASTC_6x6_Format
- GR_GL_COMPRESSED_RGBA_ASTC_8x5, // kASTC_8x5_Format
- GR_GL_COMPRESSED_RGBA_ASTC_8x6, // kASTC_8x6_Format
- GR_GL_COMPRESSED_RGBA_ASTC_8x8, // kASTC_8x8_Format
- GR_GL_COMPRESSED_RGBA_ASTC_10x5, // kASTC_10x5_Format
- GR_GL_COMPRESSED_RGBA_ASTC_10x6, // kASTC_10x6_Format
- GR_GL_COMPRESSED_RGBA_ASTC_10x8, // kASTC_10x8_Format
- GR_GL_COMPRESSED_RGBA_ASTC_10x10, // kASTC_10x10_Format
- GR_GL_COMPRESSED_RGBA_ASTC_12x10, // kASTC_12x10_Format
- GR_GL_COMPRESSED_RGBA_ASTC_12x12, // kASTC_12x12_Format
+ GR_GL_COMPRESSED_LUMINANCE_LATC1, // kLATC_Format
+ GR_GL_COMPRESSED_R11_EAC, // kR11_EAC_Format
+ GR_GL_COMPRESSED_ETC1_RGB8, // kETC1_Format
+ GR_GL_COMPRESSED_RGBA_ASTC_4x4_KHR, // kASTC_4x4_Format
+ GR_GL_COMPRESSED_RGBA_ASTC_5x4_KHR, // kASTC_5x4_Format
+ GR_GL_COMPRESSED_RGBA_ASTC_5x5_KHR, // kASTC_5x5_Format
+ GR_GL_COMPRESSED_RGBA_ASTC_6x5_KHR, // kASTC_6x5_Format
+ GR_GL_COMPRESSED_RGBA_ASTC_6x6_KHR, // kASTC_6x6_Format
+ GR_GL_COMPRESSED_RGBA_ASTC_8x5_KHR, // kASTC_8x5_Format
+ GR_GL_COMPRESSED_RGBA_ASTC_8x6_KHR, // kASTC_8x6_Format
+ GR_GL_COMPRESSED_RGBA_ASTC_8x8_KHR, // kASTC_8x8_Format
+ GR_GL_COMPRESSED_RGBA_ASTC_10x5_KHR, // kASTC_10x5_Format
+ GR_GL_COMPRESSED_RGBA_ASTC_10x6_KHR, // kASTC_10x6_Format
+ GR_GL_COMPRESSED_RGBA_ASTC_10x8_KHR, // kASTC_10x8_Format
+ GR_GL_COMPRESSED_RGBA_ASTC_10x10_KHR, // kASTC_10x10_Format
+ GR_GL_COMPRESSED_RGBA_ASTC_12x10_KHR, // kASTC_12x10_Format
+ GR_GL_COMPRESSED_RGBA_ASTC_12x12_KHR, // kASTC_12x12_Format
};
GR_STATIC_ASSERT(0 == SkTextureCompressor::kLATC_Format);
@@ -385,7 +385,7 @@
hdr.fGLType = 0;
hdr.fGLTypeSize = 1;
hdr.fGLFormat = 0;
- hdr.fGLInternalFormat = GR_GL_COMPRESSED_RGB8_ETC1;
+ hdr.fGLInternalFormat = GR_GL_COMPRESSED_ETC1_RGB8;
hdr.fGLBaseInternalFormat = GR_GL_RGB;
hdr.fPixelWidth = width;
hdr.fPixelHeight = height;