Add a texunit statement which automatically determines the unit number

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

diff --git a/source/renderpass.h b/source/renderpass.h
index 34c315b3a2c0cc797031c024d2b1f315906bff7d..d4f7a34d1a5887b12edb8af57bb81b8e2a5db462 100644 (file)
--- a/source/renderpass.h
+++ b/source/renderpass.h
@@ -3,7 +3,6 @@
 
 #include <msp/core/refptr.h>
 #include <msp/datafile/objectloader.h>
-#include "bindable.h"
 
 namespace Msp {
 namespace GL {
@@ -32,9 +31,11 @@ public:
 
        private:
                void init();
+
                void material_inline();
                void material(const std::string &);
                void texunit(unsigned);
+               void texunit_auto(const std::string &);
                void texunit_named(unsigned, const std::string &);
                void uniforms();
                void uniform_slot(const std::string &);
@@ -58,7 +59,7 @@ private:
        };
 
        const Program *shprog;
-       ProgramData *shdata;
+       RefPtr<ProgramData> shdata;
        std::map<std::string, std::string> uniform_slots;
        RefPtr<const Material> material;
        std::string material_slot;
@@ -72,9 +73,13 @@ public:
        RenderPass &operator=(const RenderPass &);
        ~RenderPass();
 
+private:
+       void ensure_private_shader_data();
+
+public:
        void set_shader_program(const Program *, const ProgramData *);
        const Program *get_shader_program() const { return shprog; }
-       const ProgramData *get_shader_data() const { return shdata; }
+       const ProgramData *get_shader_data() const { return shdata.get(); }
        const std::string &get_slotted_uniform_name(const std::string &) const;
        void set_material(const Material *);
        const Material *get_material() const { return material.get(); }