X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture.h;h=80012f46846a7bd11746ed182fc2a56a21c8dfc5;hp=555d19ffee902f3d3457b9a831a1625b4819b03d;hb=6065f6622cc275dc0b20baaf7c267e71169d18f3;hpb=c4aeeced7b397d46772577775bd3a0d6c4706cba

diff --git a/source/core/texture.h b/source/core/texture.h
index 555d19ff..80012f46 100644
--- a/source/core/texture.h
+++ b/source/core/texture.h
@@ -1,14 +1,10 @@
 #ifndef MSP_GL_TEXTURE_H_
 #define MSP_GL_TEXTURE_H_
 
-#include <msp/core/attributes.h>
 #include <msp/datafile/objectloader.h>
 #include <msp/graphics/image.h>
-#include "datatype.h"
 #include "gl.h"
 #include "pixelformat.h"
-#include "predicate.h"
-#include "sampler.h"
 #include "resource.h"
 
 namespace Msp {
@@ -91,15 +87,11 @@ public:
 	/// Loads a Graphics::Image from a file and uploads it to the texture.
 	virtual void load_image(const std::string &, unsigned = 0);
 
-	DEPRECATED void load_image(const std::string &, bool srgb);
-
 	/** Uploads an image to the texture.  If storage has not been defined, it
 	will be set to match the image.  Otherwise the image must be compatible
 	with the defined storage.  Semantics depend on the type of texture.  */
 	virtual void image(const Graphics::Image &, unsigned = 0) = 0;
 
-	DEPRECATED void image(const Graphics::Image &, bool srgb);
-
 	GLenum get_target() const { return target; }
 	unsigned get_id() const { return id; }