Move instanced pipeline setup to lambda from batch

Zach Pomerantz committed 10 years ago

Commit f0797d81 parent cb06d4a4 files · +10 −14Browse files

Showing the changes to libraries/render-utils/src/GeometryCache.cpp (1 of 4 files). Show all

Unified · Split

 static const size_t INSTANCE_COLOR_BUFFER = 0;
-template <typename F>
+void renderInstances(const std::string& name, gpu::Batch& batch, const glm::vec4& color,
-void renderInstances(const std::string& name, gpu::Batch& batch, const glm::vec4& color, const render::ShapePipelinePointer& pipeline, F f) {
+                    const render::ShapePipelinePointer& pipeline, gpu::Batch::NamedBatchData::Function f) {
+    // Add color to named buffer
     {
         gpu::BufferPointer instanceColorBuffer = batch.getNamedBuffer(name, INSTANCE_COLOR_BUFFER);
         auto compactColor = toCompactColor(color);
         instanceColorBuffer->append(compactColor);
     }
+    // Add call to named buffer
     batch.setupNamedCalls(name, [f, pipeline](gpu::Batch& batch, gpu::Batch::NamedBatchData& data) {
-        batch.setPipeline(pipeline->get(batch));
+        batch.setPipeline(pipeline->pipeline);
+        pipeline->prepare(batch);
         f(batch, data);
     });
 }