Use standard fixed-size integer types

[libs/gl.git] / source / render / programdata.h

diff --git a/source/render/programdata.h b/source/render/programdata.h
index aeffae45700726f9bc5bd9c7fbc350477486eb90..1bcd3aab42c6ea2158f5beb0fbdcaab8f200720e 100644 (file)
--- a/source/render/programdata.h
+++ b/source/render/programdata.h
@@ -23,6 +23,7 @@ public:
 
 class Buffer;
 class BufferBackedUniformBlock;
+class PipelineState;
 class UniformBlock;
 struct Color;
 
@@ -117,18 +118,18 @@ private:
                UniformBlock *block;
                union
                {
-                       UInt8 type_flag;
-                       UInt8 values[16];
+                       std::uint8_t type_flag;
+                       std::uint8_t values[16];
                        struct
                        {
-                               UInt8 type_flag;
-                               UInt8 *values;
+                               std::uint8_t type_flag;
+                               std::uint8_t *values;
                        } dynamic;
                } indices;
 
                SharedBlock(Program::LayoutHash);
 
-               const UInt8 *get_uniform_indices() const;
+               const std::uint8_t *get_uniform_indices() const;
        };
 
        struct ProgramBlock
@@ -158,6 +159,7 @@ private:
        mutable BufferBackedUniformBlock *last_buffer_block;
        mutable Buffer *buffer;
        mutable Mask dirty;
+       std::string debug_name;
 
 public:
        ProgramData(const Program * = 0);
@@ -248,10 +250,11 @@ private:
        void update_block_uniform_indices(SharedBlock &, const Program::UniformBlockInfo &) const;
        void update_block(SharedBlock &, const Program::UniformBlockInfo &) const;
 
+       std::vector<ProgramBlock>::const_iterator prepare_program(const Program &) const;
 public:
-       /** Applies uniform blocks for the currently bound program, creating them
-       if needed. */
-       void apply() const;
+       void apply(const Program &, PipelineState &) const;
+
+       void set_debug_name(const std::string &);
 };
 
 template<typename T, unsigned N>