Pass the UniformBlockInfo to get_block to avoid an unnecessary lookup

[libs/gl.git] / source / programdata.h

diff --git a/source/programdata.h b/source/programdata.h
index 885804f010e16d868e7ab551caccb1b144824395..4d80bb775afc92f20c05714c998399909a2299a7 100644 (file)
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -3,6 +3,7 @@
 
 #include <map>
 #include <msp/datafile/objectloader.h>
+#include "program.h"
 
 namespace Msp {
 namespace GL {
@@ -10,7 +11,6 @@ namespace GL {
 class Buffer;
 class Color;
 class Matrix;
-class Program;
 class Uniform;
 class UniformBlock;
 class Vector3;
@@ -81,6 +81,9 @@ public:
        void uniform4_array(const std::string &, unsigned, const float *);
        void uniform_matrix4_array(const std::string &, unsigned, const float *);
 
+private:
+       const UniformBlock &get_block(const Program &, const Program::UniformBlockInfo *) const;
+public:
        const UniformBlock &get_block(const Program &, const std::string &) const;
 
        void apply() const;