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

Side by Side Diff: gpu/command_buffer/client/gles2_implementation.cc

Issue 7538008: Delete copy_texture_to_parent_texture from GPU command buffer code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "../client/gles2_implementation.h" 7 #include "../client/gles2_implementation.h"
8 8
9 #include <GLES2/gl2ext.h> 9 #include <GLES2/gl2ext.h>
10 #include <GLES2/gles2_command_buffer.h> 10 #include <GLES2/gles2_command_buffer.h>
(...skipping 825 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 swap_buffers_tokens_.push(helper_->InsertToken()); 836 swap_buffers_tokens_.push(helper_->InsertToken());
837 helper_->SwapBuffers(); 837 helper_->SwapBuffers();
838 helper_->CommandBufferHelper::Flush(); 838 helper_->CommandBufferHelper::Flush();
839 // Wait if we added too many swap buffers. 839 // Wait if we added too many swap buffers.
840 if (swap_buffers_tokens_.size() > kMaxSwapBuffers) { 840 if (swap_buffers_tokens_.size() > kMaxSwapBuffers) {
841 helper_->WaitForToken(swap_buffers_tokens_.front()); 841 helper_->WaitForToken(swap_buffers_tokens_.front());
842 swap_buffers_tokens_.pop(); 842 swap_buffers_tokens_.pop();
843 } 843 }
844 } 844 }
845 845
846 void GLES2Implementation::CopyTextureToParentTextureCHROMIUM(
847 GLuint client_child_id, GLuint client_parent_id) {
848 GPU_CLIENT_LOG("[" << this << "] glCopyTextureToParentTextureCHROMIUM("
849 << client_child_id << ", "
850 << client_parent_id << ")");
851 helper_->CopyTextureToParentTextureCHROMIUM(client_child_id,
852 client_parent_id);
853 }
854
855 void GLES2Implementation::GenSharedIdsCHROMIUM( 846 void GLES2Implementation::GenSharedIdsCHROMIUM(
856 GLuint namespace_id, GLuint id_offset, GLsizei n, GLuint* ids) { 847 GLuint namespace_id, GLuint id_offset, GLsizei n, GLuint* ids) {
857 GPU_CLIENT_LOG("[" << this << "] glGenSharedIdsCHROMIUMTextures(" 848 GPU_CLIENT_LOG("[" << this << "] glGenSharedIdsCHROMIUMTextures("
858 << namespace_id << ", " << id_offset << ", " << n << ", " << 849 << namespace_id << ", " << id_offset << ", " << n << ", " <<
859 static_cast<void*>(ids) << ")"); 850 static_cast<void*>(ids) << ")");
860 GPU_CLIENT_LOG_CODE_BLOCK({ 851 GPU_CLIENT_LOG_CODE_BLOCK({
861 for (GLsizei i = 0; i < n; ++i) { 852 for (GLsizei i = 0; i < n; ++i) {
862 GPU_CLIENT_LOG(" " << i << ": " << ids[i]); 853 GPU_CLIENT_LOG(" " << i << ": " << ids[i]);
863 } 854 }
864 }); 855 });
(...skipping 1495 matching lines...) Expand 10 before | Expand all | Expand 10 after
2360 if (static_cast<size_t>(bufsize) < result.size()) { 2351 if (static_cast<size_t>(bufsize) < result.size()) {
2361 SetGLError(GL_INVALID_OPERATION, 2352 SetGLError(GL_INVALID_OPERATION,
2362 "glProgramInfoCHROMIUM: bufsize is too small for result."); 2353 "glProgramInfoCHROMIUM: bufsize is too small for result.");
2363 return; 2354 return;
2364 } 2355 }
2365 memcpy(info, &result[0], result.size()); 2356 memcpy(info, &result[0], result.size());
2366 } 2357 }
2367 2358
2368 } // namespace gles2 2359 } // namespace gles2
2369 } // namespace gpu 2360 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698