X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fspirv.h;h=add5a967d3659d525901101cb25e3712601a2f03;hp=98aa673ed8d963ba23aa89cedd90d3433d00f619;hb=91e65bc9e24a6889995081035f6f6f0a78a6c20e;hpb=2016444ee144ce41f88c48e89c825137ad7e4ec2 diff --git a/source/glsl/spirv.h b/source/glsl/spirv.h index 98aa673e..add5a967 100644 --- a/source/glsl/spirv.h +++ b/source/glsl/spirv.h @@ -48,6 +48,7 @@ private: unsigned detail; TypeKey(Id i, unsigned d): type_id(i), detail(d) { } + TypeKey(BasicTypeDeclaration::Kind, bool); bool operator<(const TypeKey &) const; }; @@ -62,6 +63,7 @@ private: }; ConstantKey(Id t, int i): type_id(t), int_value(i) { } + ConstantKey(Id t, unsigned u): type_id(t), int_value(u) { } ConstantKey(Id t, float f): type_id(t), float_value(f) { } bool operator<(const ConstantKey &) const; @@ -115,7 +117,7 @@ private: static ConstantKey get_constant_key(Id, const Variant &value); Id get_constant_id(Id, const Variant &value); Id get_vector_constant_id(Id, unsigned, Id); - Id get_standard_type_id(BasicTypeDeclaration::Kind, unsigned); + Id get_standard_type_id(BasicTypeDeclaration::Kind, unsigned, bool = true); bool is_scalar_type(Id, BasicTypeDeclaration::Kind) const; Id get_array_type_id(TypeDeclaration &, unsigned); Id get_pointer_type_id(Id, StorageClass);