X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources%2Fresources.h;h=37de5d8cfc80482badc99343ff617dd21d0ff692;hb=dbc91b65728ab9c0e574bb1127cfe4d2da55de7f;hp=5861bbfb41259a8a910e87f55a2ad78498706c81;hpb=2108712bcde8b5c4573ca4d602d5f8948b810d72;p=libs%2Fgl.git

diff --git a/source/resources/resources.h b/source/resources/resources.h
index 5861bbfb..37de5d8c 100644
--- a/source/resources/resources.h
+++ b/source/resources/resources.h
@@ -32,19 +32,18 @@ public:
 	};
 
 private:
-	TextureFilter default_tex_filter;
-	float default_tex_anisotropy;
 	bool srgb_conversion;
 	ResourceManager *resource_manager;
 
+	static Resources *global_resources;
+
 public:
-	Resources();
+	Resources(bool = true);
+	virtual ~Resources();
 
+	static Resources &get_global();
 	static const DataFile::CollectionSource &get_builtins();
 
-	void set_default_texture_filter(TextureFilter);
-	void set_default_texture_anisotropy(float);
-
 	/** Enables or disables sRGB conversion.  If enabled, textures and material
 	colors are converted from sRGB to linear color space when loaded. */
 	DEPRECATED void set_srgb_conversion(bool);
@@ -60,6 +59,9 @@ protected:
 	Texture2D *create_texture2d(const std::string &);
 	Module *create_module(const std::string &);
 	Program *create_program(const std::string &);
+
+	template<typename T>
+	void set_debug_name(const std::string &, T &);
 };
 
 } // namespace GL