Remove the deprecated ProgramBuilder class

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

diff --git a/source/renderpass.h b/source/renderpass.h
index 428c74ce7b1f280046e4268b66ec7005d2cf7a4c..9e704376a446b56abb056edf0d1aab803a269f7d 100644 (file)
--- a/source/renderpass.h
+++ b/source/renderpass.h
@@ -11,14 +11,13 @@ class Material;
 class Program;
 class ProgramData;
 class Renderer;
+class Sampler;
 class Texture;
 class Texturing;
 
 /**
 Encapsulates the data that determines the appearance of a rendered surface.
 This includes shader and data for it, material and texturing.
-
-XXX Does not delete inline texture from datafiles properly
 */
 class RenderPass
 {
@@ -48,15 +47,16 @@ private:
        {
        private:
                unsigned index;
-               RefPtr<Texture> tex;
+               const Texture *tex;
+               const Sampler *samp;
 
        public:
                TextureLoader(Texturing &, unsigned, Collection *);
        private:
                virtual void finish();
 
+               void sampler(const std::string &);
                void texture(const std::string &);
-               void texture2d();
        };
 
        RefPtr<const Program> shprog;