#include <msp/core/maputils.h>
+#include <msp/debug/demangle.h>
#include <msp/gl/extensions/arb_direct_state_access.h>
+#include <msp/io/print.h>
#include "buffer.h"
#include "color.h"
#include "error.h"
else if(name[name.size()-1]==']')
throw invalid_argument("ProgramData::uniform");
}
- catch(...)
+ catch(const exception &e)
{
delete uni;
+#ifdef DEBUG
+ IO::print(IO::cerr, "Error while setting uniform %s: %s: %s\n", name, Debug::demangle(typeid(e).name()), e.what());
+ return;
+#else
throw;
+#endif
}
int i = find_uniform_index(name);
return *uniforms[i].value;
}
+const Uniform *ProgramData::find_uniform(const string &name) const
+{
+ int i = find_uniform_index(name);
+ return (i>=0 ? uniforms[i].value : 0);
+}
+
bool ProgramData::uniform_name_compare(const NamedUniform &nu, const string &name)
{
return nu.name<name;
if(i==blocks.end())
{
bool any_found = false;
- for(vector<const Program::UniformInfo *>::const_iterator j=info.uniforms.begin(); (!any_found && j!=info.uniforms.end()); ++j)
- any_found = (find_uniform_index((*j)->name)>=0);
+ bool all_found = true;
+ for(vector<const Program::UniformInfo *>::const_iterator j=info.uniforms.begin(); j!=info.uniforms.end(); ++j)
+ {
+ if(find_uniform_index((*j)->name)>=0)
+ any_found = true;
+ else
+ all_found = false;
+ }
- // TODO throw if all uniforms for a buffer-backed block are not found
if(!any_found)
return 0;
+ else if(!all_found && info.bind_point>=0)
+ {
+#ifdef DEBUG
+ IO::print(IO::cerr, "Warning: not all uniforms for block %s are present\n", info.name);
+#else
+ throw incomplete_uniform_block(info.name);
+#endif
+ }
UniformBlock *block;
if(info.bind_point>=0)