cc: Changes to use GL API for GpuMemoryBuffers

cc/resources/resource_provider.h

 // Copyright 2012 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 CC_RESOURCES_RESOURCE_PROVIDER_H_
 #define CC_RESOURCES_RESOURCE_PROVIDER_H_
 
 #include <deque>
 #include <set>
 #include <string>
@@ skipping 300 matching lines @@
   bool CanLockForWrite(ResourceId id);
 
   cc::ContextProvider* offscreen_context_provider() {
     return offscreen_context_provider_.get();
   }
   void set_offscreen_context_provider(
       scoped_refptr<cc::ContextProvider> offscreen_context_provider) {
     offscreen_context_provider_ = offscreen_context_provider;
   }
 
+  // Sets if zero-copy GPU memory buffers should be used.
+  void SetUseGpuMemoryBuffers(bool use_gpu_memory_buffers);

[reveman, 2013/05/17 01:48:08]

You don't need this when exposing this using a new set of entry points.

[kaanb, 2013/05/17 21:27:36]

Done.

+
  private:
   struct Resource {
     Resource();
     ~Resource();
     Resource(unsigned texture_id, gfx::Size size, GLenum format, GLenum filter);
     Resource(uint8_t* pixels, gfx::Size size, GLenum format, GLenum filter);
 
     unsigned gl_id;
     // Pixel buffer used for set pixels without unnecessary copying.
     unsigned gl_pixel_buffer_id;
     // Query used to determine when asynchronous set pixels complete.
     unsigned gl_upload_query_id;
     TextureMailbox mailbox;
     uint8_t* pixels;
     uint8_t* pixel_buffer;
     int lock_for_read_count;
     bool locked_for_write;
     bool external;
     bool exported;
     bool marked_for_deletion;
     bool pending_set_pixels;
     bool set_pixels_completion_forced;
     bool allocated;
     bool enable_read_lock_fences;
     scoped_refptr<Fence> read_lock_fence;
     gfx::Size size;
     GLenum format;
     // TODO(skyostil): Use a separate sampler object for filter state.
     GLenum filter;
+    unsigned image_id;
     ResourceType type;
   };
   typedef base::hash_map<ResourceId, Resource> ResourceMap;
   struct Child {
     Child();
     ~Child();
 
     ResourceIdMap child_to_parent_map;
     ResourceIdMap parent_to_child_map;
   };
@@ skipping 39 matching lines @@
   scoped_ptr<AcceleratedTextureCopier> texture_copier_;
   int max_texture_size_;
   GLenum best_texture_format_;
 
   scoped_refptr<cc::ContextProvider> offscreen_context_provider_;
 
   base::ThreadChecker thread_checker_;
 
   scoped_refptr<Fence> current_read_lock_fence_;
 
+  bool use_gpu_memory_buffers_;

[reveman, 2013/05/17 01:48:08]

remove this

[kaanb, 2013/05/17 21:27:36]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RESOURCE_PROVIDER_H_