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

diff --git a/source/render/programdata.h b/source/render/programdata.h
index 474ca4e8..4e8ee373 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
@@ -155,12 +151,12 @@ private:
 	const Program *tied_program;
 	std::vector<TaggedUniform> uniforms;
 	std::vector<char> uniform_data;
-	unsigned generation;
+	unsigned generation = 0;
 	mutable std::vector<SharedBlock> blocks;
 	mutable std::vector<ProgramBlock> programs;
-	mutable UniformBlock *last_buffer_block;
-	mutable Buffer *buffer;
-	mutable Mask dirty;
+	mutable UniformBlock *last_buffer_block = 0;
+	mutable Buffer *buffer = 0;
+	mutable Mask dirty = 0;
 	std::string debug_name;
 
 public: