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

Side by Side Diff: ppapi/proxy/ppapi_command_buffer_proxy.h

Issue 1345813002: Added a unique command buffer ID for command buffers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad merge Created 5 years, 3 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
« no previous file with comments | « mojo/gles2/command_buffer_client_impl.cc ('k') | ppapi/proxy/ppapi_command_buffer_proxy.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_ 5 #ifndef PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_
6 #define PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_ 6 #define PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 12 matching lines...) Expand all
23 namespace proxy { 23 namespace proxy {
24 24
25 class SerializedHandle; 25 class SerializedHandle;
26 26
27 class PPAPI_PROXY_EXPORT PpapiCommandBufferProxy : public gpu::CommandBuffer, 27 class PPAPI_PROXY_EXPORT PpapiCommandBufferProxy : public gpu::CommandBuffer,
28 public gpu::GpuControl { 28 public gpu::GpuControl {
29 public: 29 public:
30 PpapiCommandBufferProxy(const HostResource& resource, 30 PpapiCommandBufferProxy(const HostResource& resource,
31 PluginDispatcher* dispatcher, 31 PluginDispatcher* dispatcher,
32 const gpu::Capabilities& capabilities, 32 const gpu::Capabilities& capabilities,
33 const SerializedHandle& shared_state); 33 const SerializedHandle& shared_state,
34 uint64_t command_buffer_id);
34 ~PpapiCommandBufferProxy() override; 35 ~PpapiCommandBufferProxy() override;
35 36
36 // gpu::CommandBuffer implementation: 37 // gpu::CommandBuffer implementation:
37 bool Initialize() override; 38 bool Initialize() override;
38 State GetLastState() override; 39 State GetLastState() override;
39 int32 GetLastToken() override; 40 int32 GetLastToken() override;
40 void Flush(int32 put_offset) override; 41 void Flush(int32 put_offset) override;
41 void OrderingBarrier(int32 put_offset) override; 42 void OrderingBarrier(int32 put_offset) override;
42 void WaitForTokenInRange(int32 start, int32 end) override; 43 void WaitForTokenInRange(int32 start, int32 end) override;
43 void WaitForGetOffsetInRange(int32 start, int32 end) override; 44 void WaitForGetOffsetInRange(int32 start, int32 end) override;
(...skipping 16 matching lines...) Expand all
60 uint32 InsertSyncPoint() override; 61 uint32 InsertSyncPoint() override;
61 uint32 InsertFutureSyncPoint() override; 62 uint32 InsertFutureSyncPoint() override;
62 void RetireSyncPoint(uint32 sync_point) override; 63 void RetireSyncPoint(uint32 sync_point) override;
63 void SignalSyncPoint(uint32 sync_point, 64 void SignalSyncPoint(uint32 sync_point,
64 const base::Closure& callback) override; 65 const base::Closure& callback) override;
65 void SignalQuery(uint32 query, const base::Closure& callback) override; 66 void SignalQuery(uint32 query, const base::Closure& callback) override;
66 void SetSurfaceVisible(bool visible) override; 67 void SetSurfaceVisible(bool visible) override;
67 uint32 CreateStreamTexture(uint32 texture_id) override; 68 uint32 CreateStreamTexture(uint32 texture_id) override;
68 void SetLock(base::Lock*) override; 69 void SetLock(base::Lock*) override;
69 bool IsGpuChannelLost() override; 70 bool IsGpuChannelLost() override;
71 gpu::CommandBufferNamespace GetNamespaceID() const override;
72 uint64_t GetCommandBufferID() const override;
70 73
71 private: 74 private:
72 bool Send(IPC::Message* msg); 75 bool Send(IPC::Message* msg);
73 void UpdateState(const gpu::CommandBuffer::State& state, bool success); 76 void UpdateState(const gpu::CommandBuffer::State& state, bool success);
74 77
75 // Try to read an updated copy of the state from shared memory. 78 // Try to read an updated copy of the state from shared memory.
76 void TryUpdateState(); 79 void TryUpdateState();
77 80
78 // The shared memory area used to update state. 81 // The shared memory area used to update state.
79 gpu::CommandBufferSharedState* shared_state() const; 82 gpu::CommandBufferSharedState* shared_state() const;
80 83
81 void FlushInternal(); 84 void FlushInternal();
82 85
86 const uint64_t command_buffer_id_;
87
83 gpu::Capabilities capabilities_; 88 gpu::Capabilities capabilities_;
84 State last_state_; 89 State last_state_;
85 scoped_ptr<base::SharedMemory> shared_state_shm_; 90 scoped_ptr<base::SharedMemory> shared_state_shm_;
86 91
87 HostResource resource_; 92 HostResource resource_;
88 PluginDispatcher* dispatcher_; 93 PluginDispatcher* dispatcher_;
89 94
90 base::Closure channel_error_callback_; 95 base::Closure channel_error_callback_;
91 96
92 InstanceData::FlushInfo *flush_info_; 97 InstanceData::FlushInfo *flush_info_;
93 98
94 DISALLOW_COPY_AND_ASSIGN(PpapiCommandBufferProxy); 99 DISALLOW_COPY_AND_ASSIGN(PpapiCommandBufferProxy);
95 }; 100 };
96 101
97 } // namespace proxy 102 } // namespace proxy
98 } // namespace ppapi 103 } // namespace ppapi
99 104
100 #endif // PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_ 105 #endif // PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_
OLDNEW
« no previous file with comments | « mojo/gles2/command_buffer_client_impl.cc ('k') | ppapi/proxy/ppapi_command_buffer_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698