Add color write mask to blend state

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

diff --git a/source/core/texture.h b/source/core/texture.h
index 555d19ffee902f3d3457b9a831a1625b4819b03d..47b2f2696efd35bd07b0c8c52811cc46359d2d63 100644 (file)
--- a/source/core/texture.h
+++ b/source/core/texture.h
@@ -1,14 +1,9 @@
 #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 +20,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>
        {
@@ -60,7 +57,7 @@ protected:
        };
 
        unsigned id;
-       GLenum target;
+       unsigned target;
        PixelFormat format;
        PixelFormat storage_fmt;
        FormatSwizzle swizzle;
@@ -68,10 +65,10 @@ 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);
+       Texture(unsigned, ResourceManager * = 0);
        Texture(const Texture &);
        Texture &operator=(const Texture &);
 public:
@@ -81,7 +78,7 @@ protected:
        void generate_id();
        void set_format(PixelFormat);
        void apply_swizzle();
-       void set_parameter_i(GLenum, int) const;
+       void set_parameter_i(unsigned, int) const;
 
 public:
        PixelFormat get_format() const { return format; }
@@ -91,18 +88,11 @@ 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 std::uint64_t get_data_size() const { return 0; }
 
        void set_debug_name(const std::string &);