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

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

Issue 2246823002: Disable FRAMEBUFFER_SRGB when restoring from a null context state (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix gl_tests on windows Created 4 years, 4 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 68b894846bb0ff89ffbdd837869f1f4f0492aaf6..b12db7267519ea5ac43cd3d2ec05d2624723faa0 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -4232,7 +4232,8 @@ bool GLES2DecoderImpl::CheckBoundDrawFramebufferValid(const char* func_name) {
// behave correctly.
bool enable_framebuffer_srgb =
framebuffer && framebuffer->HasSRGBAttachments();
- state_.EnableDisableFramebufferSRGB(enable_framebuffer_srgb);
+ state_.EnableDisableFramebufferSRGB(enable_framebuffer_srgb ?
+ FRAMEBUFFER_SRGB_ENABLED : FRAMEBUFFER_SRGB_DISABLED);
}
return valid;
}
@@ -4264,7 +4265,8 @@ bool GLES2DecoderImpl::CheckBoundFramebufferValid(const char* func_name) {
bool enable_framebuffer_srgb =
(draw_framebuffer && draw_framebuffer->HasSRGBAttachments()) ||
(read_framebuffer && read_framebuffer->HasSRGBAttachments());
- state_.EnableDisableFramebufferSRGB(enable_framebuffer_srgb);
+ state_.EnableDisableFramebufferSRGB(enable_framebuffer_srgb ?
+ FRAMEBUFFER_SRGB_ENABLED : FRAMEBUFFER_SRGB_DISABLED);
}
return valid;
« gpu/command_buffer/service/context_state.h ('K') | « gpu/command_buffer/service/context_state.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698