Remove support for inline textures in RenderPass

[libs/gl.git] / source / renderpass.cpp

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index b6eb1d954a958990716a730fd90702ee5341f092..97a0970b6f627e55d958f2860e7d16155807f3bd 100644 (file)
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -248,31 +248,11 @@ RenderPass::TextureLoader::TextureLoader(Texturing &t, unsigned i, Collection *c
        index(i)
 {
        add("texture",   &TextureLoader::texture);
-       add("texture2d", &TextureLoader::texture2d);
-}
-
-void RenderPass::TextureLoader::finish()
-{
-       if(tex)
-       {
-               obj.attach(index, *tex);
-               tex.release();
-       }
 }
 
 void RenderPass::TextureLoader::texture(const string &name)
 {
-       tex = &get_collection().get<Texture>(name);
-       tex.keep();
-}
-
-void RenderPass::TextureLoader::texture2d()
-{
-       tex = new Texture2D;
-       if(coll)
-               load_sub(static_cast<Texture2D &>(*tex), get_collection());
-       else
-               load_sub(static_cast<Texture2D &>(*tex));
+       obj.attach(index, get_collection().get<Texture>(name));
 }
 
 } // namespace GL