command_buffer: Remove hash_tables.h, simplify atomicops.h

command_buffer: Remove hash_tables.h, simplify atomicops.h

command_buffer was historically included in nacl-compiled things, and base
wasn't. These days, base is included in nacl-compiled things too, so the
duplication can be removed.

BUG=none
R=piman@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=233098

[Nico, 2013-11-05 05:56:40]

atomicops.h/cc can go completely I think, but I'll do that in a followup.

[Nico, 2013-11-05 19:58:13]

piman: Can you stamp this too? It's a prerequisite for
https://codereview.chromium.org/59383006/ which you already approved.


On Mon, Nov 4, 2013 at 9:56 PM, <thakis@chromium.org> wrote:

> Reviewers: piman,
>
> Message:
> atomicops.h/cc can go completely I think, but I'll do that in a followup.
>
> Description:
> command_buffer: Remove hash_tables.h, simplify atomicops.h
>
> command_buffer was historically included in nacl-compiled things, and base
> wasn't. These days, base is included in nacl-compiled things too, so the
> duplication can be removed.
>
> BUG=none
>
> Please review this at https://codereview.chromium.org/58913003/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files (+9, -44 lines):
>   D gpu/command_buffer/client/hash_tables.h
>   M gpu/command_buffer/client/atomicops.h
>   M gpu/command_buffer/client/atomicops.cc
>   M gpu/command_buffer/client/buffer_tracker.h
>   M gpu/command_buffer/client/gpu_memory_buffer_tracker.h
>   M gpu/command_buffer/client/query_tracker.h
>   M gpu/command_buffer/client/query_tracker.cc
>   M gpu/command_buffer/client/vertex_array_object_manager.h
>   M gpu/command_buffer_client.gypi
>
>
> Index: gpu/command_buffer/client/hash_tables.h
> diff --git a/gpu/command_buffer/client/hash_tables.h
> b/gpu/command_buffer/client/hash_tables.h
> deleted file mode 100644
> index fff3098dea6ce54e8119f32ab65f691ca074cfdf..
> 0000000000000000000000000000000000000000
> --- a/gpu/command_buffer/client/hash_tables.h
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -// Copyright (c) 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 GPU_COMMAND_BUFFER_CLIENT_HASH_TABLES_H_
> -#define GPU_COMMAND_BUFFER_CLIENT_HASH_TABLES_H_
> -
> -#if defined(__native_client__)
> -#include <tr1/unordered_map>
> -namespace gpu {
> -template <typename key, typename value>
> -struct hash_map : public std::tr1::unordered_map<key, value> {
> -};
> -}
> -#else
> -#include "base/containers/hash_tables.h"
> -namespace gpu {
> -template <typename key, typename value>
> -struct hash_map : public base::hash_map<key, value> {
> -};
> -}
> -#endif
> -
> -#endif  // GPU_COMMAND_BUFFER_CLIENT_HASH_TABLES_H_
> Index: gpu/command_buffer/client/atomicops.cc
> diff --git a/gpu/command_buffer/client/atomicops.cc
> b/gpu/command_buffer/client/atomicops.cc
> index ef68f9ea4bd646811bd304c66d0824199bdf39c7..
> c66fc05738e5b9e1ed210d221bc7f7d783c1c9de 100644
> --- a/gpu/command_buffer/client/atomicops.cc
> +++ b/gpu/command_buffer/client/atomicops.cc
> @@ -15,14 +15,6 @@
>
>  namespace gpu {
>
> -void MemoryBarrier() {
> -#if defined(__native_client__)
> -  __sync_synchronize();
> -#else
> -  base::subtle::MemoryBarrier();
> -#endif
> -}
> -
>  #if defined(__native_client__)
>
>  class LockImpl {
> Index: gpu/command_buffer/client/atomicops.h
> diff --git a/gpu/command_buffer/client/atomicops.h
> b/gpu/command_buffer/client/atomicops.h
> index 9e1628e0ad6e0ed6adce9953e88ea896ce616e69..
> 43044b6bc40dbc3f5a19e1b75daec1d6870141a2 100644
> --- a/gpu/command_buffer/client/atomicops.h
> +++ b/gpu/command_buffer/client/atomicops.h
> @@ -11,8 +11,6 @@
>
>  namespace gpu {
>
> -GPU_EXPORT void MemoryBarrier();
> -
>  class LockImpl;
>  class GPU_EXPORT Lock {
>   public:
> Index: gpu/command_buffer/client/buffer_tracker.h
> diff --git a/gpu/command_buffer/client/buffer_tracker.h
> b/gpu/command_buffer/client/buffer_tracker.h
> index e61c50188afcdc8b93211dcd1258052da6265536..
> 3e50364317d234bc9d7ed336c81de4fdbc26d5a4 100644
> --- a/gpu/command_buffer/client/buffer_tracker.h
> +++ b/gpu/command_buffer/client/buffer_tracker.h
> @@ -8,8 +8,8 @@
>  #include <GLES2/gl2.h>
>
>  #include <queue>
> +#include "base/containers/hash_tables.h"
>  #include "gles2_impl_export.h"
> -#include "gpu/command_buffer/client/hash_tables.h"
>  #include "gpu/command_buffer/common/gles2_cmd_format.h"
>
>  namespace gpu {
> @@ -99,7 +99,7 @@ class GLES2_IMPL_EXPORT BufferTracker {
>    void FreePendingToken(Buffer*, int32 token);
>
>   private:
> -  typedef gpu::hash_map<GLuint, Buffer*> BufferMap;
> +  typedef base::hash_map<GLuint, Buffer*> BufferMap;
>
>    MappedMemoryManager* mapped_memory_;
>    BufferMap buffers_;
> Index: gpu/command_buffer/client/gpu_memory_buffer_tracker.h
> diff --git a/gpu/command_buffer/client/gpu_memory_buffer_tracker.h
> b/gpu/command_buffer/client/gpu_memory_buffer_tracker.h
> index 0b07dd0a14817068405751f569cfd3d964165d01..
> 84158818a3760cc8f29d8d07d094f40595f7e3a6 100644
> --- a/gpu/command_buffer/client/gpu_memory_buffer_tracker.h
> +++ b/gpu/command_buffer/client/gpu_memory_buffer_tracker.h
> @@ -6,8 +6,8 @@
>  #define GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_TRACKER_H_
>
>  #include "base/basictypes.h"
> +#include "base/containers/hash_tables.h"
>  #include "gles2_impl_export.h"
> -#include "gpu/command_buffer/client/hash_tables.h"
>
>  namespace gfx {
>  class GpuMemoryBuffer;
> @@ -29,7 +29,7 @@ class GLES2_IMPL_EXPORT GpuMemoryBufferTracker {
>    void RemoveBuffer(int32 image_id);
>
>   private:
> -  typedef gpu::hash_map<int32, gfx::GpuMemoryBuffer*> BufferMap;
> +  typedef base::hash_map<int32, gfx::GpuMemoryBuffer*> BufferMap;
>    BufferMap buffers_;
>    GpuControl* gpu_control_;
>
> Index: gpu/command_buffer/client/query_tracker.cc
> diff --git a/gpu/command_buffer/client/query_tracker.cc
> b/gpu/command_buffer/client/query_tracker.cc
> index c128fbd270144cb7086a7d9526fe83e5aa1b29f0..
> ac9d3f9b3563d84e4e9724ad42c686199503fd3a 100644
> --- a/gpu/command_buffer/client/query_tracker.cc
> +++ b/gpu/command_buffer/client/query_tracker.cc
> @@ -151,7 +151,7 @@ bool QueryTracker::Query::CheckResultsAvailable(
>          helper->IsContextLost()) {
>        // Need a MemoryBarrier here so that sync->result read after
>        // sync->process_count.
> -      gpu::MemoryBarrier();
> +      base::subtle::MemoryBarrier();
>        switch (target()) {
>          case GL_COMMANDS_ISSUED_CHROMIUM:
>            result_ = std::min(info_.sync->result,
> Index: gpu/command_buffer/client/query_tracker.h
> diff --git a/gpu/command_buffer/client/query_tracker.h
> b/gpu/command_buffer/client/query_tracker.h
> index 81861c997a9bf3efdf7f70e5f76189679dcd5145..
> 9e7f501768b74a5bbfa4dccfb2bee6e153622dfa 100644
> --- a/gpu/command_buffer/client/query_tracker.h
> +++ b/gpu/command_buffer/client/query_tracker.h
> @@ -10,8 +10,8 @@
>  #include <deque>
>  #include <list>
>
> +#include "base/containers/hash_tables.h"
>  #include "gles2_impl_export.h"
> -#include "gpu/command_buffer/client/hash_tables.h"
>  #include "gpu/command_buffer/common/gles2_cmd_format.h"
>
>  namespace gpu {
> @@ -161,7 +161,7 @@ class GLES2_IMPL_EXPORT QueryTracker {
>    void FreeCompletedQueries();
>
>   private:
> -  typedef gpu::hash_map<GLuint, Query*> QueryMap;
> +  typedef base::hash_map<GLuint, Query*> QueryMap;
>    typedef std::list<Query*> QueryList;
>
>    QueryMap queries_;
> Index: gpu/command_buffer/client/vertex_array_object_manager.h
> diff --git a/gpu/command_buffer/client/vertex_array_object_manager.h
> b/gpu/command_buffer/client/vertex_array_object_manager.h
> index 254b15da055731bcab91c9b389f6318241533f03..
> d5b07ec0e88e0f32edcc067d8139f6850591fb24 100644
> --- a/gpu/command_buffer/client/vertex_array_object_manager.h
> +++ b/gpu/command_buffer/client/vertex_array_object_manager.h
> @@ -6,9 +6,9 @@
>  #define GPU_COMMAND_BUFFER_CLIENT_VERTEX_ARRAY_OBJECT_MANAGER_H_
>
>  #include <GLES2/gl2.h>
> +#include "base/containers/hash_tables.h"
>  #include "base/memory/scoped_ptr.h"
>  #include "gles2_impl_export.h"
> -#include "gpu/command_buffer/client/hash_tables.h"
>  #include "gpu/command_buffer/common/types.h"
>
>  namespace gpu {
> @@ -93,7 +93,7 @@ class GLES2_IMPL_EXPORT VertexArrayObjectManager {
>    GLuint bound_element_array_buffer() const;
>
>   private:
> -  typedef gpu::hash_map<GLuint, VertexArrayObject*> VertexArrayObjectMap;
> +  typedef base::hash_map<GLuint, VertexArrayObject*> VertexArrayObjectMap;
>
>    bool IsDefaultVAOBound() const;
>
> Index: gpu/command_buffer_client.gypi
> diff --git a/gpu/command_buffer_client.gypi b/gpu/command_buffer_client.
> gypi
> index b4d5b7886fbdb30090e4ba731f587769a4215b70..
> 366f5b730b4eda9770b58228adfe7da5f8cd8582 100644
> --- a/gpu/command_buffer_client.gypi
> +++ b/gpu/command_buffer_client.gypi
> @@ -21,7 +21,6 @@
>      'command_buffer/client/cmd_buffer_helper.h',
>      'command_buffer/client/fenced_allocator.cc',
>      'command_buffer/client/fenced_allocator.h',
> -    'command_buffer/client/hash_tables.h',
>      'command_buffer/client/mapped_memory.cc',
>      'command_buffer/client/mapped_memory.h',
>      'command_buffer/client/ring_buffer.cc',
>
>
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[piman, 2013-11-05 20:58:04]

lgtm

[commit-bot: I haz the power, 2013-11-05 21:11:42]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/58913003/80001

[Nico, 2013-11-05 22:08:51]

Committed patchset #3 manually as r233098 (presubmit successful).