summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorameerj <52414509+ameerj@users.noreply.github.com>2021-05-30 06:08:39 +0200
committerameerj <52414509+ameerj@users.noreply.github.com>2021-07-23 03:51:36 +0200
commit770b754afde60658877c9063704d03ea385d40b5 (patch)
tree3d7df9563f68d64c85692c8a98127c51147f720f /src
parentglsl: Implement ST{LS} (diff)
downloadyuzu-770b754afde60658877c9063704d03ea385d40b5.tar
yuzu-770b754afde60658877c9063704d03ea385d40b5.tar.gz
yuzu-770b754afde60658877c9063704d03ea385d40b5.tar.bz2
yuzu-770b754afde60658877c9063704d03ea385d40b5.tar.lz
yuzu-770b754afde60658877c9063704d03ea385d40b5.tar.xz
yuzu-770b754afde60658877c9063704d03ea385d40b5.tar.zst
yuzu-770b754afde60658877c9063704d03ea385d40b5.zip
Diffstat (limited to 'src')
-rw-r--r--src/shader_recompiler/backend/glsl/emit_context.cpp1
-rw-r--r--src/shader_recompiler/backend/glsl/emit_glsl_instructions.h20
-rw-r--r--src/shader_recompiler/backend/glsl/emit_glsl_not_implemented.cpp40
-rw-r--r--src/shader_recompiler/backend/glsl/emit_glsl_warp.cpp53
4 files changed, 64 insertions, 50 deletions
diff --git a/src/shader_recompiler/backend/glsl/emit_context.cpp b/src/shader_recompiler/backend/glsl/emit_context.cpp
index 26969a26d..5456d4e5b 100644
--- a/src/shader_recompiler/backend/glsl/emit_context.cpp
+++ b/src/shader_recompiler/backend/glsl/emit_context.cpp
@@ -148,6 +148,7 @@ void EmitContext::SetupExtensions(std::string&) {
if (info.uses_subgroup_invocation_id || info.uses_subgroup_mask || info.uses_subgroup_vote ||
info.uses_subgroup_shuffles || info.uses_fswzadd) {
header += "#extension GL_ARB_shader_ballot : enable\n";
+ header += "#extension GL_ARB_shader_group_vote : enable\n";
}
}
diff --git a/src/shader_recompiler/backend/glsl/emit_glsl_instructions.h b/src/shader_recompiler/backend/glsl/emit_glsl_instructions.h
index 72d97c7e1..1e7247358 100644
--- a/src/shader_recompiler/backend/glsl/emit_glsl_instructions.h
+++ b/src/shader_recompiler/backend/glsl/emit_glsl_instructions.h
@@ -679,16 +679,16 @@ void EmitImageAtomicXor32(EmitContext& ctx, IR::Inst& inst, const IR::Value& ind
std::string_view coords, std::string_view value);
void EmitImageAtomicExchange32(EmitContext& ctx, IR::Inst& inst, const IR::Value& index,
std::string_view coords, std::string_view value);
-void EmitLaneId(EmitContext& ctx);
-void EmitVoteAll(EmitContext& ctx, std::string_view pred);
-void EmitVoteAny(EmitContext& ctx, std::string_view pred);
-void EmitVoteEqual(EmitContext& ctx, std::string_view pred);
-void EmitSubgroupBallot(EmitContext& ctx, std::string_view pred);
-void EmitSubgroupEqMask(EmitContext& ctx);
-void EmitSubgroupLtMask(EmitContext& ctx);
-void EmitSubgroupLeMask(EmitContext& ctx);
-void EmitSubgroupGtMask(EmitContext& ctx);
-void EmitSubgroupGeMask(EmitContext& ctx);
+void EmitLaneId(EmitContext& ctx, IR::Inst& inst);
+void EmitVoteAll(EmitContext& ctx, IR::Inst& inst, std::string_view pred);
+void EmitVoteAny(EmitContext& ctx, IR::Inst& inst, std::string_view pred);
+void EmitVoteEqual(EmitContext& ctx, IR::Inst& inst, std::string_view pred);
+void EmitSubgroupBallot(EmitContext& ctx, IR::Inst& inst, std::string_view pred);
+void EmitSubgroupEqMask(EmitContext& ctx, IR::Inst& inst);
+void EmitSubgroupLtMask(EmitContext& ctx, IR::Inst& inst);
+void EmitSubgroupLeMask(EmitContext& ctx, IR::Inst& inst);
+void EmitSubgroupGtMask(EmitContext& ctx, IR::Inst& inst);
+void EmitSubgroupGeMask(EmitContext& ctx, IR::Inst& inst);
void EmitShuffleIndex(EmitContext& ctx, IR::Inst& inst, std::string_view value,
std::string_view index, std::string_view clamp,
std::string_view segmentation_mask);
diff --git a/src/shader_recompiler/backend/glsl/emit_glsl_not_implemented.cpp b/src/shader_recompiler/backend/glsl/emit_glsl_not_implemented.cpp
index b182298b0..088c86f30 100644
--- a/src/shader_recompiler/backend/glsl/emit_glsl_not_implemented.cpp
+++ b/src/shader_recompiler/backend/glsl/emit_glsl_not_implemented.cpp
@@ -527,44 +527,4 @@ void EmitImageAtomicExchange32(EmitContext& ctx, IR::Inst& inst, const IR::Value
NotImplemented();
}
-void EmitLaneId(EmitContext& ctx) {
- NotImplemented();
-}
-
-void EmitVoteAll(EmitContext& ctx, std::string_view pred) {
- NotImplemented();
-}
-
-void EmitVoteAny(EmitContext& ctx, std::string_view pred) {
- NotImplemented();
-}
-
-void EmitVoteEqual(EmitContext& ctx, std::string_view pred) {
- NotImplemented();
-}
-
-void EmitSubgroupBallot(EmitContext& ctx, std::string_view pred) {
- NotImplemented();
-}
-
-void EmitSubgroupEqMask(EmitContext& ctx) {
- NotImplemented();
-}
-
-void EmitSubgroupLtMask(EmitContext& ctx) {
- NotImplemented();
-}
-
-void EmitSubgroupLeMask(EmitContext& ctx) {
- NotImplemented();
-}
-
-void EmitSubgroupGtMask(EmitContext& ctx) {
- NotImplemented();
-}
-
-void EmitSubgroupGeMask(EmitContext& ctx) {
- NotImplemented();
-}
-
} // namespace Shader::Backend::GLSL
diff --git a/src/shader_recompiler/backend/glsl/emit_glsl_warp.cpp b/src/shader_recompiler/backend/glsl/emit_glsl_warp.cpp
index 1c212ec05..e462c977c 100644
--- a/src/shader_recompiler/backend/glsl/emit_glsl_warp.cpp
+++ b/src/shader_recompiler/backend/glsl/emit_glsl_warp.cpp
@@ -7,6 +7,7 @@
#include "shader_recompiler/backend/glsl/emit_context.h"
#include "shader_recompiler/backend/glsl/emit_glsl_instructions.h"
#include "shader_recompiler/frontend/ir/value.h"
+#include "shader_recompiler/profile.h"
namespace Shader::Backend::GLSL {
namespace {
@@ -36,6 +37,58 @@ std::string GetMaxThreadId(std::string_view thread_id, std::string_view clamp,
}
} // namespace
+void EmitLaneId([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst) {
+ throw NotImplementedException("GLSL Instruction");
+}
+
+void EmitVoteAll(EmitContext& ctx, IR::Inst& inst, std::string_view pred) {
+ ctx.AddU1("{}=allInvocationsEqualARB({});", inst, pred);
+ // TODO:
+ // if (ctx.profile.warp_size_potentially_larger_than_guest) {
+ // }
+}
+
+void EmitVoteAny(EmitContext& ctx, IR::Inst& inst, std::string_view pred) {
+ ctx.AddU1("{}=anyInvocationARB({});", inst, pred);
+ // TODO:
+ // if (ctx.profile.warp_size_potentially_larger_than_guest) {
+ // }
+}
+
+void EmitVoteEqual(EmitContext& ctx, IR::Inst& inst, std::string_view pred) {
+ ctx.AddU1("{}=allInvocationsEqualARB({});", inst, pred);
+ // TODO:
+ // if (ctx.profile.warp_size_potentially_larger_than_guest) {
+ // }
+}
+
+void EmitSubgroupBallot(EmitContext& ctx, IR::Inst& inst, std::string_view pred) {
+ ctx.AddU32("{}=uvec2(ballotARB({})).x;", inst, pred);
+ // TODO:
+ // if (ctx.profile.warp_size_potentially_larger_than_guest) {
+ // }
+}
+
+void EmitSubgroupEqMask(EmitContext& ctx, IR::Inst& inst) {
+ ctx.AddU32("{}=uvec2(gl_SubGroupEqMaskARB).x;", inst);
+}
+
+void EmitSubgroupLtMask(EmitContext& ctx, IR::Inst& inst) {
+ ctx.AddU32("{}=uvec2(gl_SubGroupLtMaskARB).x;", inst);
+}
+
+void EmitSubgroupLeMask(EmitContext& ctx, IR::Inst& inst) {
+ ctx.AddU32("{}=uvec2(gl_SubGroupLeMaskARB).x;", inst);
+}
+
+void EmitSubgroupGtMask(EmitContext& ctx, IR::Inst& inst) {
+ ctx.AddU32("{}=uvec2(gl_SubGroupGtMaskARB).x;", inst);
+}
+
+void EmitSubgroupGeMask(EmitContext& ctx, IR::Inst& inst) {
+ ctx.AddU32("{}=uvec2(gl_SubGroupGeMaskARB).x;", inst);
+}
+
void EmitShuffleIndex(EmitContext& ctx, IR::Inst& inst, std::string_view value,
std::string_view index, std::string_view clamp,
std::string_view segmentation_mask) {