X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fpipelinestate.h;h=28624ed7ca64a5a0e5bba111cf45b27477bb11e5;hp=fda7ae1753853f43986a6d550fea58516c100120;hb=e1be82a4dfce8d90358c506f65be09da4dc9d5ec;hpb=99ca354f18119f82f1adeca100cd665a8f640317 diff --git a/source/core/pipelinestate.h b/source/core/pipelinestate.h index fda7ae17..28624ed7 100644 --- a/source/core/pipelinestate.h +++ b/source/core/pipelinestate.h @@ -3,20 +3,21 @@ #include #include +#include "blend.h" #include "cullface.h" +#include "depthtest.h" #include "pipelinestate_backend.h" #include "primitivetype.h" +#include "rect.h" +#include "stenciltest.h" namespace Msp { namespace GL { -class Blend; -class DepthTest; +class Buffer; class Framebuffer; class Program; -class Rect; class Sampler; -class StencilTest; class Texture; class UniformBlock; class VertexSetup; @@ -33,21 +34,25 @@ class PipelineState: public PipelineStateBackend private: struct BoundTexture { - unsigned binding; - mutable bool changed; - const Texture *texture; - const Sampler *sampler; + unsigned binding = 0; + mutable bool changed = false; + mutable bool used = false; + const Texture *texture = 0; + const Sampler *sampler = 0; + int level = -1; - BoundTexture(unsigned); + BoundTexture(unsigned b): binding(b) { } }; struct BoundUniformBlock { - int binding; - mutable bool changed; - const UniformBlock *block; + int binding = 0; + mutable bool changed = false; + mutable bool used = false; + const UniformBlock *block = 0; + const Buffer *buffer = 0; - BoundUniformBlock(int); + BoundUniformBlock(int b): binding(b) { } }; enum ChangeMask @@ -67,8 +72,8 @@ private: }; const Framebuffer *framebuffer = 0; - const Rect *viewport = 0; - const Rect *scissor = 0; + Rect viewport = Rect::max(); + Rect scissor = Rect::max(); const Program *shprog = 0; std::vector uniform_blocks; std::vector textures; @@ -76,29 +81,30 @@ private: PrimitiveType primitive_type = TRIANGLES; FaceWinding front_face = COUNTERCLOCKWISE; CullMode face_cull = NO_CULL; - const DepthTest *depth_test = 0; - const StencilTest *stencil_test = 0; - const Blend *blend = 0; + DepthTest depth_test; + StencilTest stencil_test; + Blend blend; template - void set(T &, T, unsigned); + void set(T &, const T &, unsigned); public: void set_framebuffer(const Framebuffer *); - void set_viewport(const Rect *); - void set_scissor(const Rect *); + void set_viewport(const Rect &); + void set_scissor(const Rect &); void set_shader_program(const Program *); void set_uniform_block(int, const UniformBlock *); void set_texture(unsigned, const Texture *, const Sampler *); + void set_texture(unsigned, const Texture *, int, const Sampler *); void set_vertex_setup(const VertexSetup *); void set_primitive_type(PrimitiveType); void set_front_face(FaceWinding); void set_face_cull(CullMode); - void set_depth_test(const DepthTest *); - void set_stencil_test(const StencilTest *); - void set_blend(const Blend *); + void set_depth_test(const DepthTest &); + void set_stencil_test(const StencilTest &); + void set_blend(const Blend &); const Framebuffer *get_framebuffer() const { return framebuffer; } - const Rect *get_viewport() const { return viewport; } + const Rect &get_viewport() const { return viewport; } const Program *get_shader_program() const { return shprog; } const VertexSetup *get_vertex_setup() const { return vertex_setup; } FaceWinding get_front_face() const { return front_face; }