X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fpipelinestate.h;h=68983d11c1d7f3d00ef3d3656bf487c396c6f6ce;hb=acaefb4c669f01855252818ef0a2958cbdababc3;hp=b9fac143c7b9784773970b5710de7f9bdb9e80d8;hpb=3e38e8a7bfffb0b6d622b849b402f4f04a7536c4;p=libs%2Fgl.git diff --git a/source/core/pipelinestate.h b/source/core/pipelinestate.h index b9fac143..68983d11 100644 --- a/source/core/pipelinestate.h +++ b/source/core/pipelinestate.h @@ -9,8 +9,6 @@ namespace Msp { namespace GL { class Blend; -class BufferBackedUniformBlock; -class DefaultUniformBlock; class DepthTest; class Framebuffer; class Program; @@ -96,11 +94,7 @@ public: void set_face_cull(CullMode); void set_enabled_clip_planes(unsigned); void set_texture(unsigned, const Texture *, const Sampler *); - void set_uniforms(const DefaultUniformBlock *); - void set_uniform_block(unsigned, const BufferBackedUniformBlock *); -private: - void set_uniform_block_(int, const UniformBlock *); -public: + void set_uniform_block(int, const UniformBlock *); void set_depth_test(const DepthTest *); void set_stencil_test(const StencilTest *); void set_blend(const Blend *);