Fix reflection of image types from Spir-V modules

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

diff --git a/source/core/reflectdata.h b/source/core/reflectdata.h
index 2c0d7fe3e1c0765586726a2dfb4acb7e28616cdc..a89e7fcf2972c973c89a803501ebbd6739f7f11c 100644 (file)
--- a/source/core/reflectdata.h
+++ b/source/core/reflectdata.h
@@ -14,6 +14,12 @@ Reflection data for shader programs.
 */
 struct ReflectData
 {
+       enum
+       {
+               DEFAULT_BLOCK = -1,
+               PUSH_CONSTANT = -2
+       };
+
        typedef unsigned LayoutHash;
        struct UniformBlockInfo;
 
@@ -31,7 +37,6 @@ struct ReflectData
                unsigned matrix_stride = 0;
                DataType type = VOID;
                Tag tag;
-               int descriptor_set = 0;
                int binding = -1;
        };
 
@@ -39,8 +44,7 @@ struct ReflectData
        {
                std::string name;
                unsigned data_size = 0;
-               int descriptor_set = 0;
-               int bind_point = -1;
+               int bind_point = DEFAULT_BLOCK;
                std::vector<const UniformInfo *> uniforms;
                LayoutHash layout_hash = 0;
 
@@ -61,6 +65,7 @@ struct ReflectData
        LayoutHash layout_hash = 0;
        std::vector<AttributeInfo> attributes;
        unsigned n_clip_distances = 0;
+       unsigned n_descriptor_sets = 0;
 
        void update_layout_hash();
 };