1 files changed, 61 insertions, 3 deletions
diff --git a/src/mbgl/gl/program.hpp b/src/mbgl/gl/program.hpp
index ea4dbcc1df..929237037b 100644
--- a/src/mbgl/gl/program.hpp
+++ b/src/mbgl/gl/program.hpp
@@ -3,21 +3,28 @@
 #include <mbgl/gl/types.hpp>
 #include <mbgl/gl/object.hpp>
 #include <mbgl/gl/context.hpp>
+#include <mbgl/gl/vertex_buffer.hpp>
+#include <mbgl/gl/index_buffer.hpp>
+#include <mbgl/gl/attribute.hpp>
+#include <mbgl/gl/uniform.hpp>
 
 #include <string>
 
 namespace mbgl {
 namespace gl {
 
-template <class As, class Us>
+template <class P, class As, class Us>
 class Program {
 public:
+    using Primitive = P;
     using Attributes = As;
-    using Vertex = typename Attributes::Vertex;
-
     using Uniforms = Us;
+
+    using Vertex = typename Attributes::Vertex;
     using UniformValues = typename Uniforms::Values;
 
+    static_assert(std::is_standard_layout<Vertex>::value, "vertex type must use standard layout");
+
     Program(Context& context, const std::string& vertexSource, const std::string& fragmentSource)
         : vertexShader(context.createShader(ShaderType::Vertex, vertexSource)),
           fragmentShader(context.createShader(ShaderType::Fragment, fragmentSource)),
@@ -25,6 +32,57 @@ public:
           attributesState(Attributes::state(program)),
           uniformsState(Uniforms::state(program)) {}
 
+    // Indexed drawing.
+    template <class DrawMode>
+    void draw(Context& context,
+              DrawMode drawMode,
+              DepthMode depthMode,
+              StencilMode stencilMode,
+              ColorMode colorMode,
+              UniformValues&& uniformValues,
+              const VertexBuffer<Vertex>& vertexBuffer,
+              const IndexBuffer<DrawMode>& indexBuffer,
+              const std::vector<Segment>& segments) {
+        static_assert(std::is_same<Primitive, typename DrawMode::Primitive>::value, "incompatible draw mode");
+        context.draw({
+            std::move(drawMode),
+            std::move(depthMode),
+            std::move(stencilMode),
+            std::move(colorMode),
+            program,
+            vertexBuffer.buffer,
+            indexBuffer.buffer,
+            segments,
+            Uniforms::binder(uniformsState, std::move(uniformValues)),
+            Attributes::binder(attributesState)
+        });
+    }
+
+    // Unindexed drawing.
+    template <class DrawMode>
+    void draw(Context& context,
+              DrawMode drawMode,
+              DepthMode depthMode,
+              StencilMode stencilMode,
+              ColorMode colorMode,
+              UniformValues&& uniformValues,
+              const VertexBuffer<Vertex, DrawMode>& vertexBuffer) {
+        static_assert(std::is_same<Primitive, typename DrawMode::Primitive>::value, "incompatible draw mode");
+        context.draw({
+            std::move(drawMode),
+            std::move(depthMode),
+            std::move(stencilMode),
+            std::move(colorMode),
+            program,
+            vertexBuffer.buffer,
+            0,
+            {{ 0, 0, vertexBuffer.vertexCount, 0 }},
+            Uniforms::binder(uniformsState, std::move(uniformValues)),
+            Attributes::binder(attributesState)
+        });
+    }
+
+private:
     UniqueShader vertexShader;
     UniqueShader fragmentShader;
     UniqueProgram program;