X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=demos%2Fdesertpillars%2Fsource%2Fdesertpillars.h;h=3171da8efb6e7288c9aa7e139b5d0c5894f70d67;hb=857e0a3f684fba4810260697a78a769dff514f1f;hp=4e4780991275243ebcc5abdc94e69c833e55c7c2;hpb=0bdf0d7be74940dd60274608d577e58d86f76496;p=libs%2Fgl.git

diff --git a/demos/desertpillars/source/desertpillars.h b/demos/desertpillars/source/desertpillars.h
index 4e478099..3171da8e 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>
@@ -27,7 +27,6 @@ private:
 	struct Options
 	{
 		Msp::Graphics::WindowOptions wnd_opts;
-		Msp::Graphics::GLOptions gl_opts;
 
 		Options();
 	};
@@ -36,7 +35,6 @@ private:
 	{
 	private:
 		Msp::DataFile::DirectorySource source;
-		Msp::GL::ResourceManager res_mgr;
 
 	public:
 		Resources(Msp::GL::ResourceManager *);
@@ -69,7 +67,7 @@ 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;