X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=demos%2Fdesertpillars%2Fsource%2Fdesertpillars.h;h=352b8c2c0b2b09fdaa496e7191bcf6d1cefc80cb;hb=5aeec81a23bc83e90d5daa5eb7b08534c2e238d0;hp=0a3f2f2e336481598920722b76305d156dd5a80d;hpb=133ffb2c26dff240dbbda47c09b216951e07f5f5;p=libs%2Fgl.git

diff --git a/demos/desertpillars/source/desertpillars.h b/demos/desertpillars/source/desertpillars.h
index 0a3f2f2e..352b8c2c 100644
--- a/demos/desertpillars/source/desertpillars.h
+++ b/demos/desertpillars/source/desertpillars.h
@@ -5,6 +5,7 @@
 #include <msp/core/application.h>
 #include <msp/datafile/directorysource.h>
 #include <msp/gl/camera.h>
+#include <msp/gl/device.h>
 #include <msp/gl/environmentmap.h>
 #include <msp/gl/objectinstance.h>
 #include <msp/gl/orderedscene.h>
@@ -16,7 +17,6 @@
 #include <msp/gl/technique.h>
 #include <msp/gl/windowview.h>
 #include <msp/graphics/display.h>
-#include <msp/graphics/glcontext.h>
 #include <msp/graphics/window.h>
 #include <msp/input/keyboard.h>
 #include <msp/time/timestamp.h>
@@ -36,9 +36,10 @@ private:
 	{
 	private:
 		Msp::DataFile::DirectorySource source;
+		Msp::GL::ResourceManager res_mgr;
 
 	public:
-		Resources();
+		Resources(Msp::GL::ResourceManager *);
 	};
 
 	class MorphSphere: public Msp::GL::ObjectInstance
@@ -68,8 +69,9 @@ private:
 	Msp::Graphics::Display display;
 	Options opts;
 	Msp::Graphics::Window window;
-	Msp::Graphics::GLContext gl_ctx;
+	Msp::GL::Device gl_device;
 	Msp::Input::Keyboard keyboard;
+	Msp::GL::ResourceManager res_mgr;
 	Resources resources;
 
 	Msp::GL::WindowView view;