Use UBOs instead of glUniform. Work in progress; no clear wins seen yet.

[movit] / effect_chain.h

diff --git a/effect_chain.h b/effect_chain.h
index 718d5ff7830cde86c7fb192b77417278dd68f7cf..de50512f204b7f15fd67f9620307026c44fad528 100644 (file)
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -179,6 +179,10 @@ struct Phase {
        std::vector<Uniform<float> > uniforms_vec4;
        std::vector<Uniform<Eigen::Matrix3d> > uniforms_mat3;
 
+       GLuint ubo;  // GL_INVALID_INDEX if not using UBOs.
+       GLuint uniform_block_index;
+       std::vector<char> ubo_data;
+
        // For measurement of GPU time used.
        std::list<GLuint> timer_query_objects_running;
        std::list<GLuint> timer_query_objects_free;