Restructure ProgramData to support sharing between Programs

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

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index b95bd4bcfe1977c9ce327c0e5189883efd97800a..b0289284033f4935066db0aafdcb07638dc9c2f2 100644 (file)
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -1,13 +1,6 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2008, 2010-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/core/refptr.h>
 #include <msp/datafile/collection.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
+#include "error.h"
 #include "material.h"
 #include "renderpass.h"
 #include "program.h"
@@ -80,8 +73,6 @@ RenderPass::Loader::Loader(RenderPass &p, Collection &c):
 
 void RenderPass::Loader::init()
 {
-       allow_pointer_reload = false;
-
        add("shader",   &RenderPass::shprog);
        add("material", &Loader::material_inline);
        add("material", &Loader::material);
@@ -99,7 +90,7 @@ void RenderPass::Loader::material_inline()
 
 void RenderPass::Loader::material(const string &name)
 {
-       obj.material = get_collection().get<Material>(name);
+       obj.material = &get_collection().get<Material>(name);
        obj.material.keep();
 }
 
@@ -120,9 +111,9 @@ void RenderPass::Loader::texunit_named(unsigned i, const string &n)
 void RenderPass::Loader::uniforms()
 {
        if(!obj.shprog)
-               throw InvalidState("Can't load uniforms without a shader program");
+               throw invalid_operation("RenderPass::Loader::uniforms");
        if(!obj.shdata)
-               obj.shdata = new ProgramData(*obj.shprog);
+               obj.shdata = new ProgramData;
        load_sub(*obj.shdata);
 }
 
@@ -150,14 +141,14 @@ void RenderPass::TextureLoader::finish()
 
 void RenderPass::TextureLoader::texenv()
 {
-       throw Exception("TexEnvs can't be loaded yet");
+       throw runtime_error("TexEnvs can't be loaded yet");
        /*env = new TexEnv;
        load_sub(*env);*/
 }
 
 void RenderPass::TextureLoader::texture(const string &name)
 {
-       tex = get_collection().get<Texture>(name);
+       tex = &get_collection().get<Texture>(name);
        tex.keep();
 }