-#include <msp/gl/extensions/arb_shader_objects.h>
#include "buffer.h"
#include "color.h"
#include "error.h"
last_block(0),
buffer(0),
changes(NO_CHANGES)
-{
- static Require _req(ARB_shader_objects);
-}
+{ }
// Blocks are intentionally left uncopied
ProgramData::ProgramData(const ProgramData &other):
void ProgramData::uniform(const string &name, const Matrix &m)
{
- float v[16];
- copy(m.data(), m.data()+16, v);
- uniform_matrix4(name, v);
+ uniform_matrix4(name, m.data());
}
void ProgramData::uniform_matrix4(const string &name, const float *v)
changes = NO_CHANGES;
}
- unsigned layout_hash = (info ? info->layout_hash : prog.get_uniform_layout_hash());
+ Program::LayoutHash layout_hash = (info ? info->layout_hash : prog.get_uniform_layout_hash());
- map<unsigned, Block>::iterator i = blocks.find(layout_hash);
+ map<Program::LayoutHash, Block>::iterator i = blocks.find(layout_hash);
if(i==blocks.end())
{
i = blocks.insert(BlockMap::value_type(layout_hash, Block())).first;