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 8ae668f5d7615483b9a024a4df8a7122f2d5b8d8..25b95e3bf6949a2e86476d6232925b4cdcf5777d 100644 |
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc |
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc |
@@ -6005,7 +6005,22 @@ void GLES2DecoderImpl::DoGenerateMipmap(GLenum target) { |
} |
} |
- glGenerateMipmapEXT(target); |
+ tex->GetLevelType(target, 0, &type, &internal_format); |
+ bool enable_srgb = |
+ GetColorEncodingFromInternalFormat(internal_format) == GL_SRGB; |
+ if (!enable_srgb || !feature_info_->feature_flags().desktop_srgb_support || |
+ gl_version_info().IsAtLeastGL(4, 4)) { |
+ if (enable_srgb && gl_version_info().IsAtLeastGL(4, 4)) { |
+ state_.EnableDisableFramebufferSRGB(enable_srgb); |
+ } |
+ glGenerateMipmapEXT(target); |
+ } else { |
+ state_.EnableDisableFramebufferSRGB(false); |
yunchao
2016/09/19 15:25:47
Here should be true, not false. Otherwise, the srg
yizhou.jiang
2016/09/20 07:00:26
Done.
|
+ if (!InitializeSRGBConverter("generateMipmap")) { |
+ return; |
+ } |
+ srgb_converter_->SRGBGenerateMipmap(this, tex, target); |
+ } |
if (texture_zero_level_set) { |
// This may have some unwanted side effects, but we expect command buffer |