Use friend declarations to access OpenGL IDs of objects

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

diff --git a/source/core/texture.h b/source/core/texture.h
index 04a810856a5dedab8b16ecbbd453f6817fddd1d7..6d474b8864ec392375041e47821ca29016d66006 100644 (file)
--- a/source/core/texture.h
+++ b/source/core/texture.h
@@ -1,14 +1,10 @@
 #ifndef MSP_GL_TEXTURE_H_
 #define MSP_GL_TEXTURE_H_
 
-#include <msp/core/attributes.h>
 #include <msp/datafile/objectloader.h>
 #include <msp/graphics/image.h>
-#include "datatype.h"
 #include "gl.h"
 #include "pixelformat.h"
-#include "predicate.h"
-#include "sampler.h"
 #include "resource.h"
 
 namespace Msp {
@@ -25,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>
        {
@@ -68,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);
@@ -91,19 +89,12 @@ public:
        /// Loads a Graphics::Image from a file and uploads it to the texture.
        virtual void load_image(const std::string &, unsigned = 0);
 
-       DEPRECATED void load_image(const std::string &, bool srgb);
-
        /** Uploads an image to the texture.  If storage has not been defined, it
        will be set to match the image.  Otherwise the image must be compatible
        with the defined storage.  Semantics depend on the type of texture.  */
        virtual void image(const Graphics::Image &, unsigned = 0) = 0;
 
-       DEPRECATED void image(const Graphics::Image &, bool srgb);
-
-       GLenum get_target() const { return target; }
-       unsigned get_id() const { return id; }
-
-       virtual UInt64 get_data_size() const { return 0; }
+       virtual std::uint64_t get_data_size() const { return 0; }
 
        void set_debug_name(const std::string &);