| Index: cc/resources/resource_provider.h
|
| diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
|
| index 95a10d57f3af884d5fc7fc03ccab2d51bf10b1e3..bfd3ebb304765b255a31baa03861b9aa20d4cba2 100644
|
| --- a/cc/resources/resource_provider.h
|
| +++ b/cc/resources/resource_provider.h
|
| @@ -610,7 +610,6 @@
|
| return 16;
|
| case ALPHA_8:
|
| case LUMINANCE_8:
|
| - case RED_8:
|
| return 8;
|
| case ETC1:
|
| return 4;
|
| @@ -622,14 +621,13 @@
|
| inline GLenum GLDataType(ResourceFormat format) {
|
| DCHECK_LE(format, RESOURCE_FORMAT_MAX);
|
| static const unsigned format_gl_data_type[RESOURCE_FORMAT_MAX + 1] = {
|
| - GL_UNSIGNED_BYTE, // RGBA_8888
|
| - GL_UNSIGNED_SHORT_4_4_4_4, // RGBA_4444
|
| - GL_UNSIGNED_BYTE, // BGRA_8888
|
| - GL_UNSIGNED_BYTE, // ALPHA_8
|
| - GL_UNSIGNED_BYTE, // LUMINANCE_8
|
| - GL_UNSIGNED_SHORT_5_6_5, // RGB_565,
|
| - GL_UNSIGNED_BYTE, // ETC1
|
| - GL_UNSIGNED_BYTE // RED_8
|
| + GL_UNSIGNED_BYTE, // RGBA_8888
|
| + GL_UNSIGNED_SHORT_4_4_4_4, // RGBA_4444
|
| + GL_UNSIGNED_BYTE, // BGRA_8888
|
| + GL_UNSIGNED_BYTE, // ALPHA_8
|
| + GL_UNSIGNED_BYTE, // LUMINANCE_8
|
| + GL_UNSIGNED_SHORT_5_6_5, // RGB_565,
|
| + GL_UNSIGNED_BYTE // ETC1
|
| };
|
| return format_gl_data_type[format];
|
| }
|
| @@ -637,14 +635,13 @@
|
| inline GLenum GLDataFormat(ResourceFormat format) {
|
| DCHECK_LE(format, RESOURCE_FORMAT_MAX);
|
| static const unsigned format_gl_data_format[RESOURCE_FORMAT_MAX + 1] = {
|
| - GL_RGBA, // RGBA_8888
|
| - GL_RGBA, // RGBA_4444
|
| - GL_BGRA_EXT, // BGRA_8888
|
| - GL_ALPHA, // ALPHA_8
|
| - GL_LUMINANCE, // LUMINANCE_8
|
| - GL_RGB, // RGB_565
|
| - GL_ETC1_RGB8_OES, // ETC1
|
| - GL_RED_EXT // RED_8
|
| + GL_RGBA, // RGBA_8888
|
| + GL_RGBA, // RGBA_4444
|
| + GL_BGRA_EXT, // BGRA_8888
|
| + GL_ALPHA, // ALPHA_8
|
| + GL_LUMINANCE, // LUMINANCE_8
|
| + GL_RGB, // RGB_565
|
| + GL_ETC1_RGB8_OES // ETC1
|
| };
|
| return format_gl_data_format[format];
|
| }
|
|
|