| Index: gpu/command_buffer/service/in_process_command_buffer.h
|
| diff --git a/gpu/command_buffer/service/in_process_command_buffer.h b/gpu/command_buffer/service/in_process_command_buffer.h
|
| index 65cf1ec92fb81fc13ef6fbbe74c8dddbcd05e67f..ec06ecd63a3fe46a2de2baf49a95f2d873e5dcbb 100644
|
| --- a/gpu/command_buffer/service/in_process_command_buffer.h
|
| +++ b/gpu/command_buffer/service/in_process_command_buffer.h
|
| @@ -64,7 +64,7 @@ class GPU_EXPORT InProcessCommandBuffer : public CommandBuffer,
|
| public:
|
| class Service;
|
| explicit InProcessCommandBuffer(const scoped_refptr<Service>& service);
|
| - virtual ~InProcessCommandBuffer();
|
| + ~InProcessCommandBuffer() override;
|
|
|
| // If |surface| is not NULL, use it directly; in this case, the command
|
| // buffer gpu thread must be the same as the client thread. Otherwise create
|
| @@ -80,38 +80,37 @@ class GPU_EXPORT InProcessCommandBuffer : public CommandBuffer,
|
| void Destroy();
|
|
|
| // CommandBuffer implementation:
|
| - virtual bool Initialize() override;
|
| - virtual State GetLastState() override;
|
| - virtual int32 GetLastToken() override;
|
| - virtual void Flush(int32 put_offset) override;
|
| - virtual void WaitForTokenInRange(int32 start, int32 end) override;
|
| - virtual void WaitForGetOffsetInRange(int32 start, int32 end) override;
|
| - virtual void SetGetBuffer(int32 shm_id) override;
|
| - virtual scoped_refptr<gpu::Buffer> CreateTransferBuffer(size_t size,
|
| - int32* id) override;
|
| - virtual void DestroyTransferBuffer(int32 id) override;
|
| - virtual gpu::error::Error GetLastError() override;
|
| + bool Initialize() override;
|
| + State GetLastState() override;
|
| + int32 GetLastToken() override;
|
| + void Flush(int32 put_offset) override;
|
| + void WaitForTokenInRange(int32 start, int32 end) override;
|
| + void WaitForGetOffsetInRange(int32 start, int32 end) override;
|
| + void SetGetBuffer(int32 shm_id) override;
|
| + scoped_refptr<gpu::Buffer> CreateTransferBuffer(size_t size,
|
| + int32* id) override;
|
| + void DestroyTransferBuffer(int32 id) override;
|
| + gpu::error::Error GetLastError() override;
|
|
|
| // GpuControl implementation:
|
| - virtual gpu::Capabilities GetCapabilities() override;
|
| - virtual int32 CreateImage(ClientBuffer buffer,
|
| - size_t width,
|
| - size_t height,
|
| - unsigned internalformat) override;
|
| - virtual void DestroyImage(int32 id) override;
|
| - virtual int32 CreateGpuMemoryBufferImage(size_t width,
|
| - size_t height,
|
| - unsigned internalformat,
|
| - unsigned usage) override;
|
| - virtual uint32 InsertSyncPoint() override;
|
| - virtual uint32 InsertFutureSyncPoint() override;
|
| - virtual void RetireSyncPoint(uint32 sync_point) override;
|
| - virtual void SignalSyncPoint(uint32 sync_point,
|
| - const base::Closure& callback) override;
|
| - virtual void SignalQuery(uint32 query_id,
|
| - const base::Closure& callback) override;
|
| - virtual void SetSurfaceVisible(bool visible) override;
|
| - virtual uint32 CreateStreamTexture(uint32 texture_id) override;
|
| + gpu::Capabilities GetCapabilities() override;
|
| + int32 CreateImage(ClientBuffer buffer,
|
| + size_t width,
|
| + size_t height,
|
| + unsigned internalformat) override;
|
| + void DestroyImage(int32 id) override;
|
| + int32 CreateGpuMemoryBufferImage(size_t width,
|
| + size_t height,
|
| + unsigned internalformat,
|
| + unsigned usage) override;
|
| + uint32 InsertSyncPoint() override;
|
| + uint32 InsertFutureSyncPoint() override;
|
| + void RetireSyncPoint(uint32 sync_point) override;
|
| + void SignalSyncPoint(uint32 sync_point,
|
| + const base::Closure& callback) override;
|
| + void SignalQuery(uint32 query_id, const base::Closure& callback) override;
|
| + void SetSurfaceVisible(bool visible) override;
|
| + uint32 CreateStreamTexture(uint32 texture_id) override;
|
|
|
| // The serializer interface to the GPU service (i.e. thread).
|
| class Service {
|
|
|