Check the flat qualifier from the correct member

[libs/gl.git] / source / backends / opengl / program_backend.h

diff --git a/source/backends/opengl/program_backend.h b/source/backends/opengl/program_backend.h
index dbf043e9c89ba39a808432f80a001c2e933d68cb..9cce0f7e187ca4390e86962059955de5e1451c4f 100644 (file)
--- a/source/backends/opengl/program_backend.h
+++ b/source/backends/opengl/program_backend.h
@@ -4,12 +4,13 @@
 #include <map>
 #include <string>
 #include <vector>
+#include <msp/core/noncopyable.h>
 #include "reflectdata.h"
 
 namespace Msp {
 namespace GL {
 
-class OpenGLProgram
+class OpenGLProgram: public NonCopyable
 {
        friend class OpenGLPipelineState;
 
@@ -17,18 +18,14 @@ protected:
        enum Stage
        {
                VERTEX,
+               TESS_CONTROL,
+               TESS_EVAL,
                GEOMETRY,
                FRAGMENT,
+               COMPUTE,
                MAX_STAGES
        };
 
-       struct TransientData
-       {
-               std::map<std::string, unsigned> textures;
-               std::map<std::string, unsigned> blocks;
-               std::map<unsigned, int> spec_values;
-       };
-
        struct UniformCall
        {
                using FuncPtr = void (*)(unsigned, unsigned, const void *);
@@ -47,21 +44,24 @@ protected:
        std::string debug_name;
 
        OpenGLProgram();
+       OpenGLProgram(OpenGLProgram &&);
        ~OpenGLProgram();
 
        bool has_stages() const;
        unsigned add_stage(Stage);
-       void add_glsl_stages(const GlslModule &, const std::map<std::string, int> &, TransientData &);
+       void add_glsl_stages(const GlslModule &, const std::map<std::string, int> &);
        void compile_glsl_stage(const GlslModule &, unsigned);
-       void add_spirv_stages(const SpirVModule &, const std::map<std::string, int> &, TransientData &);
+       void add_spirv_stages(const SpirVModule &, const std::map<std::string, int> &);
 
-       void finalize(const Module &, TransientData &);
+       void link(const Module &);
        void query_uniforms();
        void query_uniform_blocks(const std::vector<ReflectData::UniformInfo *> &);
        void query_attributes();
-       void apply_bindings(const TransientData &);
        void finalize_uniforms();
 
+       bool is_compute() const { return stage_ids[COMPUTE]; }
+       bool has_tessellation() const { return stage_ids[TESS_CONTROL] && stage_ids[TESS_EVAL]; }
+
        void set_debug_name(const std::string &);
        void set_stage_debug_name(unsigned, Stage);
 };