From 07239b7519733ec307335e15c359a82d40486f31 Mon Sep 17 00:00:00 2001
From: David Neto <dneto@google.com>
Date: Mon, 15 Jul 2019 12:35:50 -0400
Subject: [PATCH] Fix struct member name: No trailing underscore

---
 src/dawn/engine_dawn.cc  | 8 ++++----
 src/dawn/pipeline_info.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/dawn/engine_dawn.cc b/src/dawn/engine_dawn.cc
index 296470175..09be0c358 100644
--- a/src/dawn/engine_dawn.cc
+++ b/src/dawn/engine_dawn.cc
@@ -1168,12 +1168,12 @@ Result EngineDawn::DoBuffer(const BufferCommand* command) {
   if (!command->IsSSBO() && !command->IsUniform())
     return Result("DoBuffer: only supports SSBO and uniform buffer type");
 
-  if (render_pipeline->buffer_map_.find(
+  if (render_pipeline->buffer_map.find(
           {command->GetDescriptorSet(), command->GetBinding()}) !=
-      render_pipeline->buffer_map_.end()) {
+      render_pipeline->buffer_map.end()) {
     auto dawn_buffer_index =
         render_pipeline
-            ->buffer_map_[{command->GetDescriptorSet(), command->GetBinding()}];
+            ->buffer_map[{command->GetDescriptorSet(), command->GetBinding()}];
     ::dawn::Buffer& dawn_buffer = render_pipeline->buffers[dawn_buffer_index];
 
     Buffer* amber_buffer = command->GetBuffer();
@@ -1324,7 +1324,7 @@ Result EngineDawn::AttachBuffersAndTextures(
                              bufferUsage | ::dawn::BufferUsageBit::TransferSrc |
                                  ::dawn::BufferUsageBit::TransferDst));
 
-    render_pipeline->buffer_map_[{buf_info.descriptor_set, buf_info.binding}] =
+    render_pipeline->buffer_map[{buf_info.descriptor_set, buf_info.binding}] =
         render_pipeline->buffers.size() - 1;
 
     render_pipeline->used_descriptor_set.insert(buf_info.descriptor_set);
diff --git a/src/dawn/pipeline_info.h b/src/dawn/pipeline_info.h
index be4513626..4d09d262b 100644
--- a/src/dawn/pipeline_info.h
+++ b/src/dawn/pipeline_info.h
@@ -72,7 +72,7 @@ struct RenderPipelineInfo {
 
   // Mapping from the <descriptor_set, binding> to dawn buffer index in buffers
   std::unordered_map<std::pair<uint32_t, uint32_t>, uint32_t, hash_pair>
-      buffer_map_;
+      buffer_map;
   std::set<int> used_descriptor_set;
 };