daniel/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android synced 2024-12-27 14:41:20 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

glsl: Implement VOTE

Browse Source
This commit is contained in:
ameerj 2021-05-30 00:08:39 -04:00
parent 181a4ffdc4
commit 770b754afd
4 changed files with 64 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/shader_recompiler/backend/glsl/emit_context.cpp
View File

@ -148,6 +148,7 @@ void EmitContext::SetupExtensions(std::string&) {
if (info.uses_subgroup_invocation_id || info.uses_subgroup_mask || info.uses_subgroup_vote || if (info.uses_subgroup_invocation_id || info.uses_subgroup_mask || info.uses_subgroup_vote ||
info.uses_subgroup_shuffles || info.uses_fswzadd) { info.uses_subgroup_shuffles || info.uses_fswzadd) {
header += "#extension GL_ARB_shader_ballot : enable\n"; header += "#extension GL_ARB_shader_ballot : enable\n";
header += "#extension GL_ARB_shader_group_vote : enable\n";
} }
} }

20
src/shader_recompiler/backend/glsl/emit_glsl_instructions.h
View File

@ -679,16 +679,16 @@ void EmitImageAtomicXor32(EmitContext& ctx, IR::Inst& inst, const IR::Value& ind
std::string_view coords, std::string_view value); std::string_view coords, std::string_view value);
void EmitImageAtomicExchange32(EmitContext& ctx, IR::Inst& inst, const IR::Value& index, void EmitImageAtomicExchange32(EmitContext& ctx, IR::Inst& inst, const IR::Value& index,
std::string_view coords, std::string_view value); std::string_view coords, std::string_view value);
void EmitLaneId(EmitContext& ctx); void EmitLaneId(EmitContext& ctx, IR::Inst& inst);
void EmitVoteAll(EmitContext& ctx, std::string_view pred); void EmitVoteAll(EmitContext& ctx, IR::Inst& inst, std::string_view pred);
void EmitVoteAny(EmitContext& ctx, std::string_view pred); void EmitVoteAny(EmitContext& ctx, IR::Inst& inst, std::string_view pred);
void EmitVoteEqual(EmitContext& ctx, std::string_view pred); void EmitVoteEqual(EmitContext& ctx, IR::Inst& inst, std::string_view pred);
void EmitSubgroupBallot(EmitContext& ctx, std::string_view pred); void EmitSubgroupBallot(EmitContext& ctx, IR::Inst& inst, std::string_view pred);
void EmitSubgroupEqMask(EmitContext& ctx); void EmitSubgroupEqMask(EmitContext& ctx, IR::Inst& inst);
void EmitSubgroupLtMask(EmitContext& ctx); void EmitSubgroupLtMask(EmitContext& ctx, IR::Inst& inst);
void EmitSubgroupLeMask(EmitContext& ctx); void EmitSubgroupLeMask(EmitContext& ctx, IR::Inst& inst);
void EmitSubgroupGtMask(EmitContext& ctx); void EmitSubgroupGtMask(EmitContext& ctx, IR::Inst& inst);
void EmitSubgroupGeMask(EmitContext& ctx); void EmitSubgroupGeMask(EmitContext& ctx, IR::Inst& inst);
void EmitShuffleIndex(EmitContext& ctx, IR::Inst& inst, std::string_view value, void EmitShuffleIndex(EmitContext& ctx, IR::Inst& inst, std::string_view value,
std::string_view index, std::string_view clamp, std::string_view index, std::string_view clamp,
std::string_view segmentation_mask); std::string_view segmentation_mask);

40
src/shader_recompiler/backend/glsl/emit_glsl_not_implemented.cpp
View File

@ -527,44 +527,4 @@ void EmitImageAtomicExchange32(EmitContext& ctx, IR::Inst& inst, const IR::Value
NotImplemented(); 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 } // namespace Shader::Backend::GLSL

53
src/shader_recompiler/backend/glsl/emit_glsl_warp.cpp
View File

@ -7,6 +7,7 @@
#include "shader_recompiler/backend/glsl/emit_context.h" #include "shader_recompiler/backend/glsl/emit_context.h"
#include "shader_recompiler/backend/glsl/emit_glsl_instructions.h" #include "shader_recompiler/backend/glsl/emit_glsl_instructions.h"
#include "shader_recompiler/frontend/ir/value.h" #include "shader_recompiler/frontend/ir/value.h"
#include "shader_recompiler/profile.h"
namespace Shader::Backend::GLSL { namespace Shader::Backend::GLSL {
namespace { namespace {
@ -36,6 +37,58 @@ std::string GetMaxThreadId(std::string_view thread_id, std::string_view clamp,
} }
} // namespace } // 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, void EmitShuffleIndex(EmitContext& ctx, IR::Inst& inst, std::string_view value,
std::string_view index, std::string_view clamp, std::string_view index, std::string_view clamp,
std::string_view segmentation_mask) { std::string_view segmentation_mask) {