Use default member initializers for simple types

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

diff --git a/source/core/frameformat.h b/source/core/frameformat.h
index 35d982ba8839f1489b75efab9489560a7aa2d6e3..df4363758644160c98b8d9d7e2dbc4c42f641338 100644 (file)
--- a/source/core/frameformat.h
+++ b/source/core/frameformat.h
@@ -20,7 +20,7 @@ nnnn nn_f _sss _ccc
 This information is presented for internal documentation purposes only; it is
 inadvisable for programs to rely on it.
 */
-enum FrameAttachment
+enum FrameAttachment: std::uint16_t
 {
        COLOR_ATTACHMENT = 0x0014,
        DEPTH_ATTACHMENT = 0xF941,
@@ -36,12 +36,12 @@ class FrameFormat
 private:
        enum { MAX_ATTACHMENTS = 7 };
 
-       std::uint8_t count;
-       std::uint8_t samples;
-       std::uint16_t 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 +53,8 @@ public:
 
        unsigned size() const { return count; }
        bool empty() const { return !count; }
-       const std::uint16_t *begin() const { return attachments; }
-       const std::uint16_t *end() const { return attachments+count; }
+       const FrameAttachment *begin() const { return attachments; }
+       const FrameAttachment *end() const { return attachments+count; }
        int index(FrameAttachment) const;
 };
 
@@ -71,14 +71,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(std::uint16_t fa)
+inline unsigned get_attach_point(FrameAttachment fa)
 { return fa>>10; }
 
-PixelFormat get_attachment_pixelformat(std::uint16_t);
-
-GLenum get_gl_attachment(FrameAttachment);
+PixelFormat get_attachment_pixelformat(FrameAttachment);
 
 } // namespace GL
 } // namespace Msp
 
+#include "frameformat_backend.h"
+
 #endif