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 496068d0bc88846a638199415e4c4ef24c495176..cd1a2530c1cceb89c9f5ad6f39b9d60876863995 100644 |
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc |
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc |
@@ -3788,6 +3788,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 = |
@@ -16551,6 +16552,7 @@ bool GLES2DecoderImpl::ValidateCopyTextureCHROMIUMInternalFormats( |
break; |
} |
+ // TODO(aleksandar.stojiljkovic): Use sized internal formats: crbug.com/662644 |
bool valid_source_format = |
source_internal_format == GL_RED || source_internal_format == GL_ALPHA || |
source_internal_format == GL_RGB || source_internal_format == GL_RGBA || |
@@ -16560,7 +16562,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); |