diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-03 13:51:51 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-07 11:27:36 -0600 |
| commit | 9f2f7ddd12a4aaab0faddbe60cfb7c1e526fa7ff (patch) | |
| tree | 4350fce48dd97f6088dae94245265cd900f3de1f /cmake | |
| parent | d9f2cd5df50f5eee141b0a17e4e2ec8a4a7c4f78 (diff) | |
| download | qtlocation-mapboxgl-9f2f7ddd12a4aaab0faddbe60cfb7c1e526fa7ff.tar.gz | |
[core] Check in generated shader code
One step toward eliminating the node/npm dependency for platforms other than node.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/core-files.cmake | 15 | ||||
| -rw-r--r-- | cmake/core.cmake | 1 | ||||
| -rw-r--r-- | cmake/shaders.cmake | 32 |
3 files changed, 15 insertions, 33 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 1059e972ce..e2a54daf01 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -181,6 +181,21 @@ set(MBGL_CORE_FILES src/mbgl/renderer/symbol_bucket.cpp src/mbgl/renderer/symbol_bucket.hpp + # shaders + src/mbgl/shaders/circle.hpp + src/mbgl/shaders/collision_box.hpp + src/mbgl/shaders/debug.hpp + src/mbgl/shaders/fill.hpp + src/mbgl/shaders/fill_outline.hpp + src/mbgl/shaders/fill_outline_pattern.hpp + src/mbgl/shaders/fill_pattern.hpp + src/mbgl/shaders/line.hpp + src/mbgl/shaders/line_pattern.hpp + src/mbgl/shaders/line_sdf.hpp + src/mbgl/shaders/raster.hpp + src/mbgl/shaders/symbol_icon.hpp + src/mbgl/shaders/symbol_sdf.hpp + # sprite include/mbgl/sprite/sprite_image.hpp src/mbgl/sprite/sprite_atlas.cpp diff --git a/cmake/core.cmake b/cmake/core.cmake index 8d8a942d9f..f893e1571e 100644 --- a/cmake/core.cmake +++ b/cmake/core.cmake @@ -12,7 +12,6 @@ add_custom_command( add_custom_target(mbgl-headers DEPENDS ${MBGL_GENERATED}/include/mbgl/util/version.hpp - ${MBGL_SHADER_FILES} ) add_library(mbgl-core STATIC diff --git a/cmake/shaders.cmake b/cmake/shaders.cmake deleted file mode 100644 index a9ded80a6c..0000000000 --- a/cmake/shaders.cmake +++ /dev/null @@ -1,32 +0,0 @@ -function(add_shader VAR name) - set(shader_build_cmd ${NodeJS_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripts/build-shaders.js) - set(shader_file_prefix ${CMAKE_SOURCE_DIR}/mapbox-gl-js/shaders) - set(shader_source_prefix ${MBGL_GENERATED}/include/mbgl/shader) - - add_custom_command( - OUTPUT ${shader_source_prefix}/${name}.hpp - COMMAND ${shader_build_cmd} ${name} ${shader_file_prefix} ${shader_source_prefix} - DEPENDS npm-install - DEPENDS ${CMAKE_SOURCE_DIR}/scripts/build-shaders.js - DEPENDS ${shader_file_prefix}/${name}.vertex.glsl - DEPENDS ${shader_file_prefix}/${name}.fragment.glsl - DEPENDS ${shader_file_prefix}/_prelude.vertex.glsl - DEPENDS ${shader_file_prefix}/_prelude.fragment.glsl - VERBATIM - ) - set(${VAR} ${${VAR}} ${shader_source_prefix}/${name}.hpp PARENT_SCOPE) -endfunction() - -add_shader(MBGL_SHADER_FILES circle) -add_shader(MBGL_SHADER_FILES collision_box) -add_shader(MBGL_SHADER_FILES debug) -add_shader(MBGL_SHADER_FILES fill) -add_shader(MBGL_SHADER_FILES fill_outline) -add_shader(MBGL_SHADER_FILES fill_outline_pattern) -add_shader(MBGL_SHADER_FILES fill_pattern) -add_shader(MBGL_SHADER_FILES line) -add_shader(MBGL_SHADER_FILES line_pattern) -add_shader(MBGL_SHADER_FILES line_sdf) -add_shader(MBGL_SHADER_FILES raster) -add_shader(MBGL_SHADER_FILES symbol_icon) -add_shader(MBGL_SHADER_FILES symbol_sdf) |