| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // A class to emulate GLES2 over command buffers. | 5 // A class to emulate GLES2 over command buffers. |
| 6 | 6 |
| 7 #include "gpu/command_buffer/client/gles2_implementation.h" | 7 #include "gpu/command_buffer/client/gles2_implementation.h" |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <map> | 10 #include <map> |
| (...skipping 3642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3653 GPU_CLIENT_SINGLE_THREAD_CHECK(); | 3653 GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| 3654 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glWaitAsyncTexImage2DCHROMIUM(" | 3654 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glWaitAsyncTexImage2DCHROMIUM(" |
| 3655 << GLES2Util::GetStringTextureTarget(target) << ")"); | 3655 << GLES2Util::GetStringTextureTarget(target) << ")"); |
| 3656 helper_->WaitAsyncTexImage2DCHROMIUM(target); | 3656 helper_->WaitAsyncTexImage2DCHROMIUM(target); |
| 3657 CheckGLError(); | 3657 CheckGLError(); |
| 3658 } | 3658 } |
| 3659 | 3659 |
| 3660 GLuint GLES2Implementation::InsertSyncPointCHROMIUM() { | 3660 GLuint GLES2Implementation::InsertSyncPointCHROMIUM() { |
| 3661 GPU_CLIENT_SINGLE_THREAD_CHECK(); | 3661 GPU_CLIENT_SINGLE_THREAD_CHECK(); |
| 3662 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glInsertSyncPointCHROMIUM"); | 3662 GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glInsertSyncPointCHROMIUM"); |
| 3663 return helper_->InsertSyncPointCHROMIUM(); | 3663 helper_->CommandBufferHelper::Flush(); |
| 3664 return gpu_control_->InsertSyncPoint(); |
| 3664 } | 3665 } |
| 3665 | 3666 |
| 3666 GLuint GLES2Implementation::CreateImageCHROMIUMHelper( | 3667 GLuint GLES2Implementation::CreateImageCHROMIUMHelper( |
| 3667 GLsizei width, GLsizei height, GLenum internalformat) { | 3668 GLsizei width, GLsizei height, GLenum internalformat) { |
| 3668 if (width <= 0) { | 3669 if (width <= 0) { |
| 3669 SetGLError(GL_INVALID_VALUE, "glCreateImageCHROMIUM", "width <= 0"); | 3670 SetGLError(GL_INVALID_VALUE, "glCreateImageCHROMIUM", "width <= 0"); |
| 3670 return 0; | 3671 return 0; |
| 3671 } | 3672 } |
| 3672 | 3673 |
| 3673 if (height <= 0) { | 3674 if (height <= 0) { |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3824 CheckGLError(); | 3825 CheckGLError(); |
| 3825 } | 3826 } |
| 3826 | 3827 |
| 3827 // Include the auto-generated part of this file. We split this because it means | 3828 // Include the auto-generated part of this file. We split this because it means |
| 3828 // we can easily edit the non-auto generated parts right here in this file | 3829 // we can easily edit the non-auto generated parts right here in this file |
| 3829 // instead of having to edit some template or the code generator. | 3830 // instead of having to edit some template or the code generator. |
| 3830 #include "gpu/command_buffer/client/gles2_implementation_impl_autogen.h" | 3831 #include "gpu/command_buffer/client/gles2_implementation_impl_autogen.h" |
| 3831 | 3832 |
| 3832 } // namespace gles2 | 3833 } // namespace gles2 |
| 3833 } // namespace gpu | 3834 } // namespace gpu |
| OLD | NEW |