#include <msp/gl/extensions/arb_shader_objects.h>
#include <msp/gl/extensions/arb_uniform_buffer_object.h>
#include <msp/gl/extensions/arb_vertex_array_object.h>
+#include <msp/gl/extensions/ext_framebuffer_object.h>
#include <msp/gl/extensions/msp_primitive_restart.h>
#include "blend.h"
#include "buffer.h"
changes(0)
{
if(bound_tex_targets.empty())
- bound_tex_targets.resize(Limits::get_global().max_texture_bindings);
+ bound_tex_targets.resize(DeviceInfo::get_global().limits.max_texture_bindings);
if(bound_uniform_blocks.empty())
- bound_uniform_blocks.resize(Limits::get_global().max_uniform_bindings);
+ bound_uniform_blocks.resize(DeviceInfo::get_global().limits.max_uniform_bindings);
}
PipelineState::~PipelineState()
}
}
-void PipelineState::set_uniforms(const DefaultUniformBlock *block)
-{
- set_uniform_block_(-1, block);
-}
-
-void PipelineState::set_uniform_block(unsigned binding, const BufferBackedUniformBlock *block)
-{
- set_uniform_block_(binding, block);
-}
-
-void PipelineState::set_uniform_block_(int binding, const UniformBlock *block)
+void PipelineState::set_uniform_block(int binding, const UniformBlock *block)
{
auto i = lower_bound_member(uniform_blocks, binding, &BoundUniformBlock::binding);
if(i==uniform_blocks.end() || i->binding!=binding)
if(mask&CLIP_PLANES)
{
- unsigned max_clip_planes = Limits::get_global().max_clip_planes;
+ unsigned max_clip_planes = DeviceInfo::get_global().limits.max_clip_planes;
for(unsigned i=0; i<max_clip_planes; ++i)
{
if((enabled_clip_planes>>i)&1)
{
if(u.binding>=0)
{
- const BufferBackedUniformBlock *block = static_cast<const BufferBackedUniformBlock *>(u.block);
- glBindBufferRange(GL_UNIFORM_BUFFER, u.binding, block->get_buffer()->id, block->get_offset(), block->get_data_size());
+ glBindBufferRange(GL_UNIFORM_BUFFER, u.binding, u.block->get_buffer()->id, u.block->get_offset(), u.block->get_data_size());
bound_uniform_blocks[u.binding] = 1;
}
- else
- static_cast<const DefaultUniformBlock *>(u.block)->apply();
+ else if(shprog)
+ {
+ const char *data = static_cast<const char *>(u.block->get_data_pointer());
+ for(const Program::UniformCall &call: shprog->uniform_calls)
+ call.func(call.location, call.size, data+call.location*16);
+ }
}
u.changed = false;
glUseProgram(0);
glBindVertexArray(0);
- unsigned max_clip_planes = Limits::get_global().max_clip_planes;
+ unsigned max_clip_planes = DeviceInfo::get_global().limits.max_clip_planes;
for(unsigned i=0; i<max_clip_planes; ++i)
if((last_applied->enabled_clip_planes>>i)&1)
glDisable(GL_CLIP_PLANE0+i);