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

Unified Diff: gpu/command_buffer/service/in_process_command_buffer.cc

Issue 1385883002: Leave CreateStreamTexture route id out of the GL interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebasing TOT! Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/in_process_command_buffer.h ('k') | gpu/command_buffer/tests/gl_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/in_process_command_buffer.cc
diff --git a/gpu/command_buffer/service/in_process_command_buffer.cc b/gpu/command_buffer/service/in_process_command_buffer.cc
index 3f225423fda2a623f5f310544b5f58409d4946dd..7cb6179dbb14c6e2a16600b64dcc6d46804f877c 100644
--- a/gpu/command_buffer/service/in_process_command_buffer.cc
+++ b/gpu/command_buffer/service/in_process_command_buffer.cc
@@ -951,19 +951,6 @@ void InProcessCommandBuffer::SignalQueryOnGpuThread(
void InProcessCommandBuffer::SetSurfaceVisible(bool visible) {}
-uint32 InProcessCommandBuffer::CreateStreamTexture(uint32 texture_id) {
- base::WaitableEvent completion(true, false);
- uint32 stream_id = 0;
- base::Callback<uint32(void)> task =
- base::Bind(&InProcessCommandBuffer::CreateStreamTextureOnGpuThread,
- base::Unretained(this),
- texture_id);
- QueueTask(
- base::Bind(&RunTaskWithResult<uint32>, task, &stream_id, &completion));
- completion.Wait();
- return stream_id;
-}
-
void InProcessCommandBuffer::SetLock(base::Lock*) {
}
@@ -1082,6 +1069,18 @@ InProcessCommandBuffer::GetSurfaceTexture(uint32 stream_id) {
DCHECK(stream_texture_manager_);
return stream_texture_manager_->GetSurfaceTexture(stream_id);
}
+
+uint32 InProcessCommandBuffer::CreateStreamTexture(uint32 texture_id) {
+ base::WaitableEvent completion(true, false);
+ uint32 stream_id = 0;
+ base::Callback<uint32(void)> task =
+ base::Bind(&InProcessCommandBuffer::CreateStreamTextureOnGpuThread,
+ base::Unretained(this), texture_id);
+ QueueTask(
+ base::Bind(&RunTaskWithResult<uint32>, task, &stream_id, &completion));
+ completion.Wait();
+ return stream_id;
+}
#endif
GpuInProcessThread::GpuInProcessThread(SyncPointManager* sync_point_manager)
« no previous file with comments | « gpu/command_buffer/service/in_process_command_buffer.h ('k') | gpu/command_buffer/tests/gl_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698