| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2010, Google Inc. All rights reserved. | 2 * Copyright (c) 2010, Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 800 if (m_multisampleFBO && !m_contentsChangeCommitted) { | 800 if (m_multisampleFBO && !m_contentsChangeCommitted) { |
| 801 m_gl->BindFramebuffer(GL_READ_FRAMEBUFFER_ANGLE, m_multisampleFBO); | 801 m_gl->BindFramebuffer(GL_READ_FRAMEBUFFER_ANGLE, m_multisampleFBO); |
| 802 m_gl->BindFramebuffer(GL_DRAW_FRAMEBUFFER_ANGLE, m_fbo); | 802 m_gl->BindFramebuffer(GL_DRAW_FRAMEBUFFER_ANGLE, m_fbo); |
| 803 | 803 |
| 804 if (m_scissorEnabled) | 804 if (m_scissorEnabled) |
| 805 m_gl->Disable(GL_SCISSOR_TEST); | 805 m_gl->Disable(GL_SCISSOR_TEST); |
| 806 | 806 |
| 807 int width = m_size.width(); | 807 int width = m_size.width(); |
| 808 int height = m_size.height(); | 808 int height = m_size.height(); |
| 809 // Use NEAREST, because there is no scale performed during the blit. | 809 // Use NEAREST, because there is no scale performed during the blit. |
| 810 m_context->blitFramebufferCHROMIUM(0, 0, width, height, 0, 0, width, hei
ght, GL_COLOR_BUFFER_BIT, GL_NEAREST); | 810 m_gl->BlitFramebufferCHROMIUM(0, 0, width, height, 0, 0, width, height,
GL_COLOR_BUFFER_BIT, GL_NEAREST); |
| 811 | 811 |
| 812 if (m_scissorEnabled) | 812 if (m_scissorEnabled) |
| 813 m_gl->Enable(GL_SCISSOR_TEST); | 813 m_gl->Enable(GL_SCISSOR_TEST); |
| 814 } | 814 } |
| 815 | 815 |
| 816 m_gl->BindFramebuffer(GL_FRAMEBUFFER, m_fbo); | 816 m_gl->BindFramebuffer(GL_FRAMEBUFFER, m_fbo); |
| 817 if (m_antiAliasingMode == ScreenSpaceAntialiasing) { | 817 if (m_antiAliasingMode == ScreenSpaceAntialiasing) { |
| 818 m_gl->ApplyScreenSpaceAntialiasingCHROMIUM(); | 818 m_gl->ApplyScreenSpaceAntialiasingCHROMIUM(); |
| 819 } | 819 } |
| 820 m_contentsChangeCommitted = true; | 820 m_contentsChangeCommitted = true; |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1036 | 1036 |
| 1037 if (m_antiAliasingMode == MSAAImplicitResolve) | 1037 if (m_antiAliasingMode == MSAAImplicitResolve) |
| 1038 m_gl->FramebufferTexture2DMultisampleEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACH
MENT0, target, m_colorBuffer.textureId, 0, m_sampleCount); | 1038 m_gl->FramebufferTexture2DMultisampleEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACH
MENT0, target, m_colorBuffer.textureId, 0, m_sampleCount); |
| 1039 else | 1039 else |
| 1040 m_gl->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, target,
m_colorBuffer.textureId, 0); | 1040 m_gl->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, target,
m_colorBuffer.textureId, 0); |
| 1041 | 1041 |
| 1042 m_gl->BindTexture(GL_TEXTURE_2D, m_texture2DBinding); | 1042 m_gl->BindTexture(GL_TEXTURE_2D, m_texture2DBinding); |
| 1043 } | 1043 } |
| 1044 | 1044 |
| 1045 } // namespace blink | 1045 } // namespace blink |
| OLD | NEW |