AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1963 from KhronosGroup/convert-u-to-rtas-fix

Browse Source 
GLSL: Handle forced temporary OpConvertUToAccelerationStructureKHR.
This commit is contained in:
Hans-Kristian Arntzen 2022-06-17 15:18:00 +02:00 committed by GitHub
commit 99b59b3528
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 144 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
reference/shaders-no-opt/asm/comp/ray-query-force-temporary-rtas.spv14.asm.vk.nocompat.comp.vk Normal file
View File

@ -0,0 +1,28 @@
#version 460
#extension GL_EXT_ray_query : require
#extension GL_EXT_ray_tracing : require
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
layout(set = 0, binding = 0, std430) readonly buffer Buf
{
uvec2 vas[1024];
} _3;
layout(push_constant, std430) uniform Registers
{
uint index;
} _4;
rayQueryEXT rq;
void main()
{
uvec2 _41;
do
{
uvec2 va = _3.vas[_4.index];
_41 = _3.vas[_4.index];
} while (false);
rayQueryInitializeEXT(rq, accelerationStructureEXT(_41), 0u, 0u, vec3(0.0), 0.0, vec3(0.0), 0.0);
}

81
shaders-no-opt/asm/comp/ray-query-force-temporary-rtas.spv14.asm.vk.nocompat.comp Normal file
View File

@ -0,0 +1,81 @@
; SPIR-V
; Version: 1.5
; Generator: Khronos Glslang Reference Front End; 10
; Bound: 43
; Schema: 0
OpCapability Shader
OpCapability RayQueryKHR
OpExtension "SPV_KHR_ray_query"
%1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint GLCompute %main "main" %_ %__0 %rq
OpExecutionMode %main LocalSize 1 1 1
OpSource GLSL 460
OpSourceExtension "GL_EXT_ray_query"
OpSourceExtension "GL_EXT_ray_tracing"
OpName %main "main"
OpName %va "va"
OpName %Buf "Buf"
OpMemberName %Buf 0 "vas"
OpName %_ ""
OpName %Registers "Registers"
OpMemberName %Registers 0 "index"
OpName %__0 ""
OpName %rq "rq"
OpDecorate %_arr_v2uint_uint_1024 ArrayStride 8
OpMemberDecorate %Buf 0 NonWritable
OpMemberDecorate %Buf 0 Offset 0
OpDecorate %Buf Block
OpDecorate %_ DescriptorSet 0
OpDecorate %_ Binding 0
OpMemberDecorate %Registers 0 Offset 0
OpDecorate %Registers Block
%void = OpTypeVoid
%3 = OpTypeFunction %void
%uint = OpTypeInt 32 0
%v2uint = OpTypeVector %uint 2
%_ptr_Function_v2uint = OpTypePointer Function %v2uint
%uint_1024 = OpConstant %uint 1024
%_arr_v2uint_uint_1024 = OpTypeArray %v2uint %uint_1024
%Buf = OpTypeStruct %_arr_v2uint_uint_1024
%_ptr_StorageBuffer_Buf = OpTypePointer StorageBuffer %Buf
%_ = OpVariable %_ptr_StorageBuffer_Buf StorageBuffer
%int = OpTypeInt 32 1
%int_0 = OpConstant %int 0
%Registers = OpTypeStruct %uint
%_ptr_PushConstant_Registers = OpTypePointer PushConstant %Registers
%__0 = OpVariable %_ptr_PushConstant_Registers PushConstant
%_ptr_PushConstant_uint = OpTypePointer PushConstant %uint
%_ptr_StorageBuffer_v2uint = OpTypePointer StorageBuffer %v2uint
%bool = OpTypeBool
%false = OpConstantFalse %bool
%32 = OpTypeRayQueryKHR
%_ptr_Private_32 = OpTypePointer Private %32
%rq = OpVariable %_ptr_Private_32 Private
%36 = OpTypeAccelerationStructureKHR
%uint_0 = OpConstant %uint 0
%float = OpTypeFloat 32
%v3float = OpTypeVector %float 3
%float_0 = OpConstant %float 0
%42 = OpConstantComposite %v3float %float_0 %float_0 %float_0
%main = OpFunction %void None %3
%5 = OpLabel
%va = OpVariable %_ptr_Function_v2uint Function
OpBranch %6
%6 = OpLabel
OpLoopMerge %8 %9 None
OpBranch %7
%7 = OpLabel
%25 = OpAccessChain %_ptr_PushConstant_uint %__0 %int_0
%26 = OpLoad %uint %25
%28 = OpAccessChain %_ptr_StorageBuffer_v2uint %_ %int_0 %26
%29 = OpLoad %v2uint %28
OpStore %va %29
%37 = OpConvertUToAccelerationStructureKHR %36 %29
OpBranch %9
%9 = OpLabel
OpBranchConditional %false %6 %8
%8 = OpLabel
OpRayQueryInitializeKHR %rq %37 %uint_0 %uint_0 %42 %float_0 %42 %float_0
OpReturn
OpFunctionEnd

13
spirv_cross.cpp
View File

@ -3229,7 +3229,20 @@ bool Compiler::AnalyzeVariableScopeAccessHandler::handle(spv::Op op, const uint3
// Keep track of the types of temporaries, so we can hoist them out as necessary.
uint32_t result_type, result_id;
if (compiler.instruction_to_result_type(result_type, result_id, op, args, length))
{
// For some opcodes, we will need to override the result id.
// If we need to hoist the temporary, the temporary type is the input, not the result.
// FIXME: This will likely break with OpCopyObject + hoisting, but we'll have to
// solve it if we ever get there ...
if (op == OpConvertUToAccelerationStructureKHR)
{
auto itr = result_id_to_type.find(args[2]);
if (itr != result_id_to_type.end())
result_type = itr->second;
}
result_id_to_type[result_id] = result_type;
}
switch (op)
{

23
spirv_glsl.cpp
View File

@ -13379,9 +13379,30 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
#undef GLSL_RAY_QUERY_GET_OP2
case OpConvertUToAccelerationStructureKHR:
{
require_extension_internal("GL_EXT_ray_tracing");
GLSL_UFOP(accelerationStructureEXT);
bool elide_temporary = should_forward(ops[2]) && forced_temporaries.count(ops[1]) == 0 &&
!hoisted_temporaries.count(ops[1]);
if (elide_temporary)
{
GLSL_UFOP(accelerationStructureEXT);
}
else
{
// Force this path in subsequent iterations.
forced_temporaries.insert(ops[1]);
// We cannot declare a temporary acceleration structure in GLSL.
// If we get to this point, we'll have to emit a temporary uvec2,
// and cast to RTAS on demand.
statement(declare_temporary(expression_type_id(ops[2]), ops[1]), to_unpacked_expression(ops[2]), ";");
// Use raw SPIRExpression interface to block all usage tracking.
set<SPIRExpression>(ops[1], join("accelerationStructureEXT(", to_name(ops[1]), ")"), ops[0], true);
}
break;
}
case OpConvertUToPtr:
{