summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2019-03-05 16:48:11 +0100
committerKonstantin Käfer <mail@kkaefer.com>2019-03-05 18:37:32 +0100
commitf6aef88b9adb745a52f2b3dc3f17666f197ece0d (patch)
tree00653930043fbd1fd4912033f9d109d81458cb42
parent33b21b220e1c9f8848dc9f3d7e2e146e14332d50 (diff)
downloadqtlocation-mapboxgl-upstream/gfx-refactor-2.tar.gz
[core] rename gl/*_buffer.hpp to gl/*_buffer_resource.hppupstream/gfx-refactor-2
-rw-r--r--src/core-files.json4
-rw-r--r--src/mbgl/gl/context.cpp4
-rw-r--r--src/mbgl/gl/index_buffer_resource.hpp (renamed from src/mbgl/gl/index_buffer.hpp)0
-rw-r--r--src/mbgl/gl/value.cpp2
-rw-r--r--src/mbgl/gl/vertex_array.cpp2
-rw-r--r--src/mbgl/gl/vertex_buffer_resource.hpp (renamed from src/mbgl/gl/vertex_buffer.hpp)0
6 files changed, 6 insertions, 6 deletions
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_resource.hpp
index 2da25fdb96..2da25fdb96 100644
--- a/src/mbgl/gl/index_buffer.hpp
+++ b/src/mbgl/gl/index_buffer_resource.hpp
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_resource.hpp
index 95e5e75d45..95e5e75d45 100644
--- a/src/mbgl/gl/vertex_buffer.hpp
+++ b/src/mbgl/gl/vertex_buffer_resource.hpp