Refactor VertexSetup format checking

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

diff --git a/source/core/vertexsetup.h b/source/core/vertexsetup.h
index d0ed870378034334b6935b092dcfbcae80909c80..beade58ed3daeb9b4421193a3b5d97524c8265c1 100644 (file)
--- a/source/core/vertexsetup.h
+++ b/source/core/vertexsetup.h
@@ -16,6 +16,8 @@ objects.  Intended for internal use.
 */
 class VertexSetup
 {
+       friend class PipelineState;
+
 private:
        enum ComponentMask
        {
@@ -50,15 +52,13 @@ public:
 
 private:
        static bool verify_format(const VertexFormat &);
-       static void require_format(const VertexFormat &);
+       static void require_format(const VertexFormat &, bool);
        void update() const;
        void update_vertex_array(const VertexArray &, unsigned, unsigned, bool) const;
 
 public:
        void refresh() const { if(dirty) update(); }
 
-       unsigned get_id() const { return id; }
-
        void unload();
 
        void set_debug_name(const std::string &);