[core] Introduce gl::Program template

3 files changed, 23 insertions, 50 deletions

diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake
index 07a11e9a9f..7a2ed33281 100644
--- a/cmake/core-files.cmake
+++ b/cmake/core-files.cmake
@@ -73,10 +73,9 @@ set(MBGL_CORE_FILES
     src/mbgl/gl/index_buffer.hpp
     src/mbgl/gl/object.cpp
     src/mbgl/gl/object.hpp
+    src/mbgl/gl/program.hpp
     src/mbgl/gl/renderbuffer.hpp
     src/mbgl/gl/segment.hpp
-    src/mbgl/gl/shader.cpp
-    src/mbgl/gl/shader.hpp
     src/mbgl/gl/state.hpp
     src/mbgl/gl/stencil_mode.cpp
     src/mbgl/gl/stencil_mode.hpp
@@ -149,6 +148,24 @@ set(MBGL_CORE_FILES
     include/mbgl/platform/default/settings_json.hpp
     include/mbgl/platform/default/thread_pool.hpp
 
+    # programs
+    src/mbgl/programs/attributes.hpp
+    src/mbgl/programs/circle_program.cpp
+    src/mbgl/programs/circle_program.hpp
+    src/mbgl/programs/collision_box_program.cpp
+    src/mbgl/programs/collision_box_program.hpp
+    src/mbgl/programs/fill_program.cpp
+    src/mbgl/programs/fill_program.hpp
+    src/mbgl/programs/line_program.cpp
+    src/mbgl/programs/line_program.hpp
+    src/mbgl/programs/program.hpp
+    src/mbgl/programs/programs.hpp
+    src/mbgl/programs/raster_program.cpp
+    src/mbgl/programs/raster_program.hpp
+    src/mbgl/programs/symbol_program.cpp
+    src/mbgl/programs/symbol_program.hpp
+    src/mbgl/programs/uniforms.hpp
+
     # renderer
     src/mbgl/renderer/bucket.hpp
     src/mbgl/renderer/circle_bucket.cpp
@@ -181,50 +198,6 @@ set(MBGL_CORE_FILES
     src/mbgl/renderer/symbol_bucket.cpp
     src/mbgl/renderer/symbol_bucket.hpp
 
-    # shader
-    src/mbgl/shader/attributes.hpp
-    src/mbgl/shader/circle_attributes.hpp
-    src/mbgl/shader/circle_shader.cpp
-    src/mbgl/shader/circle_shader.hpp
-    src/mbgl/shader/circle_uniforms.hpp
-    src/mbgl/shader/collision_box_attributes.hpp
-    src/mbgl/shader/collision_box_shader.cpp
-    src/mbgl/shader/collision_box_shader.hpp
-    src/mbgl/shader/collision_box_uniforms.hpp
-    src/mbgl/shader/fill_attributes.hpp
-    src/mbgl/shader/fill_outline_pattern_shader.cpp
-    src/mbgl/shader/fill_outline_pattern_shader.hpp
-    src/mbgl/shader/fill_outline_shader.cpp
-    src/mbgl/shader/fill_outline_shader.hpp
-    src/mbgl/shader/fill_pattern_shader.cpp
-    src/mbgl/shader/fill_pattern_shader.hpp
-    src/mbgl/shader/fill_shader.cpp
-    src/mbgl/shader/fill_shader.hpp
-    src/mbgl/shader/fill_uniforms.cpp
-    src/mbgl/shader/fill_uniforms.hpp
-    src/mbgl/shader/line_attributes.hpp
-    src/mbgl/shader/line_pattern_shader.cpp
-    src/mbgl/shader/line_pattern_shader.hpp
-    src/mbgl/shader/line_sdf_shader.cpp
-    src/mbgl/shader/line_sdf_shader.hpp
-    src/mbgl/shader/line_shader.cpp
-    src/mbgl/shader/line_shader.hpp
-    src/mbgl/shader/line_uniforms.cpp
-    src/mbgl/shader/line_uniforms.hpp
-    src/mbgl/shader/raster_attributes.hpp
-    src/mbgl/shader/raster_shader.cpp
-    src/mbgl/shader/raster_shader.hpp
-    src/mbgl/shader/raster_uniforms.hpp
-    src/mbgl/shader/shaders.hpp
-    src/mbgl/shader/symbol_attributes.hpp
-    src/mbgl/shader/symbol_icon_shader.cpp
-    src/mbgl/shader/symbol_icon_shader.hpp
-    src/mbgl/shader/symbol_sdf_shader.cpp
-    src/mbgl/shader/symbol_sdf_shader.hpp
-    src/mbgl/shader/symbol_uniforms.cpp
-    src/mbgl/shader/symbol_uniforms.hpp
-    src/mbgl/shader/uniforms.hpp
-
     # sprite
     include/mbgl/sprite/sprite_image.hpp
     src/mbgl/sprite/sprite_atlas.cpp
diff --git a/cmake/shaders.cmake b/cmake/shaders.cmake
index bebf476bbf..659231fd9a 100644
--- a/cmake/shaders.cmake
+++ b/cmake/shaders.cmake
@@ -4,14 +4,13 @@ function(add_shader VAR name)
     set(shader_source_prefix ${MBGL_GENERATED}/include/mbgl/shader)
 
     add_custom_command(
-       OUTPUT ${shader_source_prefix}/${name}.vertex.hpp ${shader_source_prefix}/${name}.fragment.hpp
-       COMMAND ${shader_build_cmd} ${shader_file_prefix}/${name}.vertex.glsl ${shader_source_prefix}/${name}.vertex.hpp
-       COMMAND ${shader_build_cmd} ${shader_file_prefix}/${name}.fragment.glsl ${shader_source_prefix}/${name}.fragment.hpp
+       OUTPUT ${shader_source_prefix}/${name}.hpp
+       COMMAND ${shader_build_cmd} ${shader_file_prefix}/${name}.vertex.glsl ${shader_file_prefix}/${name}.fragment.glsl ${shader_source_prefix}/${name}.hpp
        DEPENDS ${shader_file_prefix}/${name}.vertex.glsl
        DEPENDS ${shader_file_prefix}/${name}.fragment.glsl
        VERBATIM
     )
-    set(${VAR} ${${VAR}} ${shader_source_prefix}/${name}.vertex.hpp ${shader_source_prefix}/${name}.fragment.hpp PARENT_SCOPE)
+    set(${VAR} ${${VAR}} ${shader_source_prefix}/${name}.hpp PARENT_SCOPE)
 endfunction()
 
 add_shader(MBGL_SHADER_FILES circle)
diff --git a/cmake/test.cmake b/cmake/test.cmake
index 2a83a633c0..fc7a22874c 100644
--- a/cmake/test.cmake
+++ b/cmake/test.cmake
@@ -14,6 +14,7 @@ target_include_directories(mbgl-test
     PRIVATE test/include
     PRIVATE test/src
     PRIVATE platform/default
+    PRIVATE ${MBGL_GENERATED}/include
 )
 
 target_link_libraries(mbgl-test