From 458bb6551009dae199fa57df8461f0b1878d7d06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Tue, 5 Mar 2019 16:48:11 +0100
Subject: [core] rename gl/*_buffer.hpp to gl/*_buffer_resource.hpp

---
 src/core-files.json                    |  4 ++--
 src/mbgl/gl/context.cpp                |  4 ++--
 src/mbgl/gl/index_buffer.hpp           | 18 ------------------
 src/mbgl/gl/index_buffer_resource.hpp  | 18 ++++++++++++++++++
 src/mbgl/gl/value.cpp                  |  2 +-
 src/mbgl/gl/vertex_array.cpp           |  2 +-
 src/mbgl/gl/vertex_buffer.hpp          | 18 ------------------
 src/mbgl/gl/vertex_buffer_resource.hpp | 18 ++++++++++++++++++
 8 files changed, 42 insertions(+), 42 deletions(-)
 delete mode 100644 src/mbgl/gl/index_buffer.hpp
 create mode 100644 src/mbgl/gl/index_buffer_resource.hpp
 delete mode 100644 src/mbgl/gl/vertex_buffer.hpp
 create mode 100644 src/mbgl/gl/vertex_buffer_resource.hpp

diff --git a/src/core-files.json b/src/core-files.json
index 1390b7607c..928cb9c8aa 100644
--- a/src/core-files.json
+++ b/src/core-files.json
@@ -517,7 +517,7 @@
         "mbgl/gl/extension.hpp": "src/mbgl/gl/extension.hpp",
         "mbgl/gl/features.hpp": "src/mbgl/gl/features.hpp",
         "mbgl/gl/framebuffer.hpp": "src/mbgl/gl/framebuffer.hpp",
-        "mbgl/gl/index_buffer.hpp": "src/mbgl/gl/index_buffer.hpp",
+        "mbgl/gl/index_buffer_resource.hpp": "src/mbgl/gl/index_buffer_resource.hpp",
         "mbgl/gl/object.hpp": "src/mbgl/gl/object.hpp",
         "mbgl/gl/program.hpp": "src/mbgl/gl/program.hpp",
         "mbgl/gl/program_binary_extension.hpp": "src/mbgl/gl/program_binary_extension.hpp",
@@ -529,7 +529,7 @@
         "mbgl/gl/value.hpp": "src/mbgl/gl/value.hpp",
         "mbgl/gl/vertex_array.hpp": "src/mbgl/gl/vertex_array.hpp",
         "mbgl/gl/vertex_array_extension.hpp": "src/mbgl/gl/vertex_array_extension.hpp",
-        "mbgl/gl/vertex_buffer.hpp": "src/mbgl/gl/vertex_buffer.hpp",
+        "mbgl/gl/vertex_buffer_resource.hpp": "src/mbgl/gl/vertex_buffer_resource.hpp",
         "mbgl/layout/clip_lines.hpp": "src/mbgl/layout/clip_lines.hpp",
         "mbgl/layout/layout.hpp": "src/mbgl/layout/layout.hpp",
         "mbgl/layout/merge_lines.hpp": "src/mbgl/layout/merge_lines.hpp",
diff --git a/src/mbgl/gl/context.cpp b/src/mbgl/gl/context.cpp
index 9904c43145..4f4357b749 100644
--- a/src/mbgl/gl/context.cpp
+++ b/src/mbgl/gl/context.cpp
@@ -1,7 +1,7 @@
 #include <mbgl/gl/context.hpp>
 #include <mbgl/gl/enum.hpp>
-#include <mbgl/gl/vertex_buffer.hpp>
-#include <mbgl/gl/index_buffer.hpp>
+#include <mbgl/gl/vertex_buffer_resource.hpp>
+#include <mbgl/gl/index_buffer_resource.hpp>
 #include <mbgl/gl/debugging_extension.hpp>
 #include <mbgl/gl/vertex_array_extension.hpp>
 #include <mbgl/gl/program_binary_extension.hpp>
diff --git a/src/mbgl/gl/index_buffer.hpp b/src/mbgl/gl/index_buffer.hpp
deleted file mode 100644
index 2da25fdb96..0000000000
--- a/src/mbgl/gl/index_buffer.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include <mbgl/gfx/index_buffer.hpp>
-#include <mbgl/gl/object.hpp>
-
-namespace mbgl {
-namespace gl {
-
-class IndexBufferResource : public gfx::IndexBufferResource {
-public:
-    IndexBufferResource(UniqueBuffer&& buffer_) : buffer(std::move(buffer_)) {
-    }
-
-    UniqueBuffer buffer;
-};
-
-} // namespace gl
-} // namespace mbgl
diff --git a/src/mbgl/gl/index_buffer_resource.hpp b/src/mbgl/gl/index_buffer_resource.hpp
new file mode 100644
index 0000000000..2da25fdb96
--- /dev/null
+++ b/src/mbgl/gl/index_buffer_resource.hpp
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <mbgl/gfx/index_buffer.hpp>
+#include <mbgl/gl/object.hpp>
+
+namespace mbgl {
+namespace gl {
+
+class IndexBufferResource : public gfx::IndexBufferResource {
+public:
+    IndexBufferResource(UniqueBuffer&& buffer_) : buffer(std::move(buffer_)) {
+    }
+
+    UniqueBuffer buffer;
+};
+
+} // namespace gl
+} // namespace mbgl
diff --git a/src/mbgl/gl/value.cpp b/src/mbgl/gl/value.cpp
index b205f0f358..8f5b53fcac 100644
--- a/src/mbgl/gl/value.cpp
+++ b/src/mbgl/gl/value.cpp
@@ -1,6 +1,6 @@
 #include <mbgl/gl/value.hpp>
 #include <mbgl/gl/context.hpp>
-#include <mbgl/gl/vertex_buffer.hpp>
+#include <mbgl/gl/vertex_buffer_resource.hpp>
 #include <mbgl/gl/vertex_array_extension.hpp>
 #include <mbgl/gl/enum.hpp>
 
diff --git a/src/mbgl/gl/vertex_array.cpp b/src/mbgl/gl/vertex_array.cpp
index a73e50ae73..445ff37e12 100644
--- a/src/mbgl/gl/vertex_array.cpp
+++ b/src/mbgl/gl/vertex_array.cpp
@@ -1,5 +1,5 @@
 #include <mbgl/gl/vertex_array.hpp>
-#include <mbgl/gl/index_buffer.hpp>
+#include <mbgl/gl/index_buffer_resource.hpp>
 #include <mbgl/gl/context.hpp>
 
 namespace mbgl {
diff --git a/src/mbgl/gl/vertex_buffer.hpp b/src/mbgl/gl/vertex_buffer.hpp
deleted file mode 100644
index 95e5e75d45..0000000000
--- a/src/mbgl/gl/vertex_buffer.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include <mbgl/gfx/vertex_buffer.hpp>
-#include <mbgl/gl/object.hpp>
-
-namespace mbgl {
-namespace gl {
-
-class VertexBufferResource : public gfx::VertexBufferResource {
-public:
-    VertexBufferResource(UniqueBuffer&& buffer_) : buffer(std::move(buffer_)) {
-    }
-
-    UniqueBuffer buffer;
-};
-
-} // namespace gl
-} // namespace mbgl
diff --git a/src/mbgl/gl/vertex_buffer_resource.hpp b/src/mbgl/gl/vertex_buffer_resource.hpp
new file mode 100644
index 0000000000..95e5e75d45
--- /dev/null
+++ b/src/mbgl/gl/vertex_buffer_resource.hpp
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <mbgl/gfx/vertex_buffer.hpp>
+#include <mbgl/gl/object.hpp>
+
+namespace mbgl {
+namespace gl {
+
+class VertexBufferResource : public gfx::VertexBufferResource {
+public:
+    VertexBufferResource(UniqueBuffer&& buffer_) : buffer(std::move(buffer_)) {
+    }
+
+    UniqueBuffer buffer;
+};
+
+} // namespace gl
+} // namespace mbgl
-- 
cgit v1.2.1