summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2021-03-27 06:55:37 +0100
committerameerj <52414509+ameerj@users.noreply.github.com>2021-07-23 03:51:24 +0200
commitf0031babeb3ed04aef2468840aa37f4da13b2524 (patch)
treea92a4009b4405325d78731fd31abb9ca626ba5ef /src
parentshader: Fix structured control flow on KIL instructions (diff)
downloadyuzu-f0031babeb3ed04aef2468840aa37f4da13b2524.tar
yuzu-f0031babeb3ed04aef2468840aa37f4da13b2524.tar.gz
yuzu-f0031babeb3ed04aef2468840aa37f4da13b2524.tar.bz2
yuzu-f0031babeb3ed04aef2468840aa37f4da13b2524.tar.lz
yuzu-f0031babeb3ed04aef2468840aa37f4da13b2524.tar.xz
yuzu-f0031babeb3ed04aef2468840aa37f4da13b2524.tar.zst
yuzu-f0031babeb3ed04aef2468840aa37f4da13b2524.zip
Diffstat (limited to 'src')
-rw-r--r--src/shader_recompiler/backend/spirv/emit_context.cpp3
-rw-r--r--src/shader_recompiler/backend/spirv/emit_context.h1
-rw-r--r--src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp4
-rw-r--r--src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp3
-rw-r--r--src/shader_recompiler/shader_info.h1
5 files changed, 12 insertions, 0 deletions
diff --git a/src/shader_recompiler/backend/spirv/emit_context.cpp b/src/shader_recompiler/backend/spirv/emit_context.cpp
index c2d13f97c..4d5dabcbf 100644
--- a/src/shader_recompiler/backend/spirv/emit_context.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_context.cpp
@@ -302,6 +302,9 @@ void EmitContext::DefineInputs(const Info& info) {
base_vertex = DefineInput(*this, U32[1], spv::BuiltIn::BaseVertex);
}
}
+ if (info.loads_front_face) {
+ front_face = DefineInput(*this, U1, spv::BuiltIn::FrontFacing);
+ }
for (size_t index = 0; index < info.loads_generics.size(); ++index) {
if (!info.loads_generics[index]) {
continue;
diff --git a/src/shader_recompiler/backend/spirv/emit_context.h b/src/shader_recompiler/backend/spirv/emit_context.h
index 0cb411a0e..01b7b665d 100644
--- a/src/shader_recompiler/backend/spirv/emit_context.h
+++ b/src/shader_recompiler/backend/spirv/emit_context.h
@@ -94,6 +94,7 @@ public:
Id vertex_id{};
Id vertex_index{};
Id base_vertex{};
+ Id front_face{};
Id input_position{};
std::array<Id, 32> input_generics{};
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 8fc040f8b..6fa16eb80 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
@@ -156,6 +156,10 @@ Id EmitGetAttribute(EmitContext& ctx, IR::Attribute attr) {
return ctx.OpISub(ctx.U32[1], ctx.OpLoad(ctx.U32[1], ctx.vertex_index),
ctx.OpLoad(ctx.U32[1], ctx.base_vertex));
}
+ case IR::Attribute::FrontFace:
+ return ctx.OpSelect(ctx.U32[1], ctx.OpLoad(ctx.U1, ctx.front_face),
+ ctx.Constant(ctx.U32[1], std::numeric_limits<u32>::max()),
+ ctx.u32_zero_value);
default:
throw NotImplementedException("Read attribute {}", attr);
}
diff --git a/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp b/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp
index 80ca8db26..0ec0d4c01 100644
--- a/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp
+++ b/src/shader_recompiler/ir_opt/collect_shader_info_pass.cpp
@@ -44,6 +44,9 @@ void GetAttribute(Info& info, IR::Attribute attribute) {
case IR::Attribute::VertexId:
info.loads_vertex_id = true;
break;
+ case IR::Attribute::FrontFace:
+ info.loads_front_face = true;
+ break;
default:
throw NotImplementedException("Get attribute {}", attribute);
}
diff --git a/src/shader_recompiler/shader_info.h b/src/shader_recompiler/shader_info.h
index 27e61a5f9..8ab66bb2a 100644
--- a/src/shader_recompiler/shader_info.h
+++ b/src/shader_recompiler/shader_info.h
@@ -62,6 +62,7 @@ struct Info {
bool loads_position{};
bool loads_instance_id{};
bool loads_vertex_id{};
+ bool loads_front_face{};
std::array<bool, 8> stores_frag_color{};
bool stores_frag_depth{};