Fix a name conflict in certain inlining scenarios

[libs/gl.git] / source / glsl / spirvconstants.h

diff --git a/source/glsl/spirvconstants.h b/source/glsl/spirvconstants.h
index 3f780b1b247f706e0a833cc87e2e1555b4ad0844..33d705e22383971ccd273a3d8d4cc77f1b2fc9b3 100644 (file)
--- a/source/glsl/spirvconstants.h
+++ b/source/glsl/spirvconstants.h
@@ -64,7 +64,10 @@ enum SpirVOpcode
        OP_IMAGE_SAMPLE_DREF_IMPLICIT_LOD = 89,
        OP_IMAGE_SAMPLE_DREF_EXPLICIT_LOD = 89,
        OP_IMAGE_FETCH = 95,
+       OP_IMAGE = 100,
        OP_IMAGE_QUERY_SIZE_LOD = 103,
+       OP_IMAGE_QUERY_LOD = 105,
+       OP_IMAGE_QUERY_LEVELS = 106,
        OP_CONVERT_F_TO_U = 109,
        OP_CONVERT_F_TO_S = 110,
        OP_CONVERT_S_TO_F = 111,
@@ -159,6 +162,8 @@ enum SpirVCapability
        CAP_SAMPLED_1D = 43,
        CAP_IMAGE_1D = 44,
        CAP_SAMPLED_CUBE_ARRAY = 45,
+       CAP_IMAGE_QUERY = 50,
+       CAP_DERIVATIVE_CONTROL = 51,
        CAP_INTERPOLATION_FUNCTION = 52
 };
 
@@ -183,7 +188,8 @@ enum SpirVStorageClass
        STORAGE_UNIFORM = 2,
        STORAGE_OUTPUT = 3,
        STORAGE_PRIVATE = 6,
-       STORAGE_FUNCTION = 7
+       STORAGE_FUNCTION = 7,
+       STORAGE_PUSH_CONSTANT = 9
 };
 
 enum SpirVDecoration
@@ -254,7 +260,7 @@ enum SpirVGlslStd450Opcode
        GLSL450_SQRT = 31,
        GLSL450_INVERSE_SQRT = 32,
        GLSL450_DETERMINANT = 33,
-       GLSL450_MATRIX_INVERSE = 33,
+       GLSL450_MATRIX_INVERSE = 34,
        GLSL450_F_MIN = 37,
        GLSL450_U_MIN = 38,
        GLSL450_S_MIN = 39,