Remove the misc.h header

[libs/gl.git] / source / core / texture.h

diff --git a/source/core/texture.h b/source/core/texture.h
index 80012f46846a7bd11746ed182fc2a56a21c8dfc5..6d474b8864ec392375041e47821ca29016d66006 100644 (file)
--- a/source/core/texture.h
+++ b/source/core/texture.h
@@ -21,6 +21,8 @@ can be used for texture minification; see the Sampler class for details.
 */
 class Texture: public Resource
 {
+       friend class Framebuffer;
+       friend class PipelineState;
 protected:
        class Loader: public DataFile::CollectionObjectLoader<Texture>
        {
@@ -64,7 +66,7 @@ protected:
        bool auto_gen_mipmap;
        std::string debug_name;
 
-       static int swizzle_orders[];
+       static const int swizzle_orders[];
        static Texture *scratch_binding;
 
        Texture(GLenum, ResourceManager * = 0);
@@ -92,9 +94,6 @@ public:
        with the defined storage.  Semantics depend on the type of texture.  */
        virtual void image(const Graphics::Image &, unsigned = 0) = 0;
 
-       GLenum get_target() const { return target; }
-       unsigned get_id() const { return id; }
-
        virtual std::uint64_t get_data_size() const { return 0; }
 
        void set_debug_name(const std::string &);