Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder.cc

Issue 2318313004: emulate srgb format for generateMipmap (Closed)
Patch Set: rebase code Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 7994226cc226dc520f10f010cf88e11a1e1147f0..1770676b97c1a866d26d95ae41c95c1e72aa2ff7 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -6111,7 +6111,31 @@ void GLES2DecoderImpl::DoGenerateMipmap(GLenum target) {
}
}
- glGenerateMipmapEXT(target);
+ bool enable_srgb = 0;
+ if (target == GL_TEXTURE_2D) {
+ tex->GetLevelType(target, tex->base_level(), &type, &internal_format);
+ enable_srgb =
+ GetColorEncodingFromInternalFormat(internal_format) == GL_SRGB;
+ }
+ if (!enable_srgb || !feature_info_->feature_flags().desktop_srgb_support ||
+ !workarounds().decode_encode_srgb_for_generatemipmap) {
+ if (feature_info_->feature_flags().desktop_srgb_support) {
+ state_.EnableDisableFramebufferSRGB(enable_srgb);
+ }
+ glGenerateMipmapEXT(target);
+ } else {
+ if (target == GL_TEXTURE_2D) {
+ state_.EnableDisableFramebufferSRGB(true);
+ if (!InitializeSRGBConverter("generateMipmap")) {
+ return;
+ }
+ srgb_converter_->GenerateMipmap(this, tex, target);
+ } else {
+ // TODO(yizhou): If the target is GL_TEXTURE_3D or GL_TEXTURE_2D_ARRAY,
+ // this change can not generate correct mipmap.
+ glGenerateMipmapEXT(target);
+ }
+ }
if (texture_zero_level_set) {
// This may have some unwanted side effects, but we expect command buffer
« no previous file with comments | « content/test/gpu/gpu_tests/webgl2_conformance_expectations.py ('k') | gpu/command_buffer/service/gles2_cmd_srgb_converter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698