| Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| index 6feca3d1ca16ab4b7fe237edfe41ca08b8a59176..51506971680f37e51e6401568c3a5e8e2c05d447 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| @@ -12109,6 +12109,8 @@ bool GLES2DecoderImpl::GetCompressedTexSizeInBytes(
|
| case GL_ATC_RGB_AMD:
|
| case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
|
| case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
|
| + case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
|
| + case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
|
| case GL_ETC1_RGB8_OES:
|
| bytes_required =
|
| (width + kS3TCBlockWidth - 1) / kS3TCBlockWidth;
|
| @@ -12163,6 +12165,8 @@ bool GLES2DecoderImpl::GetCompressedTexSizeInBytes(
|
| case GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD:
|
| case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
|
| case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
|
| + case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
|
| + case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
|
| bytes_required =
|
| (width + kS3TCBlockWidth - 1) / kS3TCBlockWidth;
|
| bytes_required *=
|
| @@ -12274,6 +12278,10 @@ bool GLES2DecoderImpl::ValidateCompressedTexDimensions(
|
| case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
|
| case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
|
| case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
|
| + case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
|
| + case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
|
| + case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
|
| + case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
|
| DCHECK_EQ(1, depth); // 2D formats.
|
| if (!IsValidDXTSize(level, width) || !IsValidDXTSize(level, height)) {
|
| LOCAL_SET_GL_ERROR(
|
| @@ -12380,7 +12388,11 @@ bool GLES2DecoderImpl::ValidateCompressedTexSubDimensions(
|
| case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
|
| case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
|
| case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
|
| - case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: {
|
| + case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
|
| + case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
|
| + case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
|
| + case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
|
| + case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT: {
|
| const int kBlockWidth = 4;
|
| const int kBlockHeight = 4;
|
| if ((xoffset % kBlockWidth) || (yoffset % kBlockHeight)) {
|
|
|