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

Side by Side Diff: components/mus/gles2/command_buffer_local.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 | « no previous file | components/mus/gles2/command_buffer_local.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 COMPONENTS_MUS_GLES2_COMMAND_BUFFER_LOCAL_H_ 5 #ifndef COMPONENTS_MUS_GLES2_COMMAND_BUFFER_LOCAL_H_
6 #define COMPONENTS_MUS_GLES2_COMMAND_BUFFER_LOCAL_H_ 6 #define COMPONENTS_MUS_GLES2_COMMAND_BUFFER_LOCAL_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 uint32 InsertSyncPoint() override; 64 uint32 InsertSyncPoint() override;
65 uint32 InsertFutureSyncPoint() override; 65 uint32 InsertFutureSyncPoint() override;
66 void RetireSyncPoint(uint32 sync_point) override; 66 void RetireSyncPoint(uint32 sync_point) override;
67 void SignalSyncPoint(uint32 sync_point, 67 void SignalSyncPoint(uint32 sync_point,
68 const base::Closure& callback) override; 68 const base::Closure& callback) override;
69 void SignalQuery(uint32 query, const base::Closure& callback) override; 69 void SignalQuery(uint32 query, const base::Closure& callback) override;
70 void SetSurfaceVisible(bool visible) override; 70 void SetSurfaceVisible(bool visible) override;
71 uint32 CreateStreamTexture(uint32 texture_id) override; 71 uint32 CreateStreamTexture(uint32 texture_id) override;
72 void SetLock(base::Lock*) override; 72 void SetLock(base::Lock*) override;
73 bool IsGpuChannelLost() override; 73 bool IsGpuChannelLost() override;
74 gpu::CommandBufferNamespace GetNamespaceID() const override;
75 uint64_t GetCommandBufferID() const override;
74 76
75 private: 77 private:
76 void PumpCommands(); 78 void PumpCommands();
77 79
78 void OnResize(gfx::Size size, float scale_factor); 80 void OnResize(gfx::Size size, float scale_factor);
79 void OnUpdateVSyncParameters(const base::TimeTicks timebase, 81 void OnUpdateVSyncParameters(const base::TimeTicks timebase,
80 const base::TimeDelta interval); 82 const base::TimeDelta interval);
81 bool OnWaitSyncPoint(uint32_t sync_point); 83 bool OnWaitSyncPoint(uint32_t sync_point);
82 void OnParseError(); 84 void OnParseError();
83 void OnContextLost(uint32_t reason); 85 void OnContextLost(uint32_t reason);
84 void OnSyncPointRetired(); 86 void OnSyncPointRetired();
85 87
86 gfx::AcceleratedWidget widget_; 88 gfx::AcceleratedWidget widget_;
87 scoped_refptr<GpuState> gpu_state_; 89 scoped_refptr<GpuState> gpu_state_;
88 scoped_ptr<gpu::CommandBufferService> command_buffer_; 90 scoped_ptr<gpu::CommandBufferService> command_buffer_;
89 scoped_ptr<gpu::GpuScheduler> scheduler_; 91 scoped_ptr<gpu::GpuScheduler> scheduler_;
90 scoped_ptr<gpu::gles2::GLES2Decoder> decoder_; 92 scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;
91 scoped_refptr<gfx::GLContext> context_; 93 scoped_refptr<gfx::GLContext> context_;
92 scoped_refptr<gfx::GLSurface> surface_; 94 scoped_refptr<gfx::GLSurface> surface_;
93 CommandBufferLocalClient* client_; 95 CommandBufferLocalClient* client_;
94 96
95 base::WeakPtrFactory<CommandBufferLocal> weak_factory_; 97 base::WeakPtrFactory<CommandBufferLocal> weak_factory_;
96 98
97 DISALLOW_COPY_AND_ASSIGN(CommandBufferLocal); 99 DISALLOW_COPY_AND_ASSIGN(CommandBufferLocal);
98 }; 100 };
99 101
100 } // namespace mus 102 } // namespace mus
101 103
102 #endif // COMPONENTS_MUS_GLES2_COMMAND_BUFFER_LOCAL_H_ 104 #endif // COMPONENTS_MUS_GLES2_COMMAND_BUFFER_LOCAL_H_
OLDNEW
« no previous file with comments | « no previous file | components/mus/gles2/command_buffer_local.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698