X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fprogramdata.h;h=2eef750cf78f7d4ff821ee9c1354cb395d6b6933;hb=c8520aa336e92f2eaf9a38c3430c608520a90324;hp=474ca4e8d326d3bebbadb567cea32263175ffc5e;hpb=729a477b47e97aea41f3f0b5db551f02bf70d1ee;p=libs%2Fgl.git

diff --git a/source/render/programdata.h b/source/render/programdata.h
index 474ca4e8..2eef750c 100644
--- a/source/render/programdata.h
+++ b/source/render/programdata.h
@@ -1,7 +1,6 @@
 #ifndef MSP_GL_PROGRAMDATA_H_
 #define MSP_GL_PROGRAMDATA_H_
 
-#include <map>
 #include <stdexcept>
 #include <msp/datafile/objectloader.h>
 #include "datatype.h"
@@ -21,7 +20,6 @@ public:
 };
 
 class Buffer;
-class BufferBackedUniformBlock;
 class PipelineState;
 class Program;
 class UniformBlock;
@@ -103,12 +101,10 @@ private:
 	struct TaggedUniform
 	{
 		Tag tag;
-		DataType type;
-		unsigned array_size;
-		unsigned data_offset;
-		unsigned data_size;
-
-		TaggedUniform();
+		DataType type = VOID;
+		unsigned array_size = 0;
+		unsigned data_offset = 0;
+		unsigned data_size = 0;
 	};
 
 	struct SharedBlock