Check uniform names when loading RenderPasses

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

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index 45ed6af7b579e2071209590864535d474b1ae7f6..4b458f6d5f9b57ca555b542e4724ed3b08d0b5ae 100644 (file)
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -32,6 +32,17 @@ RenderPass::RenderPass(const RenderPass &other):
        back_faces(other.back_faces)
 { }
 
+RenderPass &RenderPass::operator=(const RenderPass &other)
+{
+       shprog = other.shprog;
+       shdata = other.shdata ? new ProgramData(*other.shdata) : 0;
+       material = other.material;
+       texturing = other.texturing ? new Texturing(*other.texturing) : 0;
+       tex_names = other.tex_names;
+       back_faces = other.back_faces;
+       return *this;
+}
+
 RenderPass::~RenderPass()
 {
        delete texturing;
@@ -132,7 +143,7 @@ void RenderPass::Loader::uniforms()
 {
        if(!obj.shprog)
                throw invalid_operation("RenderPass::Loader::uniforms");
-       RefPtr<ProgramData> shd = new ProgramData;
+       RefPtr<ProgramData> shd = new ProgramData(obj.shprog);
        load_sub(*shd);
        obj.shdata = shd;
 }