diff options
| -rw-r--r-- | gpu/command_buffer/service/feature_info.cc | 7 | ||||
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc index 5d9403e..b42bd4e 100644 --- a/gpu/command_buffer/service/feature_info.cc +++ b/gpu/command_buffer/service/feature_info.cc @@ -177,7 +177,8 @@ void FeatureInfo::AddFeatures(const char* desired_features) { // Check if we should allow GL_EXT_texture_format_BGRA8888 if (ext.Desire("GL_EXT_texture_format_BGRA8888") && (ext.Have("GL_EXT_texture_format_BGRA8888") || - ext.Have("GL_APPLE_texture_format_BGRA8888"))) { + ext.Have("GL_APPLE_texture_format_BGRA8888") || + ext.Have("GL_EXT_bgra"))) { enable_texture_format_bgra8888 = true; } @@ -186,7 +187,9 @@ void FeatureInfo::AddFeatures(const char* desired_features) { enable_read_format_bgra = true; } - if (ext.HaveAndDesire("GL_EXT_read_format_bgra")) { + if (ext.Desire("GL_EXT_read_format_bgra") && + (ext.Have("GL_EXT_read_format_bgra") || + ext.Have("GL_EXT_bgra"))) { enable_read_format_bgra = true; } diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index ad33868..e544365 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -3292,7 +3292,7 @@ void GLES2DecoderImpl::DoDrawArrays( // We have to check this here because the prototype for glDrawArrays // is GLint not GLsizei. if (first < 0) { - SetGLError(GL_INVALID_ENUM, "glDrawArrays: first < 0"); + SetGLError(GL_INVALID_VALUE, "glDrawArrays: first < 0"); return; } |