| 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 b90974062192801e6f5a9a29d000204649798c14..f1ecb3fbcd4f668d122242ac8f3f79430977ee33 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
|
| @@ -3786,6 +3786,7 @@ Capabilities GLES2DecoderImpl::GetCapabilities() {
|
| caps.blend_equation_advanced_coherent =
|
| feature_info_->feature_flags().blend_equation_advanced_coherent;
|
| caps.texture_rg = feature_info_->feature_flags().ext_texture_rg;
|
| + caps.texture_norm16 = feature_info_->feature_flags().ext_texture_norm16;
|
| caps.texture_half_float_linear =
|
| feature_info_->feature_flags().enable_texture_half_float_linear;
|
| caps.color_buffer_half_float_rgba =
|
| @@ -16589,6 +16590,7 @@ bool GLES2DecoderImpl::ValidateCopyTextureCHROMIUMInternalFormats(
|
| break;
|
| }
|
|
|
| + // TODO(aleksandar.stojiljkovic): Use sized internal formats: crbug.com/628064
|
| bool valid_source_format =
|
| source_internal_format == GL_RED || source_internal_format == GL_ALPHA ||
|
| source_internal_format == GL_RGB || source_internal_format == GL_RGBA ||
|
| @@ -16598,7 +16600,8 @@ bool GLES2DecoderImpl::ValidateCopyTextureCHROMIUMInternalFormats(
|
| source_internal_format == GL_BGRA_EXT ||
|
| source_internal_format == GL_BGRA8_EXT ||
|
| source_internal_format == GL_RGB_YCBCR_420V_CHROMIUM ||
|
| - source_internal_format == GL_RGB_YCBCR_422_CHROMIUM;
|
| + source_internal_format == GL_RGB_YCBCR_422_CHROMIUM ||
|
| + source_internal_format == GL_R16_EXT;
|
| if (!valid_source_format) {
|
| std::string msg = "invalid source internal format " +
|
| GLES2Util::GetStringEnum(source_internal_format);
|
|
|