Merge branch 'master' of https://github.com/neslimsah/glslang
This commit is contained in:
commit
7d122c96a4
3 changed files with 27 additions and 1 deletions
|
|
@ -1674,7 +1674,7 @@ public:
|
|||
}
|
||||
virtual bool isOpaque() const { return basicType == EbtSampler
|
||||
#ifndef GLSLANG_WEB
|
||||
|| basicType == EbtAtomicUint || basicType == EbtAccStruct
|
||||
|| basicType == EbtAtomicUint || basicType == EbtAccStruct || basicType == EbtRayQuery
|
||||
#endif
|
||||
; }
|
||||
virtual bool isBuiltIn() const { return getQualifier().builtIn != EbvNone; }
|
||||
|
|
|
|||
|
|
@ -540,6 +540,7 @@ bool TIntermediate::isConversionAllowed(TOperator op, TIntermTyped* node) const
|
|||
case EbtAtomicUint:
|
||||
case EbtSampler:
|
||||
case EbtAccStruct:
|
||||
case EbtRayQuery:
|
||||
// opaque types can be passed to functions
|
||||
if (op == EOpFunction)
|
||||
break;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue