Skip to content

Implement VK_KHR_ray_tracing in HLSL #1364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Implement VK_KHR_ray_tracing in HLSL #1364

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9a6fea4
Implement VK_KHR_ray_tracing in HLSL
maierfelix May 4, 2020
2915782
Merge branch 'master' of https://github.com/maierfelix/SPIRV-Cross
maierfelix May 16, 2020
7c1bdae
Formattings
maierfelix May 17, 2020
ef6e321
Fix intersection hit attribute
maierfelix May 19, 2020
eee53da
Fix ops indices
maierfelix May 19, 2020
a5ec85d
KHR -> NV, Rename get_ray_tracing_payload to get_ray_tracing_in_payload
maierfelix May 19, 2020
8979b0b
Fix comparison
maierfelix May 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,18 +345,18 @@ static const char *execution_model_to_str(spv::ExecutionModel model)
return "fragment";
case ExecutionModelGLCompute:
return "compute";
case ExecutionModelRayGenerationNV:
return "raygenNV";
case ExecutionModelIntersectionNV:
return "intersectionNV";
case ExecutionModelCallableNV:
return "callableNV";
case ExecutionModelAnyHitNV:
return "anyhitNV";
case ExecutionModelClosestHitNV:
return "closesthitNV";
case ExecutionModelMissNV:
return "missNV";
case ExecutionModelRayGenerationKHR:
return "raygenKHR";
case ExecutionModelIntersectionKHR:
return "intersectionKHR";
case ExecutionModelCallableKHR:
return "callableKHR";
case ExecutionModelAnyHitKHR:
return "anyhitKHR";
case ExecutionModelClosestHitKHR:
return "closesthitKHR";
case ExecutionModelMissKHR:
return "missKHR";
default:
return "???";
}
Expand Down
130 changes: 66 additions & 64 deletions spirv_glsl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,15 +445,15 @@ void CompilerGLSL::find_static_extensions()
require_extension_internal("GL_ARB_tessellation_shader");
break;

case ExecutionModelRayGenerationNV:
case ExecutionModelIntersectionNV:
case ExecutionModelAnyHitNV:
case ExecutionModelClosestHitNV:
case ExecutionModelMissNV:
case ExecutionModelCallableNV:
case ExecutionModelRayGenerationKHR:
case ExecutionModelIntersectionKHR:
case ExecutionModelAnyHitKHR:
case ExecutionModelClosestHitKHR:
case ExecutionModelMissKHR:
case ExecutionModelCallableKHR:
if (options.es || options.version < 460)
SPIRV_CROSS_THROW("Ray tracing shaders require non-es profile with version 460 or above.");
require_extension_internal("GL_NV_ray_tracing");
require_extension_internal("GL_KHR_ray_tracing");
break;

default:
Expand Down Expand Up @@ -2089,25 +2089,25 @@ const char *CompilerGLSL::to_storage_qualifiers_glsl(const SPIRVariable &var)
{
return "uniform ";
}
else if (var.storage == StorageClassRayPayloadNV)
else if (var.storage == StorageClassRayPayloadKHR)
{
return "rayPayloadNV ";
return "rayPayloadEXT ";
}
else if (var.storage == StorageClassIncomingRayPayloadNV)
else if (var.storage == StorageClassIncomingRayPayloadKHR)
{
return "rayPayloadInNV ";
return "rayPayloadInEXT ";
}
else if (var.storage == StorageClassHitAttributeNV)
else if (var.storage == StorageClassHitAttributeKHR)
{
return "hitAttributeNV ";
return "hitAttributeEXT ";
}
else if (var.storage == StorageClassCallableDataNV)
else if (var.storage == StorageClassCallableDataKHR)
{
return "callableDataNV ";
return "callableDataEXT ";
}
else if (var.storage == StorageClassIncomingCallableDataNV)
else if (var.storage == StorageClassIncomingCallableDataKHR)
{
return "callableDataInNV ";
return "callableDataInEXT ";
}

return "";
Expand Down Expand Up @@ -3056,9 +3056,9 @@ void CompilerGLSL::emit_resources()

if (var.storage != StorageClassFunction && type.pointer &&
(type.storage == StorageClassUniformConstant || type.storage == StorageClassAtomicCounter ||
type.storage == StorageClassRayPayloadNV || type.storage == StorageClassIncomingRayPayloadNV ||
type.storage == StorageClassCallableDataNV || type.storage == StorageClassIncomingCallableDataNV ||
type.storage == StorageClassHitAttributeNV) &&
type.storage == StorageClassRayPayloadKHR || type.storage == StorageClassIncomingRayPayloadKHR ||
type.storage == StorageClassCallableDataKHR || type.storage == StorageClassIncomingCallableDataKHR ||
type.storage == StorageClassHitAttributeKHR) &&
!is_hidden_variable(var))
{
emit_uniform(var);
Expand Down Expand Up @@ -4647,7 +4647,8 @@ bool CompilerGLSL::emit_complex_bitcast(uint32_t result_type, uint32_t id, uint3

if (output_type.basetype == SPIRType::Half && input_type.basetype == SPIRType::Float && input_type.vecsize == 1)
expr = join("unpackFloat2x16(floatBitsToUint(", to_unpacked_expression(op0), "))");
else if (output_type.basetype == SPIRType::Float && input_type.basetype == SPIRType::Half && input_type.vecsize == 2)
else if (output_type.basetype == SPIRType::Float && input_type.basetype == SPIRType::Half &&
input_type.vecsize == 2)
expr = join("uintBitsToFloat(packFloat2x16(", to_unpacked_expression(op0), "))");
else
return false;
Expand Down Expand Up @@ -6804,7 +6805,7 @@ string CompilerGLSL::builtin_to_glsl(BuiltIn builtin, StorageClass storage)

default:
SPIRV_CROSS_THROW(
"Cannot implement gl_InstanceID in Vulkan GLSL. This shader was created with GL semantics.");
"Cannot implement gl_InstanceID in Vulkan GLSL. This shader was created with GL semantics.");
}
}
return "gl_InstanceID";
Expand Down Expand Up @@ -6978,34 +6979,34 @@ string CompilerGLSL::builtin_to_glsl(BuiltIn builtin, StorageClass storage)
require_extension_internal("GL_KHR_shader_subgroup_ballot");
return "gl_SubgroupLtMask";

case BuiltInLaunchIdNV:
return "gl_LaunchIDNV";
case BuiltInLaunchSizeNV:
return "gl_LaunchSizeNV";
case BuiltInWorldRayOriginNV:
return "gl_WorldRayOriginNV";
case BuiltInWorldRayDirectionNV:
return "gl_WorldRayDirectionNV";
case BuiltInObjectRayOriginNV:
return "gl_ObjectRayOriginNV";
case BuiltInObjectRayDirectionNV:
return "gl_ObjectRayDirectionNV";
case BuiltInRayTminNV:
return "gl_RayTminNV";
case BuiltInRayTmaxNV:
return "gl_RayTmaxNV";
case BuiltInInstanceCustomIndexNV:
return "gl_InstanceCustomIndexNV";
case BuiltInObjectToWorldNV:
return "gl_ObjectToWorldNV";
case BuiltInWorldToObjectNV:
return "gl_WorldToObjectNV";
case BuiltInHitTNV:
return "gl_HitTNV";
case BuiltInHitKindNV:
return "gl_HitKindNV";
case BuiltInIncomingRayFlagsNV:
return "gl_IncomingRayFlagsNV";
case BuiltInLaunchIdKHR:
return "gl_LaunchIDEXT";
case BuiltInLaunchSizeKHR:
return "gl_LaunchSizeEXT";
case BuiltInWorldRayOriginKHR:
return "gl_WorldRayOriginEXT";
case BuiltInWorldRayDirectionKHR:
return "gl_WorldRayDirectionEXT";
case BuiltInObjectRayOriginKHR:
return "gl_ObjectRayOriginEXT";
case BuiltInObjectRayDirectionKHR:
return "gl_ObjectRayDirectionEXT";
case BuiltInRayTminKHR:
return "gl_RayTminEXT";
case BuiltInRayTmaxKHR:
return "gl_RayTmaxEXT";
case BuiltInInstanceCustomIndexKHR:
return "gl_InstanceCustomIndexEXT";
case BuiltInObjectToWorldKHR:
return "gl_ObjectToWorldEXT";
case BuiltInWorldToObjectKHR:
return "gl_WorldToObjectEXT";
case BuiltInHitTKHR:
return "gl_HitTEXT";
case BuiltInHitKindKHR:
return "gl_HitKindEXT";
case BuiltInIncomingRayFlagsKHR:
return "gl_IncomingRayFlagsEXT";

case BuiltInBaryCoordNV:
{
Expand Down Expand Up @@ -10790,23 +10791,23 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
break;
}

case OpReportIntersectionNV:
statement("reportIntersectionNV(", to_expression(ops[0]), ", ", to_expression(ops[1]), ");");
case OpReportIntersectionKHR:
statement("reportIntersectionEXT(", to_expression(ops[0]), ", ", to_expression(ops[1]), ");");
break;
case OpIgnoreIntersectionNV:
statement("ignoreIntersectionNV();");
case OpIgnoreIntersectionKHR:
statement("ignoreIntersectionEXT();");
break;
case OpTerminateRayNV:
statement("terminateRayNV();");
case OpTerminateRayKHR:
statement("terminateRayEXT();");
break;
case OpTraceNV:
statement("traceNV(", to_expression(ops[0]), ", ", to_expression(ops[1]), ", ", to_expression(ops[2]), ", ",
case OpTraceRayKHR:
statement("traceRayEXT(", to_expression(ops[0]), ", ", to_expression(ops[1]), ", ", to_expression(ops[2]), ", ",
to_expression(ops[3]), ", ", to_expression(ops[4]), ", ", to_expression(ops[5]), ", ",
to_expression(ops[6]), ", ", to_expression(ops[7]), ", ", to_expression(ops[8]), ", ",
to_expression(ops[9]), ", ", to_expression(ops[10]), ");");
break;
case OpExecuteCallableNV:
statement("executeCallableNV(", to_expression(ops[0]), ", ", to_expression(ops[1]), ");");
case OpExecuteCallableKHR:
statement("executeCallableEXT(", to_expression(ops[0]), ", ", to_expression(ops[1]), ");");
break;

case OpConvertUToPtr:
Expand Down Expand Up @@ -11553,7 +11554,7 @@ string CompilerGLSL::type_to_glsl(const SPIRType &type, uint32_t id)
return comparison_ids.count(id) ? "samplerShadow" : "sampler";

case SPIRType::AccelerationStructure:
return "accelerationStructureNV";
return "accelerationStructureKHR";

case SPIRType::Void:
return "void";
Expand Down Expand Up @@ -13739,11 +13740,12 @@ const SPIRVariable *CompilerGLSL::find_subpass_input_by_attachment_index(uint32_
return ret;
}

const SPIRVariable *CompilerGLSL::find_color_output_by_location(uint32_t location) const
const SPIRVariable *CompilerGLSL::find_storage_class_variable_by_location(spv::StorageClass storage_class,
uint32_t location) const
{
const SPIRVariable *ret = nullptr;
ir.for_each_typed_id<SPIRVariable>([&](uint32_t, const SPIRVariable &var) {
if (var.storage == StorageClassOutput && get_decoration(var.self, DecorationLocation) == location)
if (var.storage == storage_class && get_decoration(var.self, DecorationLocation) == location)
ret = &var;
});
return ret;
Expand All @@ -13754,7 +13756,7 @@ void CompilerGLSL::emit_inout_fragment_outputs_copy_to_subpass_inputs()
for (auto &remap : subpass_to_framebuffer_fetch_attachment)
{
auto *subpass_var = find_subpass_input_by_attachment_index(remap.first);
auto *output_var = find_color_output_by_location(remap.second);
auto *output_var = find_storage_class_variable_by_location(StorageClassOutput, remap.second);
if (!subpass_var)
continue;
if (!output_var)
Expand Down
3 changes: 2 additions & 1 deletion spirv_glsl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,8 @@ class CompilerGLSL : public Compiler
bool subpass_input_is_framebuffer_fetch(uint32_t id) const;
void emit_inout_fragment_outputs_copy_to_subpass_inputs();
const SPIRVariable *find_subpass_input_by_attachment_index(uint32_t index) const;
const SPIRVariable *find_color_output_by_location(uint32_t location) const;
const SPIRVariable *find_storage_class_variable_by_location(spv::StorageClass storage_class,
uint32_t location) const;

// A variant which takes two sets of name. The secondary is only used to verify there are no collisions,
// but the set is not updated when we have found a new name.
Expand Down
Loading