diff options
Diffstat (limited to 'gpu/command_buffer/service/gpu_scheduler.h')
| -rw-r--r-- | gpu/command_buffer/service/gpu_scheduler.h | 133 |
1 files changed, 15 insertions, 118 deletions
diff --git a/gpu/command_buffer/service/gpu_scheduler.h b/gpu/command_buffer/service/gpu_scheduler.h index 72ffe26..32b072c 100644 --- a/gpu/command_buffer/service/gpu_scheduler.h +++ b/gpu/command_buffer/service/gpu_scheduler.h @@ -5,77 +5,29 @@ #ifndef GPU_COMMAND_BUFFER_SERVICE_GPU_SCHEDULER_H_ #define GPU_COMMAND_BUFFER_SERVICE_GPU_SCHEDULER_H_ -#include <map> -#include <queue> -#include <vector> - #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" -#include "base/task.h" #include "gpu/command_buffer/common/command_buffer.h" #include "gpu/command_buffer/service/cmd_buffer_engine.h" #include "gpu/command_buffer/service/cmd_parser.h" #include "gpu/command_buffer/service/gles2_cmd_decoder.h" -#include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" -#include "ui/gfx/surface/transport_dib.h" - -#if defined(OS_MACOSX) -#include "ui/gfx/surface/accelerated_surface_mac.h" -#endif - -namespace gfx { -class GLContext; -class GLShareGroup; -class GLSurface; -} namespace gpu { -namespace gles2 { -class ContextGroup; -} -// This class processes commands in a command buffer. It is event driven and -// posts tasks to the current message loop to do additional work. +// This class schedules commands that have been flushed. They are received via +// a command buffer and forwarded to a command parser. TODO(apatrick): This +// class should not know about the decoder. Do not add additional dependencies +// on it. class GpuScheduler : public CommandBufferEngine { public: - // If a group is not passed in one will be created. - static GpuScheduler* Create(CommandBuffer* command_buffer, - gles2::ContextGroup* group); - - // This constructor is for unit tests. - static GpuScheduler* CreateForTests(CommandBuffer* command_buffer, - gles2::GLES2Decoder* decoder, - CommandParser* parser); + GpuScheduler(CommandBuffer* command_buffer, + gles2::GLES2Decoder* decoder, + CommandParser* parser); virtual ~GpuScheduler(); - // Platform specific code to create GLContexts and GLSurfaces that are - // handed off to the next function. - bool Initialize(gfx::PluginWindowHandle hwnd, - const gfx::Size& size, - bool software, - const gles2::DisallowedExtensions& disallowed_extensions, - const char* allowed_extensions, - const std::vector<int32>& attribs, - gfx::GLShareGroup* share_group); - - // Takes ownership of GLSurface and GLContext. - bool InitializeCommon( - const scoped_refptr<gfx::GLSurface>& surface, - const scoped_refptr<gfx::GLContext>& context, - const gfx::Size& size, - const gles2::DisallowedExtensions& disallowed_extensions, - const char* allowed_extensions, - const std::vector<int32>& attribs); - - void Destroy(); - void DestroyCommon(); - - bool SetParent(GpuScheduler* parent_scheduler, uint32 parent_texture_id); - void PutChanged(); // Sets whether commands should be processed by this scheduler. Setting to @@ -97,84 +49,29 @@ class GpuScheduler : public CommandBufferEngine { virtual bool SetGetOffset(int32 offset); virtual int32 GetGetOffset(); -#if defined(OS_MACOSX) - // To prevent the GPU process from overloading the browser process, - // we need to track the number of swap buffers calls issued and - // acknowledged per on-screen context, and keep the GPU from getting - // too far ahead of the browser. Note that this - // is also predicated on a flow control mechanism between the - // renderer and GPU processes. - uint64 swap_buffers_count() const; - uint64 acknowledged_swap_buffers_count() const; - void set_acknowledged_swap_buffers_count( - uint64 acknowledged_swap_buffers_count); - - // Needed only on Mac OS X, which does not render into an on-screen - // window and therefore requires the backing store to be resized - // manually. Returns an opaque identifier for the new backing store. - // There are two versions of this method: one for use with the IOSurface - // available in Mac OS X 10.6; and, one for use with the - // TransportDIB-based version used on Mac OS X 10.5. - virtual uint64 SetWindowSizeForIOSurface(const gfx::Size& size); - virtual TransportDIB::Handle SetWindowSizeForTransportDIB( - const gfx::Size& size); - virtual void SetTransportDIBAllocAndFree( - Callback2<size_t, TransportDIB::Handle*>::Type* allocator, - Callback1<TransportDIB::Id>::Type* deallocator); - // Returns the id of the current surface that is being rendered to - // (or 0 if no such surface has been created). - virtual uint64 GetSurfaceId(); - - void DidDestroySurface(); - - // Sets a callback which is called when a SwapBuffers command is processed. - // Must be called after Initialize(). - // It is not defined on which thread this callback is called. - void SetSwapBuffersCallback(Callback0::Type* callback); -#endif - - // Sets a callback that is called when a glResizeCHROMIUM command - // is processed. - void SetResizeCallback(Callback1<gfx::Size>::Type* callback); - void SetCommandProcessedCallback(Callback0::Type* callback); - // Get the GLES2Decoder associated with this scheduler. - gles2::GLES2Decoder* decoder() const { return decoder_.get(); } - private: - // If a group is not passed in one will be created. - GpuScheduler(CommandBuffer* command_buffer, - gles2::GLES2Decoder* decoder, - CommandParser* parser); - -#if defined(OS_MACOSX) - // Called via a callback just before we are supposed to call the - // user's swap buffers callback. - void WillSwapBuffers(); -#endif // The GpuScheduler holds a weak reference to the CommandBuffer. The // CommandBuffer owns the GpuScheduler and holds a strong reference to it // through the ProcessCommands callback. CommandBuffer* command_buffer_; - scoped_ptr<gles2::GLES2Decoder> decoder_; + // Does not own decoder. TODO(apatrick): The GpuScheduler shouldn't need a + // pointer to the decoder, it is only used to initialize the CommandParser, + // which could be an argument to the constructor, and to determine the + // reason for context lost. + gles2::GLES2Decoder* decoder_; + + // TODO(apatrick): The GpuScheduler currently creates and owns the parser. + // This should be an argument to the constructor. scoped_ptr<CommandParser> parser_; // Greater than zero if this is waiting to be rescheduled before continuing. int unscheduled_count_; scoped_ptr<Callback0::Type> scheduled_callback_; - -#if defined(OS_MACOSX) - uint64 swap_buffers_count_; - uint64 acknowledged_swap_buffers_count_; - scoped_ptr<AcceleratedSurface> surface_; - scoped_ptr<Callback0::Type> wrapped_swap_buffers_callback_; -#endif - - ScopedRunnableMethodFactory<GpuScheduler> method_factory_; scoped_ptr<Callback0::Type> command_processed_callback_; }; |