Index: trunk/tests/render_test/rl.cc
===================================================================
--- trunk/tests/render_test/rl.cc	(revision 89)
+++ trunk/tests/render_test/rl.cc	(revision 90)
@@ -1,4 +1,3 @@
 #include <nv/lib/sdl12.hh>
-#include <nv/lib/sdl_image.hh>
 #include <nv/interface/vertex_buffer.hh>
 #include <nv/gl/gl_device.hh>
@@ -87,9 +86,8 @@
 	m_window = m_device->create_window( 800, 600 );
 	
-	nv::load_sdl_image_library();
-	SDL_Surface* texture = IMG_Load( "spritesheet.png" );
-	nv::image sprites( glm::ivec2( texture->w, texture->h ), 4, (nv::uint8*)texture->pixels );
+	nv::image_data* sprites = m_device->create_image_data( "spritesheet.png" );
 	nv::sampler sampler( nv::sampler::NEAREST, nv::sampler::REPEAT );
-	m_texture = m_device->create_texture2d( sprites.get_size(), nv::RGBA, nv::UBYTE, sampler, (void*)sprites.get_data() );
+	m_texture = m_device->create_texture2d( sprites->get_size(), nv::RGBA, nv::UBYTE, sampler, (void*)sprites->get_data() );
+	delete sprites;
 
 	m_clear_state.buffers = nv::clear_state::COLOR_AND_DEPTH_BUFFER;