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

Side by Side Diff: content/renderer/pepper/ppb_graphics_3d_impl.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
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 CONTENT_RENDERER_PEPPER_PPB_GRAPHICS_3D_IMPL_H_ 5 #ifndef CONTENT_RENDERER_PEPPER_PPB_GRAPHICS_3D_IMPL_H_
6 #define CONTENT_RENDERER_PEPPER_PPB_GRAPHICS_3D_IMPL_H_ 6 #define CONTENT_RENDERER_PEPPER_PPB_GRAPHICS_3D_IMPL_H_
7 7
8 #include "base/memory/shared_memory.h" 8 #include "base/memory/shared_memory.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "gpu/command_buffer/common/mailbox.h" 10 #include "gpu/command_buffer/common/mailbox.h"
(...skipping 11 matching lines...) Expand all
22 class PPB_Graphics3D_Impl : public ppapi::PPB_Graphics3D_Shared { 22 class PPB_Graphics3D_Impl : public ppapi::PPB_Graphics3D_Shared {
23 public: 23 public:
24 static PP_Resource Create(PP_Instance instance, 24 static PP_Resource Create(PP_Instance instance,
25 PP_Resource share_context, 25 PP_Resource share_context,
26 const int32_t* attrib_list); 26 const int32_t* attrib_list);
27 static PP_Resource CreateRaw( 27 static PP_Resource CreateRaw(
28 PP_Instance instance, 28 PP_Instance instance,
29 PP_Resource share_context, 29 PP_Resource share_context,
30 const int32_t* attrib_list, 30 const int32_t* attrib_list,
31 gpu::Capabilities* capabilities, 31 gpu::Capabilities* capabilities,
32 base::SharedMemoryHandle* shared_state_handle); 32 base::SharedMemoryHandle* shared_state_handle,
33 uint64_t* command_buffer_id);
33 34
34 // PPB_Graphics3D_API trusted implementation. 35 // PPB_Graphics3D_API trusted implementation.
35 PP_Bool SetGetBuffer(int32_t transfer_buffer_id) override; 36 PP_Bool SetGetBuffer(int32_t transfer_buffer_id) override;
36 scoped_refptr<gpu::Buffer> CreateTransferBuffer(uint32_t size, 37 scoped_refptr<gpu::Buffer> CreateTransferBuffer(uint32_t size,
37 int32* id) override; 38 int32* id) override;
38 PP_Bool DestroyTransferBuffer(int32_t id) override; 39 PP_Bool DestroyTransferBuffer(int32_t id) override;
39 PP_Bool Flush(int32_t put_offset) override; 40 PP_Bool Flush(int32_t put_offset) override;
40 gpu::CommandBuffer::State WaitForTokenInRange(int32_t start, 41 gpu::CommandBuffer::State WaitForTokenInRange(int32_t start,
41 int32_t end) override; 42 int32_t end) override;
42 gpu::CommandBuffer::State WaitForGetOffsetInRange(int32_t start, 43 gpu::CommandBuffer::State WaitForGetOffsetInRange(int32_t start,
(...skipping 29 matching lines...) Expand all
72 gpu::GpuControl* GetGpuControl() override; 73 gpu::GpuControl* GetGpuControl() override;
73 int32 DoSwapBuffers() override; 74 int32 DoSwapBuffers() override;
74 75
75 private: 76 private:
76 explicit PPB_Graphics3D_Impl(PP_Instance instance); 77 explicit PPB_Graphics3D_Impl(PP_Instance instance);
77 78
78 bool Init(PPB_Graphics3D_API* share_context, const int32_t* attrib_list); 79 bool Init(PPB_Graphics3D_API* share_context, const int32_t* attrib_list);
79 bool InitRaw(PPB_Graphics3D_API* share_context, 80 bool InitRaw(PPB_Graphics3D_API* share_context,
80 const int32_t* attrib_list, 81 const int32_t* attrib_list,
81 gpu::Capabilities* capabilities, 82 gpu::Capabilities* capabilities,
82 base::SharedMemoryHandle* shared_state_handle); 83 base::SharedMemoryHandle* shared_state_handle,
84 uint64_t* command_buffer_id);
83 85
84 // Notifications received from the GPU process. 86 // Notifications received from the GPU process.
85 void OnSwapBuffers(); 87 void OnSwapBuffers();
86 void OnContextLost(); 88 void OnContextLost();
87 void OnConsoleMessage(const std::string& msg, int id); 89 void OnConsoleMessage(const std::string& msg, int id);
88 // Notifications sent to plugin. 90 // Notifications sent to plugin.
89 void SendContextLost(); 91 void SendContextLost();
90 92
91 // True if context is bound to instance. 93 // True if context is bound to instance.
92 bool bound_to_instance_; 94 bool bound_to_instance_;
93 // True when waiting for compositor to commit our backing texture. 95 // True when waiting for compositor to commit our backing texture.
94 bool commit_pending_; 96 bool commit_pending_;
95 97
96 gpu::Mailbox mailbox_; 98 gpu::Mailbox mailbox_;
97 uint32 sync_point_; 99 uint32 sync_point_;
98 bool has_alpha_; 100 bool has_alpha_;
99 scoped_refptr<GpuChannelHost> channel_; 101 scoped_refptr<GpuChannelHost> channel_;
100 scoped_ptr<CommandBufferProxyImpl> command_buffer_; 102 scoped_ptr<CommandBufferProxyImpl> command_buffer_;
101 103
102 base::WeakPtrFactory<PPB_Graphics3D_Impl> weak_ptr_factory_; 104 base::WeakPtrFactory<PPB_Graphics3D_Impl> weak_ptr_factory_;
103 105
104 DISALLOW_COPY_AND_ASSIGN(PPB_Graphics3D_Impl); 106 DISALLOW_COPY_AND_ASSIGN(PPB_Graphics3D_Impl);
105 }; 107 };
106 108
107 } // namespace content 109 } // namespace content
108 110
109 #endif // CONTENT_RENDERER_PEPPER_PPB_GRAPHICS_3D_IMPL_H_ 111 #endif // CONTENT_RENDERER_PEPPER_PPB_GRAPHICS_3D_IMPL_H_
OLDNEW
« no previous file with comments | « content/common/gpu/gpu_command_buffer_stub.cc ('k') | content/renderer/pepper/ppb_graphics_3d_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698