| 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 482ab1ab187d62302f19c28a9e57b13b43fa53a3..57339fb65f58bcf2d5786594d160b31ebeff48a7 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| @@ -12114,6 +12114,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;
|
| @@ -12168,6 +12170,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 *=
|
| @@ -12279,6 +12283,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(
|
| @@ -12385,7 +12393,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)) {
|
|
|