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

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder.cc

Issue 12210129: gpu: Add the ability to wait on upload completion. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added entry point for waiting. Rebased and added test. Created 7 years, 9 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
OLDNEW
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 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
6 6
7 #include <stdio.h> 7 #include <stdio.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <list> 10 #include <list>
(...skipping 10152 matching lines...) Expand 10 before | Expand all | Expand 10 after
10163 10163
10164 gfx::AsyncTexSubImage2DParams tex_params = {target, level, xoffset, yoffset, 10164 gfx::AsyncTexSubImage2DParams tex_params = {target, level, xoffset, yoffset,
10165 width, height, format, type}; 10165 width, height, format, type};
10166 gfx::AsyncMemoryParams mem_params = {shared_memory, shm_size, 10166 gfx::AsyncMemoryParams mem_params = {shared_memory, shm_size,
10167 shm_data_offset, shm_data_size}; 10167 shm_data_offset, shm_data_size};
10168 async_pixel_transfer_delegate_->AsyncTexSubImage2D( 10168 async_pixel_transfer_delegate_->AsyncTexSubImage2D(
10169 info->GetAsyncTransferState(), tex_params, mem_params); 10169 info->GetAsyncTransferState(), tex_params, mem_params);
10170 return error::kNoError; 10170 return error::kNoError;
10171 } 10171 }
10172 10172
10173 error::Error GLES2DecoderImpl::HandleWaitAsyncTexImage2DCHROMIUM(
reveman 2013/03/04 06:10:57 The android impl can do what it's currently doing
10174 uint32 immediate_data_size, const gles2::WaitAsyncTexImage2DCHROMIUM& c) {
10175 TRACE_EVENT0("gpu", "GLES2DecoderImpl::HandleWaitAsyncTexImage2DCHROMIUM");
10176 GLenum target = static_cast<GLenum>(c.target);
10177
10178 if (!validators_->texture_target.IsValid(target)) {
10179 SetGLError(
10180 GL_INVALID_ENUM, "glWaitAsyncTexImage2DCHROMIUM", "target");
10181 return error::kNoError;
10182 }
10183
10184 async_pixel_transfer_delegate_->WaitOnUploadCompletion();
10185 return error::kNoError;
10186 }
10187
10173 // Include the auto-generated part of this file. We split this because it means 10188 // Include the auto-generated part of this file. We split this because it means
10174 // we can easily edit the non-auto generated parts right here in this file 10189 // we can easily edit the non-auto generated parts right here in this file
10175 // instead of having to edit some template or the code generator. 10190 // instead of having to edit some template or the code generator.
10176 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" 10191 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
10177 10192
10178 } // namespace gles2 10193 } // namespace gles2
10179 } // namespace gpu 10194 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698