-/* $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>
shprog(other.shprog),
shdata(other.shdata ? new ProgramData(*other.shdata) : 0),
material(other.material),
shprog(other.shprog),
shdata(other.shdata ? new ProgramData(*other.shdata) : 0),
material(other.material),
RenderPass::Loader::Loader(RenderPass &p):
DataFile::CollectionObjectLoader<RenderPass>(p, 0)
RenderPass::Loader::Loader(RenderPass &p):
DataFile::CollectionObjectLoader<RenderPass>(p, 0)
add("shader", &RenderPass::shprog);
add("material", &Loader::material_inline);
add("material", &Loader::material);
add("texunit", &Loader::texunit);
add("shader", &RenderPass::shprog);
add("material", &Loader::material_inline);
add("material", &Loader::material);
add("texunit", &Loader::texunit);
- throw InvalidState("Can't load uniforms without a shader program");
- if(!obj.shdata)
- obj.shdata = new ProgramData(*obj.shprog);
- load_sub(*obj.shdata);
+ throw invalid_operation("RenderPass::Loader::uniforms");
+ RefPtr<ProgramData> shd = new ProgramData;
+ load_sub(*shd);
+ obj.shdata = shd;