Remove support for array size specialization from the engine as well

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

diff --git a/source/core/frameformat.h b/source/core/frameformat.h
index c67586a9dd435353c5511f67967e23bd57d4ec6a..4662ae8f9d2d02ec8aebe576532f13e932d67ed8 100644 (file)
--- a/source/core/frameformat.h
+++ b/source/core/frameformat.h
@@ -1,15 +1,17 @@
 #ifndef MSP_GL_FRAMEFORMAT_H_
 #define MSP_GL_FRAMEFORMAT_H_
 
-#include <msp/core/inttypes.h>
+#include <cstdint>
 #include "pixelformat.h"
 
 namespace Msp {
 namespace GL {
 
 /**
-Describes a single attachment of a framebuffer.  The values are bitfields laid
-as follows:
+Describes a single attachment of a framebuffer, including the type and index
+of the attachment point and the format of the attached texture.
+
+The values are bitfields laid as follows:
 
 nnnn nn_f _sss _ccc
       │ │    │    └╴Number of components
@@ -18,9 +20,9 @@ nnnn nn_f _sss _ccc
       └────────────╴Attachment index
 
 This information is presented for internal documentation purposes only; it is
-inadvisable for programs to rely on it.
+inadvisable for applications to rely on it.
 */
-enum FrameAttachment
+enum FrameAttachment: std::uint16_t
 {
        COLOR_ATTACHMENT = 0x0014,
        DEPTH_ATTACHMENT = 0xF941,
@@ -36,12 +38,12 @@ class FrameFormat
 private:
        enum { MAX_ATTACHMENTS = 7 };
 
-       UInt8 count;
-       UInt8 samples;
-       UInt16 attachments[MAX_ATTACHMENTS];
+       std::uint8_t count = 0;
+       std::uint8_t samples = 0;
+       FrameAttachment attachments[MAX_ATTACHMENTS];
 
 public:
-       FrameFormat();
+       FrameFormat() = default;
        FrameFormat(FrameAttachment);
 
        FrameFormat operator,(FrameAttachment) const;
@@ -53,8 +55,8 @@ public:
 
        unsigned size() const { return count; }
        bool empty() const { return !count; }
-       const UInt16 *begin() const { return attachments; }
-       const UInt16 *end() const { return attachments+count; }
+       const FrameAttachment *begin() const { return attachments; }
+       const FrameAttachment *end() const { return attachments+count; }
        int index(FrameAttachment) const;
 };
 
@@ -71,14 +73,14 @@ FrameAttachment make_indexed_attachment(FrameAttachment, unsigned);
 inline FrameAttachment operator,(FrameAttachment fa, unsigned i)
 { return make_indexed_attachment(fa, i); }
 
-inline unsigned get_attach_point(UInt16 fa)
+inline unsigned get_attach_point(FrameAttachment fa)
 { return fa>>10; }
 
-PixelFormat get_attachment_pixelformat(UInt16);
-
-GLenum get_gl_attachment(FrameAttachment);
+PixelFormat get_attachment_pixelformat(FrameAttachment);
 
 } // namespace GL
 } // namespace Msp
 
+#include "frameformat_backend.h"
+
 #endif