Make RenderPass shprog and shdata settable from code

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

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index b0289284033f4935066db0aafdcb07638dc9c2f2..de5ac07f8f6bcf34356eab49bb693c6c26d3ecde 100644 (file)
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -32,10 +32,16 @@ RenderPass::RenderPass(const RenderPass &other):
 
 RenderPass::~RenderPass()
 {
-       delete shdata;
        delete texturing;
 }
 
+void RenderPass::set_shader_program(const Program *prog, const ProgramData *data)
+{
+       shprog = prog;
+       shdata = data;
+       shdata.keep();
+}
+
 void RenderPass::set_material(const Material *mat)
 {
        material = mat;
@@ -112,9 +118,9 @@ void RenderPass::Loader::uniforms()
 {
        if(!obj.shprog)
                throw invalid_operation("RenderPass::Loader::uniforms");
-       if(!obj.shdata)
-               obj.shdata = new ProgramData;
-       load_sub(*obj.shdata);
+       RefPtr<ProgramData> shd = new ProgramData;
+       load_sub(*shd);
+       obj.shdata = shd;
 }