GL_EXT_ray_query glslang updates, and test cases added.
This commit is contained in:
@@ -1674,7 +1674,7 @@ public:
|
||||
}
|
||||
virtual bool isOpaque() const { return basicType == EbtSampler
|
||||
#ifndef GLSLANG_WEB
|
||||
|| basicType == EbtAtomicUint || basicType == EbtAccStruct || basicType == EbtRayQuery
|
||||
|| basicType == EbtAtomicUint || basicType == EbtAccStruct
|
||||
#endif
|
||||
; }
|
||||
virtual bool isBuiltIn() const { return getQualifier().builtIn != EbvNone; }
|
||||
|
||||
@@ -4326,10 +4326,10 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
|
||||
// Builtins for GL_NV_ray_tracing/GL_EXT_ray_tracing/GL_EXT_ray_query
|
||||
if (profile != EEsProfile && version >= 460) {
|
||||
commonBuiltins.append("void rayQueryInitializeEXT(rayQueryEXT, accelerationStructureEXT, uint, uint, vec3, float, vec3, float);"
|
||||
"bool rayQueryProceedEXT(rayQueryEXT);"
|
||||
"void rayQueryTerminateEXT(rayQueryEXT);"
|
||||
"void rayQueryGenerateIntersectionEXT(rayQueryEXT, float);"
|
||||
"void rayQueryConfirmIntersectionEXT(rayQueryEXT);"
|
||||
"bool rayQueryProceedEXT(rayQueryEXT);"
|
||||
"uint rayQueryGetIntersectionTypeEXT(rayQueryEXT, bool);"
|
||||
"float rayQueryGetRayTMinEXT(rayQueryEXT);"
|
||||
"uint rayQueryGetRayFlagsEXT(rayQueryEXT);"
|
||||
|
||||
@@ -540,7 +540,6 @@ 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;
|
||||
|
||||
Reference in New Issue
Block a user