Merge branch 'master' of https://github.com/neslimsah/glslang

2020-03-20 18:35:57 -04:00 · 2020-03-20 18:35:57 -04:00 · 7d122c96a4
commit 7d122c96a4
parent 50a722818b 44e8e5560b
3 changed files with 27 additions and 1 deletions
--- a/glslang/MachineIndependent/Intermediate.cpp
+++ b/glslang/MachineIndependent/Intermediate.cpp
@ -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;