From 458bb6551009dae199fa57df8461f0b1878d7d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Tue, 5 Mar 2019 16:48:11 +0100 Subject: [PATCH] [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 => index_buffer_resource.hpp} | 0 src/mbgl/gl/value.cpp | 2 +- src/mbgl/gl/vertex_array.cpp | 2 +- src/mbgl/gl/{vertex_buffer.hpp => vertex_buffer_resource.hpp} | 0 6 files changed, 6 insertions(+), 6 deletions(-) rename src/mbgl/gl/{index_buffer.hpp => index_buffer_resource.hpp} (100%) rename src/mbgl/gl/{vertex_buffer.hpp => vertex_buffer_resource.hpp} (100%) diff --git a/src/core-files.json b/src/core-files.json index 1390b7607..928cb9c8a 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 9904c4314..4f4357b74 100644 --- a/src/mbgl/gl/context.cpp +++ b/src/mbgl/gl/context.cpp @@ -1,7 +1,7 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/mbgl/gl/index_buffer.hpp b/src/mbgl/gl/index_buffer_resource.hpp similarity index 100% rename from src/mbgl/gl/index_buffer.hpp rename to src/mbgl/gl/index_buffer_resource.hpp diff --git a/src/mbgl/gl/value.cpp b/src/mbgl/gl/value.cpp index b205f0f35..8f5b53fca 100644 --- a/src/mbgl/gl/value.cpp +++ b/src/mbgl/gl/value.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include diff --git a/src/mbgl/gl/vertex_array.cpp b/src/mbgl/gl/vertex_array.cpp index a73e50ae7..445ff37e1 100644 --- a/src/mbgl/gl/vertex_array.cpp +++ b/src/mbgl/gl/vertex_array.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include namespace mbgl { diff --git a/src/mbgl/gl/vertex_buffer.hpp b/src/mbgl/gl/vertex_buffer_resource.hpp similarity index 100% rename from src/mbgl/gl/vertex_buffer.hpp rename to src/mbgl/gl/vertex_buffer_resource.hpp