#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"
{
try
{
- if(tied_program)
- tied_program->get_uniform_info(name);
- else if(name[name.size()-1]==']')
- throw invalid_argument("ProgramData::uniform");
+ if(!validate_name(name))
+ {
+ delete uni;
+ return;
+ }
}
catch(...)
{
}
int i = find_uniform_index(name);
- if(i>=0)
- {
- uniforms[i].replace_value(uni);
+ if(i<0)
+ return add_uniform(name, uni);
- if(static_cast<unsigned>(i)<MASK_BITS)
- dirty |= 1<<i;
- else // Force a full update if the mask isn't wide enough
- dirty = ALL_ONES;
+ uniforms[i].replace_value(uni);
+ dirty |= 1<<i;
+}
+template<typename T, typename V>
+void ProgramData::uniform(const string &name, V value)
+{
+ if(!validate_name(name))
return;
+
+ int i = find_uniform_index(name);
+ if(i<0)
+ return add_uniform(name, new T(value));
+
+ if(T *uni = dynamic_cast<T *>(uniforms[i].value))
+ uni->set(value);
+ else
+ uniforms[i].replace_value(new T(value));
+
+ dirty |= 1<<i;
+}
+
+template<typename T, typename V>
+void ProgramData::uniform_array(const string &name, unsigned n, V value)
+{
+ if(!validate_name(name))
+ return;
+
+ int i = find_uniform_index(name);
+ if(i<0)
+ return add_uniform(name, new UniformArray<T>(n, value));
+
+ UniformArray<T> *uni = dynamic_cast<UniformArray<T> *>(uniforms[i].value);
+ if(uni && n==uni->size())
+ uni->set(value);
+ else
+ uniforms[i].replace_value(new UniformArray<T>(n, value));
+
+ dirty |= 1<<i;
+}
+
+bool ProgramData::validate_name(const string &name) const
+{
+#ifdef DEBUG
+ try
+#endif
+ {
+ if(tied_program)
+ tied_program->get_uniform_info(name);
+ else if(name[name.size()-1]==']')
+ throw invalid_argument("ProgramData::uniform");
+ return true;
+ }
+#ifdef DEBUG
+ catch(const exception &e)
+ {
+ IO::print(IO::cerr, "Error while setting uniform %s: %s: %s\n", name, Debug::demangle(typeid(e).name()), e.what());
+ return false;
+ }
+#endif
+}
+
+void ProgramData::add_uniform(const string &name, Uniform *uni)
+{
+ if(uniforms.size()>=MASK_BITS)
+ {
+ delete uni;
+ throw too_many_uniforms(name);
}
vector<NamedUniform>::iterator j = lower_bound(uniforms.begin(), uniforms.end(), name, uniform_name_compare);
void ProgramData::uniform(const string &name, int v)
{
- uniform(name, new Uniform1i(v));
+ uniform<Uniform1i>(name, v);
}
void ProgramData::uniform(const string &name, float v)
{
- uniform(name, new Uniform1f(v));
+ uniform<Uniform1f>(name, v);
}
void ProgramData::uniform(const string &name, int v0, int v1)
void ProgramData::uniform2(const string &name, const int *v)
{
- uniform(name, new Uniform2i(v));
+ uniform<Uniform2i>(name, v);
}
void ProgramData::uniform2(const string &name, const float *v)
{
- uniform(name, new Uniform2f(v));
+ uniform<Uniform2f>(name, v);
}
void ProgramData::uniform(const string &name, int v0, int v1, int v2)
void ProgramData::uniform3(const string &name, const int *v)
{
- uniform(name, new Uniform3i(v));
+ uniform<Uniform3i>(name, v);
}
void ProgramData::uniform3(const string &name, const float *v)
{
- uniform(name, new Uniform3f(v));
+ uniform<Uniform3f>(name, v);
}
void ProgramData::uniform(const string &name, int v0, int v1, int v2, int v3)
void ProgramData::uniform4(const string &name, const int *v)
{
- uniform(name, new Uniform4i(v));
+ uniform<Uniform4i>(name, v);
}
void ProgramData::uniform4(const string &name, const float *v)
{
- uniform(name, new Uniform4f(v));
+ uniform<Uniform4f>(name, v);
}
void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 2, 2> &m)
void ProgramData::uniform_matrix2(const string &name, const float *v)
{
- uniform(name, new UniformMatrix2x2f(v));
+ uniform<UniformMatrix2x2f>(name, v);
}
void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 2, 3> &m)
void ProgramData::uniform_matrix3x2(const string &name, const float *v)
{
- uniform(name, new UniformMatrix3x2f(v));
+ uniform<UniformMatrix3x2f>(name, v);
}
void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 2, 4> &m)
void ProgramData::uniform_matrix4x2(const string &name, const float *v)
{
- uniform(name, new UniformMatrix4x2f(v));
+ uniform<UniformMatrix4x2f>(name, v);
}
void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 3, 2> &m)
void ProgramData::uniform_matrix2x3(const string &name, const float *v)
{
- uniform(name, new UniformMatrix2x3f(v));
+ uniform<UniformMatrix2x3f>(name, v);
}
void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 3, 3> &m)
void ProgramData::uniform_matrix3(const string &name, const float *v)
{
- uniform(name, new UniformMatrix3x3f(v));
+ uniform<UniformMatrix3x3f>(name, v);
}
void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 3, 4> &m)
void ProgramData::uniform_matrix4x3(const string &name, const float *v)
{
- uniform(name, new UniformMatrix4x3f(v));
+ uniform<UniformMatrix4x3f>(name, v);
}
void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 4, 2> &m)
void ProgramData::uniform_matrix2x4(const string &name, const float *v)
{
- uniform(name, new UniformMatrix2x4f(v));
+ uniform<UniformMatrix2x4f>(name, v);
}
void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 4, 3> &m)
void ProgramData::uniform_matrix3x4(const string &name, const float *v)
{
- uniform(name, new UniformMatrix3x4f(v));
+ uniform<UniformMatrix3x4f>(name, v);
}
void ProgramData::uniform(const string &name, const Matrix &m)
void ProgramData::uniform_matrix4(const string &name, const float *v)
{
- uniform(name, new UniformMatrix4x4f(v));
+ uniform<UniformMatrix4x4f>(name, v);
}
void ProgramData::uniform1_array(const string &name, unsigned n, const int *v)
{
- uniform(name, new UniformArray<Uniform1i>(n, v));
+ uniform_array<Uniform1i>(name, n, v);
}
void ProgramData::uniform1_array(const string &name, unsigned n, const float *v)
{
- uniform(name, new UniformArray<Uniform1f>(n, v));
+ uniform_array<Uniform1f>(name, n, v);
}
void ProgramData::uniform2_array(const string &name, unsigned n, const int *v)
{
- uniform(name, new UniformArray<Uniform2i>(n, v));
+ uniform_array<Uniform2i>(name, n, v);
}
void ProgramData::uniform2_array(const string &name, unsigned n, const float *v)
{
- uniform(name, new UniformArray<Uniform2f>(n, v));
+ uniform_array<Uniform2f>(name, n, v);
}
void ProgramData::uniform3_array(const string &name, unsigned n, const int *v)
{
- uniform(name, new UniformArray<Uniform3i>(n, v));
+ uniform_array<Uniform3i>(name, n, v);
}
void ProgramData::uniform3_array(const string &name, unsigned n, const float *v)
{
- uniform(name, new UniformArray<Uniform3f>(n, v));
+ uniform_array<Uniform3f>(name, n, v);
}
void ProgramData::uniform4_array(const string &name, unsigned n, const int *v)
{
- uniform(name, new UniformArray<Uniform4i>(n, v));
+ uniform_array<Uniform4i>(name, n, v);
}
void ProgramData::uniform4_array(const string &name, unsigned n, const float *v)
{
- uniform(name, new UniformArray<Uniform4f>(n, v));
+ uniform_array<Uniform4f>(name, n, v);
}
void ProgramData::uniform_matrix2_array(const string &name, unsigned n, const float *v)
{
- uniform(name, new UniformArray<UniformMatrix2x2f>(n, v));
+ uniform_array<UniformMatrix2x2f>(name, n, v);
}
void ProgramData::uniform_matrix3x2_array(const string &name, unsigned n, const float *v)
{
- uniform(name, new UniformArray<UniformMatrix3x2f>(n, v));
+ uniform_array<UniformMatrix3x2f>(name, n, v);
}
void ProgramData::uniform_matrix4x2_array(const string &name, unsigned n, const float *v)
{
- uniform(name, new UniformArray<UniformMatrix4x2f>(n, v));
+ uniform_array<UniformMatrix4x2f>(name, n, v);
}
void ProgramData::uniform_matrix2x3_array(const string &name, unsigned n, const float *v)
{
- uniform(name, new UniformArray<UniformMatrix2x3f>(n, v));
+ uniform_array<UniformMatrix2x3f>(name, n, v);
}
void ProgramData::uniform_matrix3_array(const string &name, unsigned n, const float *v)
{
- uniform(name, new UniformArray<UniformMatrix3x3f>(n, v));
+ uniform_array<UniformMatrix3x3f>(name, n, v);
}
void ProgramData::uniform_matrix4x3_array(const string &name, unsigned n, const float *v)
{
- uniform(name, new UniformArray<UniformMatrix4x3f>(n, v));
+ uniform_array<UniformMatrix4x3f>(name, n, v);
}
void ProgramData::uniform_matrix2x4_array(const string &name, unsigned n, const float *v)
{
- uniform(name, new UniformArray<UniformMatrix2x4f>(n, v));
+ uniform_array<UniformMatrix2x4f>(name, n, v);
}
void ProgramData::uniform_matrix3x4_array(const string &name, unsigned n, const float *v)
{
- uniform(name, new UniformArray<UniformMatrix3x4f>(n, v));
+ uniform_array<UniformMatrix3x4f>(name, n, v);
}
void ProgramData::uniform_matrix4_array(const string &name, unsigned n, const float *v)
{
- uniform(name, new UniformArray<UniformMatrix4x4f>(n, v));
+ uniform_array<UniformMatrix4x4f>(name, n, v);
}
void ProgramData::remove_uniform(const string &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)
{
if(!buffer)
- {
buffer = new Buffer(UNIFORM_BUFFER);
- buffer->set_usage(STREAM_DRAW);
- }
block = new UniformBlock(info.data_size);
block->use_buffer(buffer, last_block);
{
/* If the global dirty flag affects this program, add it to per-program
dirty flags and clear the global flag. A previously unseen program will
- always cause this to happen. */
+ cause this to happen if there's any dirty uniforms. */
if(affected)
{
for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i)
const Program::UniformBlockMap &prog_blocks = prog->get_uniform_blocks();
+ UniformBlock *old_last_block = last_block;
if(pu.dirty==ALL_ONES)
{
/* The set of uniforms has changed since this program was last used.
to avoid state thrashing. */
if(buffered_blocks_updated && !ARB_direct_state_access)
buffer->bind();
+
+ if(last_block!=old_last_block)
+ {
+ unsigned required_size = last_block->get_required_buffer_size();
+ if(last_block->get_required_buffer_size()>buffer->get_size())
+ {
+ if(buffer->get_size()>0)
+ {
+ delete buffer;
+ buffer = new Buffer(UNIFORM_BUFFER);
+ last_block->change_buffer(buffer);
+ }
+
+ buffer->storage(required_size);
+ }
+ }
}
for(vector<ProgramBlock>::iterator i=pu.blocks.begin(); i!=pu.blocks.end(); ++i)
projects / libs / gl.git / blobdiff