diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-02-08 15:45:05 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-02-12 19:42:08 +0200 |
| commit | 690833ef9212756cbdd1945e2f447f22cc05816e (patch) | |
| tree | 4dca89518c6b54c60c669aacd8fbff9c15801418 /platform | |
| parent | 470b01847db1046bbae872f932b0e83ebf3af5f8 (diff) | |
| download | qtlocation-mapboxgl-690833ef9212756cbdd1945e2f447f22cc05816e.tar.gz | |
[core] Switch to the new OpenGL abstraction
This patch will make Mapbox GL Core never use OpenGL
directly. We should consider locking into OpenGL ES 2.0
to simplify the code path and remove #ifdefs.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/core-files.json | 1 | ||||
| -rw-r--r-- | platform/ios/core-files.json | 1 | ||||
| -rw-r--r-- | platform/linux/config.cmake | 3 | ||||
| -rw-r--r-- | platform/macos/core-files.json | 1 | ||||
| -rw-r--r-- | platform/qt/config.cmake | 2 | ||||
| -rw-r--r-- | platform/qt/qt.cmake | 1 |
6 files changed, 8 insertions, 1 deletions
diff --git a/platform/android/core-files.json b/platform/android/core-files.json index c1dc9e8429..875e61ece9 100644 --- a/platform/android/core-files.json +++ b/platform/android/core-files.json @@ -81,6 +81,7 @@ "platform/android/src/style/value.cpp", "platform/android/src/text/collator.cpp", "platform/android/src/text/local_glyph_rasterizer.cpp", + "platform/android/src/gl_functions.cpp", "platform/android/src/thread.cpp", "platform/android/src/timer.cpp", "platform/android/src/unaccent.cpp", diff --git a/platform/ios/core-files.json b/platform/ios/core-files.json index 18a8ed5b86..f161e98710 100644 --- a/platform/ios/core-files.json +++ b/platform/ios/core-files.json @@ -2,6 +2,7 @@ "//": "This file can be edited manually and is the canonical source.", "sources": [ "platform/darwin/src/collator.mm", + "platform/darwin/src/gl_functions.cpp", "platform/darwin/src/headless_backend_eagl.mm", "platform/darwin/src/image.mm", "platform/darwin/src/local_glyph_rasterizer.mm", diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 1df501a84e..6d4715e451 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -41,6 +41,9 @@ macro(mbgl_platform_core) endif() target_sources(mbgl-core + # GL + PRIVATE platform/linux/src/gl_functions.cpp + # Misc PRIVATE platform/default/src/mbgl/util/logging_stderr.cpp PRIVATE platform/default/src/mbgl/util/string_stdlib.cpp diff --git a/platform/macos/core-files.json b/platform/macos/core-files.json index bfc63d5027..9ec41f651a 100644 --- a/platform/macos/core-files.json +++ b/platform/macos/core-files.json @@ -2,6 +2,7 @@ "//": "This file can be edited manually and is the canonical source.", "sources": [ "platform/darwin/src/collator.mm", + "platform/darwin/src/gl_functions.cpp", "platform/darwin/src/image.mm", "platform/darwin/src/local_glyph_rasterizer.mm", "platform/darwin/src/logging_nslog.mm", diff --git a/platform/qt/config.cmake b/platform/qt/config.cmake index 68b32b9eb9..9249f846e8 100644 --- a/platform/qt/config.cmake +++ b/platform/qt/config.cmake @@ -6,9 +6,9 @@ macro(mbgl_platform_core) ) target_include_directories(mbgl-core - PUBLIC platform/default/include PRIVATE platform/qt PRIVATE platform/qt/include + PUBLIC platform/default/include ) target_link_libraries(mbgl-core PRIVATE diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index e651b8c0c7..63723aa9ba 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -38,6 +38,7 @@ set(MBGL_QT_CORE_FILES PRIVATE platform/qt/src/timer.cpp PRIVATE platform/qt/src/timer_impl.hpp PRIVATE platform/qt/src/utf.cpp + PRIVATE platform/qt/src/gl_functions.cpp PRIVATE platform/default/src/mbgl/text/collator.cpp PRIVATE platform/default/src/mbgl/text/unaccent.cpp |