| 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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 } | 279 } |
| 280 } else { | 280 } else { |
| 281 m_gl->CopyTextureCHROMIUM(m_colorBuffer.textureId, frontColorBufferMailb
ox->textureInfo.textureId, frontColorBufferMailbox->textureInfo.parameters.inter
nalColorFormat, GL_UNSIGNED_BYTE, GL_FALSE, GL_FALSE, GL_FALSE); | 281 m_gl->CopyTextureCHROMIUM(m_colorBuffer.textureId, frontColorBufferMailb
ox->textureInfo.textureId, frontColorBufferMailbox->textureInfo.parameters.inter
nalColorFormat, GL_UNSIGNED_BYTE, GL_FALSE, GL_FALSE, GL_FALSE); |
| 282 } | 282 } |
| 283 | 283 |
| 284 restoreFramebufferBindings(); | 284 restoreFramebufferBindings(); |
| 285 m_contentsChanged = false; | 285 m_contentsChanged = false; |
| 286 | 286 |
| 287 m_gl->ProduceTextureDirectCHROMIUM(frontColorBufferMailbox->textureInfo.text
ureId, frontColorBufferMailbox->textureInfo.parameters.target, frontColorBufferM
ailbox->mailbox.name); | 287 m_gl->ProduceTextureDirectCHROMIUM(frontColorBufferMailbox->textureInfo.text
ureId, frontColorBufferMailbox->textureInfo.parameters.target, frontColorBufferM
ailbox->mailbox.name); |
| 288 const GLuint64 fenceSync = m_gl->InsertFenceSyncCHROMIUM(); | 288 const GLuint64 fenceSync = m_gl->InsertFenceSyncCHROMIUM(); |
| 289 if (RuntimeEnabledFeatures::webGLImageChromiumEnabled()) | |
| 290 m_gl->DescheduleUntilFinishedCHROMIUM(); | |
| 291 m_gl->Flush(); | 289 m_gl->Flush(); |
| 292 m_gl->GenSyncTokenCHROMIUM(fenceSync, frontColorBufferMailbox->mailbox.syncT
oken); | 290 m_gl->GenSyncTokenCHROMIUM(fenceSync, frontColorBufferMailbox->mailbox.syncT
oken); |
| 293 frontColorBufferMailbox->mailbox.validSyncToken = true; | 291 frontColorBufferMailbox->mailbox.validSyncToken = true; |
| 294 frontColorBufferMailbox->mailbox.allowOverlay = frontColorBufferMailbox->tex
tureInfo.imageId != 0; | 292 frontColorBufferMailbox->mailbox.allowOverlay = frontColorBufferMailbox->tex
tureInfo.imageId != 0; |
| 295 frontColorBufferMailbox->mailbox.textureTarget = frontColorBufferMailbox->te
xtureInfo.parameters.target; | 293 frontColorBufferMailbox->mailbox.textureTarget = frontColorBufferMailbox->te
xtureInfo.parameters.target; |
| 296 frontColorBufferMailbox->mailbox.textureSize = WebSize(m_size.width(), m_siz
e.height()); | 294 frontColorBufferMailbox->mailbox.textureSize = WebSize(m_size.width(), m_siz
e.height()); |
| 297 setBufferClearNeeded(true); | 295 setBufferClearNeeded(true); |
| 298 | 296 |
| 299 // set m_parentDrawingBuffer to make sure 'this' stays alive as long as it h
as live mailboxes | 297 // set m_parentDrawingBuffer to make sure 'this' stays alive as long as it h
as live mailboxes |
| 300 ASSERT(!frontColorBufferMailbox->m_parentDrawingBuffer); | 298 ASSERT(!frontColorBufferMailbox->m_parentDrawingBuffer); |
| (...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1068 | 1066 |
| 1069 void DrawingBuffer::restoreTextureBindings() | 1067 void DrawingBuffer::restoreTextureBindings() |
| 1070 { | 1068 { |
| 1071 // This class potentially modifies the bindings for GL_TEXTURE_2D and | 1069 // This class potentially modifies the bindings for GL_TEXTURE_2D and |
| 1072 // GL_TEXTURE_RECTANGLE. Only GL_TEXTURE_2D needs to be restored since | 1070 // GL_TEXTURE_RECTANGLE. Only GL_TEXTURE_2D needs to be restored since |
| 1073 // the public interface for WebGL does not support GL_TEXTURE_RECTANGLE. | 1071 // the public interface for WebGL does not support GL_TEXTURE_RECTANGLE. |
| 1074 m_gl->BindTexture(GL_TEXTURE_2D, m_texture2DBinding); | 1072 m_gl->BindTexture(GL_TEXTURE_2D, m_texture2DBinding); |
| 1075 } | 1073 } |
| 1076 | 1074 |
| 1077 } // namespace blink | 1075 } // namespace blink |
| OLD | NEW |