From 73b11f390e3dabf42d22af78670c8aa6d8f52cee Mon Sep 17 00:00:00 2001 From: Feng Chen Date: Wed, 1 Sep 2021 00:07:25 +0800 Subject: Add colorfront and txtcoord support --- .../backend/spirv/emit_spirv_context_get_set.cpp | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp') 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 14c77f162..0444bbf8f 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 @@ -74,6 +74,12 @@ std::optional OutputAttrPointer(EmitContext& ctx, IR::Attribute attr) { return OutputAccessChain(ctx, ctx.output_f32, info.id, index_id); } } + if (attr >= IR::Attribute::FixedFncTexture0S && attr <= IR::Attribute::FixedFncTexture9Q) { + const u32 index{IR::TxtCoordAttributeIndex(attr)}; + const u32 element{IR::TxtCoordAttributeElement(attr)}; + const Id element_id{ctx.Const(element)}; + return OutputAccessChain(ctx, ctx.output_f32, ctx.output_txt_coord, element_id); + } switch (attr) { case IR::Attribute::PointSize: return ctx.output_point_size; @@ -85,6 +91,14 @@ std::optional OutputAttrPointer(EmitContext& ctx, IR::Attribute attr) { const Id element_id{ctx.Const(element)}; return OutputAccessChain(ctx, ctx.output_f32, ctx.output_position, element_id); } + case IR::Attribute::ColorFrontDiffuseR: + case IR::Attribute::ColorFrontDiffuseG: + case IR::Attribute::ColorFrontDiffuseB: + case IR::Attribute::ColorFrontDiffuseA: { + const u32 element{static_cast(attr) % 4}; + const Id element_id{ctx.Const(element)}; + return OutputAccessChain(ctx, ctx.output_f32, ctx.output_front_color, element_id); + } case IR::Attribute::ClipDistance0: case IR::Attribute::ClipDistance1: case IR::Attribute::ClipDistance2: @@ -307,6 +321,11 @@ Id EmitGetAttribute(EmitContext& ctx, IR::Attribute attr, Id vertex) { const Id value{ctx.OpLoad(type->id, pointer)}; return type->needs_cast ? ctx.OpBitcast(ctx.F32[1], value) : value; } + if (attr >= IR::Attribute::FixedFncTexture0S && attr <= IR::Attribute::FixedFncTexture9Q) { + const u32 index{IR::TxtCoordAttributeIndex(attr)}; + return ctx.OpLoad(ctx.F32[1], AttrPointer(ctx, ctx.input_f32, vertex, ctx.input_txt_coord, + ctx.Const(element))); + } switch (attr) { case IR::Attribute::PrimitiveId: return ctx.OpBitcast(ctx.F32[1], ctx.OpLoad(ctx.U32[1], ctx.primitive_id)); @@ -316,6 +335,13 @@ Id EmitGetAttribute(EmitContext& ctx, IR::Attribute attr, Id vertex) { case IR::Attribute::PositionW: return ctx.OpLoad(ctx.F32[1], AttrPointer(ctx, ctx.input_f32, vertex, ctx.input_position, ctx.Const(element))); + case IR::Attribute::ColorFrontDiffuseR: + case IR::Attribute::ColorFrontDiffuseG: + case IR::Attribute::ColorFrontDiffuseB: + case IR::Attribute::ColorFrontDiffuseA: { + return ctx.OpLoad(ctx.F32[1], AttrPointer(ctx, ctx.input_f32, vertex, ctx.input_front_color, + ctx.Const(element))); + } case IR::Attribute::InstanceId: if (ctx.profile.support_vertex_instance_id) { return ctx.OpBitcast(ctx.F32[1], ctx.OpLoad(ctx.U32[1], ctx.instance_id)); -- cgit v1.2.3 From a7bbaa489755c9847416c8c96f0eefb9e78a50a0 Mon Sep 17 00:00:00 2001 From: Feng Chen Date: Fri, 3 Sep 2021 23:52:20 +0800 Subject: Rename parameters --- .../backend/spirv/emit_spirv_context_get_set.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp') 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 0444bbf8f..a546d06a5 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 @@ -75,10 +75,10 @@ std::optional OutputAttrPointer(EmitContext& ctx, IR::Attribute attr) { } } if (attr >= IR::Attribute::FixedFncTexture0S && attr <= IR::Attribute::FixedFncTexture9Q) { - const u32 index{IR::TxtCoordAttributeIndex(attr)}; - const u32 element{IR::TxtCoordAttributeElement(attr)}; + const u32 index{IR::FixedFncTextureAttributeIndex(attr)}; + const u32 element{IR::FixedFncTextureAttributeElement(attr)}; const Id element_id{ctx.Const(element)}; - return OutputAccessChain(ctx, ctx.output_f32, ctx.output_txt_coord, element_id); + return OutputAccessChain(ctx, ctx.output_f32, ctx.output_fixed_fnc_texture, element_id); } switch (attr) { case IR::Attribute::PointSize: @@ -322,8 +322,8 @@ Id EmitGetAttribute(EmitContext& ctx, IR::Attribute attr, Id vertex) { return type->needs_cast ? ctx.OpBitcast(ctx.F32[1], value) : value; } if (attr >= IR::Attribute::FixedFncTexture0S && attr <= IR::Attribute::FixedFncTexture9Q) { - const u32 index{IR::TxtCoordAttributeIndex(attr)}; - return ctx.OpLoad(ctx.F32[1], AttrPointer(ctx, ctx.input_f32, vertex, ctx.input_txt_coord, + const u32 index{IR::FixedFncTextureAttributeIndex(attr)}; + return ctx.OpLoad(ctx.F32[1], AttrPointer(ctx, ctx.input_f32, vertex, ctx.input_fixed_fnc_texture, ctx.Const(element))); } switch (attr) { -- cgit v1.2.3 From d994466a08efaa2c06237e6ac840bc0e9000d433 Mon Sep 17 00:00:00 2001 From: Feng Chen Date: Sat, 4 Sep 2021 00:12:06 +0800 Subject: Implement intput and output fixed fnc textures --- .../backend/spirv/emit_spirv_context_get_set.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp') 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 a546d06a5..c3ebd3e6a 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 @@ -78,7 +78,8 @@ std::optional OutputAttrPointer(EmitContext& ctx, IR::Attribute attr) { const u32 index{IR::FixedFncTextureAttributeIndex(attr)}; const u32 element{IR::FixedFncTextureAttributeElement(attr)}; const Id element_id{ctx.Const(element)}; - return OutputAccessChain(ctx, ctx.output_f32, ctx.output_fixed_fnc_texture, element_id); + return OutputAccessChain(ctx, ctx.output_f32, ctx.output_fixed_fnc_textures[index], + element_id); } switch (attr) { case IR::Attribute::PointSize: @@ -323,8 +324,9 @@ Id EmitGetAttribute(EmitContext& ctx, IR::Attribute attr, Id vertex) { } if (attr >= IR::Attribute::FixedFncTexture0S && attr <= IR::Attribute::FixedFncTexture9Q) { const u32 index{IR::FixedFncTextureAttributeIndex(attr)}; - return ctx.OpLoad(ctx.F32[1], AttrPointer(ctx, ctx.input_f32, vertex, ctx.input_fixed_fnc_texture, - ctx.Const(element))); + return ctx.OpLoad(ctx.F32[1], + AttrPointer(ctx, ctx.input_f32, vertex, + ctx.input_fixed_fnc_textures[index], ctx.Const(element))); } switch (attr) { case IR::Attribute::PrimitiveId: -- cgit v1.2.3 From 9cdf2383e99fac2110d788da070f16b2b5c678e7 Mon Sep 17 00:00:00 2001 From: Feng Chen Date: Tue, 7 Sep 2021 12:34:35 +0800 Subject: Move attribute related definitions to spirv anonymous namespace --- .../backend/spirv/emit_spirv_context_get_set.cpp | 25 +++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp') 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 c3ebd3e6a..dd0d01b2a 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 @@ -43,6 +43,25 @@ Id AttrPointer(EmitContext& ctx, Id pointer_type, Id vertex, Id base, Args&&... } } +bool IsFixedFncTexture(IR::Attribute attribute) { + return attribute >= IR::Attribute::FixedFncTexture0S && + attribute <= IR::Attribute::FixedFncTexture9Q; +} + +u32 FixedFncTextureAttributeIndex(IR::Attribute attribute) { + if (!IsFixedFncTexture(attribute)) { + throw InvalidArgument("Attribute is not fixedfnctexture {}", attribute); + } + return (static_cast(attribute) - static_cast(IR::Attribute::FixedFncTexture0S)) / 4u; +} + +u32 FixedFncTextureAttributeElement(IR::Attribute attribute) { + if (!IsFixedFncTexture(attribute)) { + throw InvalidArgument("Attribute is not fixedfnctexture {}", attribute); + } + return static_cast(attribute) % 4; +} + template Id OutputAccessChain(EmitContext& ctx, Id result_type, Id base, Args&&... args) { if (ctx.stage == Stage::TessellationControl) { @@ -75,8 +94,8 @@ std::optional OutputAttrPointer(EmitContext& ctx, IR::Attribute attr) { } } if (attr >= IR::Attribute::FixedFncTexture0S && attr <= IR::Attribute::FixedFncTexture9Q) { - const u32 index{IR::FixedFncTextureAttributeIndex(attr)}; - const u32 element{IR::FixedFncTextureAttributeElement(attr)}; + const u32 index{FixedFncTextureAttributeIndex(attr)}; + const u32 element{FixedFncTextureAttributeElement(attr)}; const Id element_id{ctx.Const(element)}; return OutputAccessChain(ctx, ctx.output_f32, ctx.output_fixed_fnc_textures[index], element_id); @@ -323,7 +342,7 @@ Id EmitGetAttribute(EmitContext& ctx, IR::Attribute attr, Id vertex) { return type->needs_cast ? ctx.OpBitcast(ctx.F32[1], value) : value; } if (attr >= IR::Attribute::FixedFncTexture0S && attr <= IR::Attribute::FixedFncTexture9Q) { - const u32 index{IR::FixedFncTextureAttributeIndex(attr)}; + const u32 index{FixedFncTextureAttributeIndex(attr)}; return ctx.OpLoad(ctx.F32[1], AttrPointer(ctx, ctx.input_f32, vertex, ctx.input_fixed_fnc_textures[index], ctx.Const(element))); -- cgit v1.2.3 From bbc1800c1b22097c56ecb799c0e475aaf8502038 Mon Sep 17 00:00:00 2001 From: Feng Chen Date: Wed, 8 Sep 2021 09:53:10 +0800 Subject: Detail adjustment --- .../backend/spirv/emit_spirv_context_get_set.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp') 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 dd0d01b2a..67df46499 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 @@ -50,16 +50,16 @@ bool IsFixedFncTexture(IR::Attribute attribute) { u32 FixedFncTextureAttributeIndex(IR::Attribute attribute) { if (!IsFixedFncTexture(attribute)) { - throw InvalidArgument("Attribute is not fixedfnctexture {}", attribute); + throw InvalidArgument("Attribute {} is not a FixedFncTexture", attribute); } return (static_cast(attribute) - static_cast(IR::Attribute::FixedFncTexture0S)) / 4u; } u32 FixedFncTextureAttributeElement(IR::Attribute attribute) { if (!IsFixedFncTexture(attribute)) { - throw InvalidArgument("Attribute is not fixedfnctexture {}", attribute); + throw InvalidArgument("Attribute {} is not a FixedFncTexture", attribute); } - return static_cast(attribute) % 4; + return static_cast(attribute) % 4u; } template @@ -93,7 +93,7 @@ std::optional OutputAttrPointer(EmitContext& ctx, IR::Attribute attr) { return OutputAccessChain(ctx, ctx.output_f32, info.id, index_id); } } - if (attr >= IR::Attribute::FixedFncTexture0S && attr <= IR::Attribute::FixedFncTexture9Q) { + if (IsFixedFncTexture(attr)) { const u32 index{FixedFncTextureAttributeIndex(attr)}; const u32 element{FixedFncTextureAttributeElement(attr)}; const Id element_id{ctx.Const(element)}; @@ -341,11 +341,11 @@ Id EmitGetAttribute(EmitContext& ctx, IR::Attribute attr, Id vertex) { const Id value{ctx.OpLoad(type->id, pointer)}; return type->needs_cast ? ctx.OpBitcast(ctx.F32[1], value) : value; } - if (attr >= IR::Attribute::FixedFncTexture0S && attr <= IR::Attribute::FixedFncTexture9Q) { + if (IsFixedFncTexture(attr)) { const u32 index{FixedFncTextureAttributeIndex(attr)}; - return ctx.OpLoad(ctx.F32[1], - AttrPointer(ctx, ctx.input_f32, vertex, - ctx.input_fixed_fnc_textures[index], ctx.Const(element))); + const Id attr_id{ctx.input_fixed_fnc_textures[index]}; + const Id attr_ptr{AttrPointer(ctx, ctx.input_f32, vertex, attr_id, ctx.Const(element))}; + return ctx.OpLoad(ctx.F32[1], attr_ptr); } switch (attr) { case IR::Attribute::PrimitiveId: -- cgit v1.2.3