Use standard fixed-size integer types

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

diff --git a/source/render/programdata.cpp b/source/render/programdata.cpp
index 915444d8595e379e8edd250f61c1cc9df73018b8..1ef013ddac86e5a6be72643fe711764f01428d30 100644 (file)
--- a/source/render/programdata.cpp
+++ b/source/render/programdata.cpp
@@ -521,12 +521,12 @@ vector<ProgramData::ProgramBlock>::iterator ProgramData::get_program(const Progr
 
 void ProgramData::update_block_uniform_indices(SharedBlock &block, const Program::UniformBlockInfo &info) const
 {
-       UInt8 *indices = block.indices.values;
+       uint8_t *indices = block.indices.values;
        if(info.uniforms.size()>16)
        {
                if(block.indices.type_flag==0xFD)
                {
-                       block.indices.dynamic.values = new UInt8[info.uniforms.size()];
+                       block.indices.dynamic.values = new uint8_t[info.uniforms.size()];
                        block.indices.type_flag = 0xFE;
                }
                indices = block.indices.dynamic.values;
@@ -588,7 +588,7 @@ void ProgramData::update_block_uniform_indices(SharedBlock &block, const Program
 
 void ProgramData::update_block(SharedBlock &block, const Program::UniformBlockInfo &info) const
 {
-       const UInt8 *indices = block.get_uniform_indices();
+       const uint8_t *indices = block.get_uniform_indices();
        for(unsigned i=0; i<info.uniforms.size(); ++i)
        {
                if(is_image(info.uniforms[i]->type))
@@ -734,7 +734,7 @@ ProgramData::SharedBlock::SharedBlock(Program::LayoutHash h):
        indices.type_flag = 0xFD;
 }
 
-const UInt8 *ProgramData::SharedBlock::get_uniform_indices() const
+const uint8_t *ProgramData::SharedBlock::get_uniform_indices() const
 {
        return (indices.type_flag==0xFE ? indices.dynamic.values : indices.values);
 }