Introduce a typedef for uniform layout hashes in Program

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

diff --git a/source/programdata.cpp b/source/programdata.cpp
index 1287914005055ff91bb2102260daf4b28d50e710..0beb9e7f6cb85d1f095def0cbe93063c64dd0a62 100644 (file)
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -1,4 +1,3 @@
-#include <msp/gl/extensions/arb_shader_objects.h>
 #include "buffer.h"
 #include "color.h"
 #include "error.h"
@@ -18,9 +17,7 @@ ProgramData::ProgramData():
        last_block(0),
        buffer(0),
        changes(NO_CHANGES)
-{
-       static Require _req(ARB_shader_objects);
-}
+{ }
 
 // Blocks are intentionally left uncopied
 ProgramData::ProgramData(const ProgramData &other):
@@ -217,9 +214,9 @@ const UniformBlock *ProgramData::get_block(const Program &prog, const Program::U
                changes = NO_CHANGES;
        }
 
-       unsigned layout_hash = (info ? info->layout_hash : prog.get_uniform_layout_hash());
+       Program::LayoutHash layout_hash = (info ? info->layout_hash : prog.get_uniform_layout_hash());
 
-       map<unsigned, Block>::iterator i = blocks.find(layout_hash);
+       map<Program::LayoutHash, Block>::iterator i = blocks.find(layout_hash);
        if(i==blocks.end())
        {
                i = blocks.insert(BlockMap::value_type(layout_hash, Block())).first;