diff options
| author | 2023-01-05 22:10:21 +0000 | |
|---|---|---|
| committer | 2023-01-05 22:18:10 +0000 | |
| commit | 58fec43768c837c63453e87df8f337a2d139324a (patch) | |
| tree | 161a20fc84cdc3c3086a470ca7afd09fe9f56169 /src/shader_recompiler/backend/spirv | |
| parent | externals: Update sirit (diff) | |
| download | yuzu-58fec43768c837c63453e87df8f337a2d139324a.tar.gz yuzu-58fec43768c837c63453e87df8f337a2d139324a.tar.xz yuzu-58fec43768c837c63453e87df8f337a2d139324a.zip | |
Run clang-format
Diffstat (limited to 'src/shader_recompiler/backend/spirv')
| -rw-r--r-- | src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp | 11 | ||||
| -rw-r--r-- | src/shader_recompiler/backend/spirv/spirv_emit_context.cpp | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp index 1590debc4..0cd87a48f 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp | |||
| @@ -321,11 +321,12 @@ Id EmitGetAttribute(EmitContext& ctx, IR::Attribute attr, Id vertex) { | |||
| 321 | case IR::Attribute::PositionY: | 321 | case IR::Attribute::PositionY: |
| 322 | case IR::Attribute::PositionZ: | 322 | case IR::Attribute::PositionZ: |
| 323 | case IR::Attribute::PositionW: | 323 | case IR::Attribute::PositionW: |
| 324 | return ctx.OpLoad(ctx.F32[1], ctx.need_input_position_indirect ? | 324 | return ctx.OpLoad( |
| 325 | AttrPointer(ctx, ctx.input_f32, vertex, ctx.input_position, | 325 | ctx.F32[1], |
| 326 | ctx.u32_zero_value, ctx.Const(element)) | 326 | ctx.need_input_position_indirect |
| 327 | : AttrPointer(ctx, ctx.input_f32, vertex, ctx.input_position, | 327 | ? AttrPointer(ctx, ctx.input_f32, vertex, ctx.input_position, ctx.u32_zero_value, |
| 328 | ctx.Const(element))); | 328 | ctx.Const(element)) |
| 329 | : AttrPointer(ctx, ctx.input_f32, vertex, ctx.input_position, ctx.Const(element))); | ||
| 329 | case IR::Attribute::InstanceId: | 330 | case IR::Attribute::InstanceId: |
| 330 | if (ctx.profile.support_vertex_instance_id) { | 331 | if (ctx.profile.support_vertex_instance_id) { |
| 331 | return ctx.OpBitcast(ctx.F32[1], ctx.OpLoad(ctx.U32[1], ctx.instance_id)); | 332 | return ctx.OpBitcast(ctx.F32[1], ctx.OpLoad(ctx.U32[1], ctx.instance_id)); |
diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp index f874622b8..a0c155fdb 100644 --- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp +++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp | |||
| @@ -729,7 +729,7 @@ void EmitContext::DefineAttributeMemAccess(const Info& info) { | |||
| 729 | else | 729 | else |
| 730 | return OpAccessChain(input_f32, input_position, u32_zero_value, | 730 | return OpAccessChain(input_f32, input_position, u32_zero_value, |
| 731 | masked_index); | 731 | masked_index); |
| 732 | } else { | 732 | } else { |
| 733 | if (is_array) | 733 | if (is_array) |
| 734 | return OpAccessChain(input_f32, input_position, vertex, masked_index); | 734 | return OpAccessChain(input_f32, input_position, vertex, masked_index); |
| 735 | else | 735 | else |
| @@ -1390,7 +1390,8 @@ void EmitContext::DefineInputs(const IR::Program& program) { | |||
| 1390 | static_cast<unsigned>(spv::BuiltIn::Position)); | 1390 | static_cast<unsigned>(spv::BuiltIn::Position)); |
| 1391 | Decorate(input_position_struct, spv::Decoration::Block); | 1391 | Decorate(input_position_struct, spv::Decoration::Block); |
| 1392 | } else { | 1392 | } else { |
| 1393 | const spv::BuiltIn built_in{is_fragment ? spv::BuiltIn::FragCoord : spv::BuiltIn::Position}; | 1393 | const spv::BuiltIn built_in{is_fragment ? spv::BuiltIn::FragCoord |
| 1394 | : spv::BuiltIn::Position}; | ||
| 1394 | input_position = DefineInput(*this, F32[4], true, built_in); | 1395 | input_position = DefineInput(*this, F32[4], true, built_in); |
| 1395 | 1396 | ||
| 1396 | if (profile.support_geometry_shader_passthrough) { | 1397 | if (profile.support_geometry_shader_passthrough) { |