Changes the GLES2Implementation to use a RingBuffer...

gpu/command_buffer/client/gles2_implementation.h

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
 #define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
 
 #include <map>
 #include <string>
 #include <vector>
 #include "../common/gles2_cmd_utils.h"
 #include "../common/scoped_ptr.h"
 #include "../client/gles2_cmd_helper.h"
 #include "../client/id_allocator.h"
-#include "../client/fenced_allocator.h"
+#include "../client/ring_buffer.h"
 
 #define GLES2_SUPPORT_CLIENT_SIDE_BUFFERS 1
 
 namespace gpu {
 namespace gles2 {
 
 class ClientSideBufferHelper;
 
 // This class emulates GLES2 over command buffers. It can be used by a client
 // program so that the program does not need deal with shared memory and command
@@ skipping 106 matching lines @@
 
     GLuint MakeTextureId() {
       return texture_id_allocator_.AllocateID();
     }
 
     void FreeTextureId(GLuint id) {
       texture_id_allocator_.FreeID(id);
     }
 
  private:
-  // Wraps FencedAllocatorWrapper to provide aligned allocations.
-  class AlignedFencedAllocator : public FencedAllocatorWrapper {
+  // Wraps RingBufferWrapper to provide aligned allocations.
+  class AlignedRingBuffer : public RingBufferWrapper {
    public:
-    AlignedFencedAllocator(unsigned int size,
-                           CommandBufferHelper *helper,
-                           void *base)
-        : FencedAllocatorWrapper(size, helper, base) {
+    AlignedRingBuffer(RingBuffer::Offset base_offset,
+                      unsigned int size,
+                      CommandBufferHelper *helper,
+                      void *base)
+        : RingBufferWrapper(base_offset, size, helper, base) {
     }
 
     static unsigned int RoundToAlignment(unsigned int size) {
       return (size + kAlignment - 1) & ~(kAlignment - 1);
     }
 
-    // Overrriden from FencedAllocatorWrapper
+    // Overrriden from RingBufferWrapper
     void *Alloc(unsigned int size) {
-      return FencedAllocatorWrapper::Alloc(RoundToAlignment(size));
+      return RingBufferWrapper::Alloc(RoundToAlignment(size));
     }
 
-    // Overrriden from FencedAllocatorWrapper
+    // Overrriden from RingBufferWrapper
     template <typename T> T *AllocTyped(unsigned int count) {
       return static_cast<T *>(Alloc(count * sizeof(T)));
     }
   };
 
   // Gets the shared memory id for the result buffer.
   uint32 result_shm_id() const {
     return transfer_buffer_id_;
   }
 
@@ skipping 52 matching lines @@
       GLuint buffer_id, GLsizei count, GLenum type, GLuint offset);
 #endif
 
   GLES2Util util_;
   GLES2CmdHelper* helper_;
   IdAllocator buffer_id_allocator_;
   IdAllocator framebuffer_id_allocator_;
   IdAllocator renderbuffer_id_allocator_;
   IdAllocator program_and_shader_id_allocator_;
   IdAllocator texture_id_allocator_;
-  AlignedFencedAllocator transfer_buffer_;
+  AlignedRingBuffer transfer_buffer_;
   int transfer_buffer_id_;
   void* result_buffer_;
   uint32 result_shm_offset_;
 
   // pack alignment as last set by glPixelStorei
   GLint pack_alignment_;
 
   // unpack alignment as last set by glPixelStorei
   GLint unpack_alignment_;
 
@@ skipping 20 matching lines @@
   GLStringMap gl_strings_;
 
   DISALLOW_COPY_AND_ASSIGN(GLES2Implementation);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_