diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 16:41:18 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 16:41:18 +0000 |
| commit | 8c3e6878dc50e7ab2ee9ba53757d54b73897fd12 (patch) | |
| tree | 053a213ed30463f64e3b0f71b04df22891a4fd30 /gpu | |
| parent | 25e18f853986d17f3a8492c587451cff9d61d3b1 (diff) | |
| download | chromium_src-8c3e6878dc50e7ab2ee9ba53757d54b73897fd12.zip chromium_src-8c3e6878dc50e7ab2ee9ba53757d54b73897fd12.tar.gz chromium_src-8c3e6878dc50e7ab2ee9ba53757d54b73897fd12.tar.bz2 | |
Disable scissor test during multisample resolve.
If the scissor is enabled during a blit, it throws a GL error.
BUG=60379
TEST=open test in bug report, verify no crash
Review URL: http://codereview.chromium.org/4202002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64081 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index db44669..94a6e04 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -1453,6 +1453,7 @@ ScopedResolvedFrameBufferBinder::ScopedResolvedFrameBufferBinder( decoder_->offscreen_saved_frame_buffer_->id()); const int width = decoder_->offscreen_size_.width(); const int height = decoder_->offscreen_size_.height(); + glDisable(GL_SCISSOR_TEST); if (IsAngle()) { glBlitFramebufferANGLE(0, 0, width, height, 0, 0, width, height, GL_COLOR_BUFFER_BIT, GL_NEAREST); @@ -1470,6 +1471,9 @@ ScopedResolvedFrameBufferBinder::~ScopedResolvedFrameBufferBinder() { ScopedGLErrorSuppressor suppressor(decoder_); decoder_->RestoreCurrentFramebufferBindings(); + if (decoder_->enable_scissor_test_) { + glEnable(GL_SCISSOR_TEST); + } } Texture::Texture(GLES2DecoderImpl* decoder) |