1
0
Fork 0
forked from suyu/suyu

Merge pull request #2446 from ReinUsesLisp/tid

shader: Implement S2R Tid{XYZ} and CtaId{XYZ}
This commit is contained in:
bunnei 2019-05-29 12:21:17 -04:00 committed by GitHub
commit e3608578e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 76 additions and 22 deletions

View file

@ -31,6 +31,8 @@ using Tegra::Shader::IpaInterpMode;
using Tegra::Shader::IpaMode; using Tegra::Shader::IpaMode;
using Tegra::Shader::IpaSampleMode; using Tegra::Shader::IpaSampleMode;
using Tegra::Shader::Register; using Tegra::Shader::Register;
using namespace std::string_literals;
using namespace VideoCommon::Shader; using namespace VideoCommon::Shader;
using Maxwell = Tegra::Engines::Maxwell3D::Regs; using Maxwell = Tegra::Engines::Maxwell3D::Regs;
@ -93,11 +95,9 @@ private:
}; };
/// Generates code to use for a swizzle operation. /// Generates code to use for a swizzle operation.
std::string GetSwizzle(u32 elem) { constexpr const char* GetSwizzle(u32 element) {
ASSERT(elem <= 3); constexpr std::array<const char*, 4> swizzle = {".x", ".y", ".z", ".w"};
std::string swizzle = "."; return swizzle.at(element);
swizzle += "xyzw"[elem];
return swizzle;
} }
/// Translate topology /// Translate topology
@ -636,7 +636,7 @@ private:
if (stage != ShaderStage::Fragment) { if (stage != ShaderStage::Fragment) {
return GeometryPass("position") + GetSwizzle(element); return GeometryPass("position") + GetSwizzle(element);
} else { } else {
return element == 3 ? "1.0f" : "gl_FragCoord" + GetSwizzle(element); return element == 3 ? "1.0f" : ("gl_FragCoord"s + GetSwizzle(element));
} }
case Attribute::Index::PointCoord: case Attribute::Index::PointCoord:
switch (element) { switch (element) {
@ -921,7 +921,7 @@ private:
target = [&]() -> std::string { target = [&]() -> std::string {
switch (const auto attribute = abuf->GetIndex(); abuf->GetIndex()) { switch (const auto attribute = abuf->GetIndex(); abuf->GetIndex()) {
case Attribute::Index::Position: case Attribute::Index::Position:
return "position" + GetSwizzle(abuf->GetElement()); return "position"s + GetSwizzle(abuf->GetElement());
case Attribute::Index::PointSize: case Attribute::Index::PointSize:
return "gl_PointSize"; return "gl_PointSize";
case Attribute::Index::ClipDistances0123: case Attribute::Index::ClipDistances0123:
@ -1526,6 +1526,16 @@ private:
return "uintBitsToFloat(config_pack[2])"; return "uintBitsToFloat(config_pack[2])";
} }
template <u32 element>
std::string LocalInvocationId(Operation) {
return "utof(gl_LocalInvocationID"s + GetSwizzle(element) + ')';
}
template <u32 element>
std::string WorkGroupId(Operation) {
return "utof(gl_WorkGroupID"s + GetSwizzle(element) + ')';
}
static constexpr OperationDecompilersArray operation_decompilers = { static constexpr OperationDecompilersArray operation_decompilers = {
&GLSLDecompiler::Assign, &GLSLDecompiler::Assign,
@ -1665,6 +1675,12 @@ private:
&GLSLDecompiler::EndPrimitive, &GLSLDecompiler::EndPrimitive,
&GLSLDecompiler::YNegate, &GLSLDecompiler::YNegate,
&GLSLDecompiler::LocalInvocationId<0>,
&GLSLDecompiler::LocalInvocationId<1>,
&GLSLDecompiler::LocalInvocationId<2>,
&GLSLDecompiler::WorkGroupId<0>,
&GLSLDecompiler::WorkGroupId<1>,
&GLSLDecompiler::WorkGroupId<2>,
}; };
std::string GetRegister(u32 index) const { std::string GetRegister(u32 index) const {

View file

@ -1035,6 +1035,18 @@ private:
return {}; return {};
} }
template <u32 element>
Id LocalInvocationId(Operation) {
UNIMPLEMENTED();
return {};
}
template <u32 element>
Id WorkGroupId(Operation) {
UNIMPLEMENTED();
return {};
}
Id DeclareBuiltIn(spv::BuiltIn builtin, spv::StorageClass storage, Id type, Id DeclareBuiltIn(spv::BuiltIn builtin, spv::StorageClass storage, Id type,
const std::string& name) { const std::string& name) {
const Id id = OpVariable(type, storage); const Id id = OpVariable(type, storage);
@ -1291,6 +1303,12 @@ private:
&SPIRVDecompiler::EndPrimitive, &SPIRVDecompiler::EndPrimitive,
&SPIRVDecompiler::YNegate, &SPIRVDecompiler::YNegate,
&SPIRVDecompiler::LocalInvocationId<0>,
&SPIRVDecompiler::LocalInvocationId<1>,
&SPIRVDecompiler::LocalInvocationId<2>,
&SPIRVDecompiler::WorkGroupId<0>,
&SPIRVDecompiler::WorkGroupId<1>,
&SPIRVDecompiler::WorkGroupId<2>,
}; };
const ShaderIR& ir; const ShaderIR& ir;

View file

@ -14,6 +14,7 @@ using Tegra::Shader::ConditionCode;
using Tegra::Shader::Instruction; using Tegra::Shader::Instruction;
using Tegra::Shader::OpCode; using Tegra::Shader::OpCode;
using Tegra::Shader::Register; using Tegra::Shader::Register;
using Tegra::Shader::SystemVariable;
u32 ShaderIR::DecodeOther(NodeBlock& bb, u32 pc) { u32 ShaderIR::DecodeOther(NodeBlock& bb, u32 pc) {
const Instruction instr = {program_code[pc]}; const Instruction instr = {program_code[pc]};
@ -59,20 +60,33 @@ u32 ShaderIR::DecodeOther(NodeBlock& bb, u32 pc) {
break; break;
} }
case OpCode::Id::MOV_SYS: { case OpCode::Id::MOV_SYS: {
const Node value = [&]() {
switch (instr.sys20) { switch (instr.sys20) {
case Tegra::Shader::SystemVariable::InvocationInfo: { case SystemVariable::Ydirection:
return Operation(OperationCode::YNegate);
case SystemVariable::InvocationInfo:
LOG_WARNING(HW_GPU, "MOV_SYS instruction with InvocationInfo is incomplete"); LOG_WARNING(HW_GPU, "MOV_SYS instruction with InvocationInfo is incomplete");
SetRegister(bb, instr.gpr0, Immediate(0u)); return Immediate(0u);
break; case SystemVariable::TidX:
} return Operation(OperationCode::LocalInvocationIdX);
case Tegra::Shader::SystemVariable::Ydirection: { case SystemVariable::TidY:
// Config pack's third value is Y_NEGATE's state. return Operation(OperationCode::LocalInvocationIdY);
SetRegister(bb, instr.gpr0, Operation(OperationCode::YNegate)); case SystemVariable::TidZ:
break; return Operation(OperationCode::LocalInvocationIdZ);
} case SystemVariable::CtaIdX:
return Operation(OperationCode::WorkGroupIdX);
case SystemVariable::CtaIdY:
return Operation(OperationCode::WorkGroupIdY);
case SystemVariable::CtaIdZ:
return Operation(OperationCode::WorkGroupIdZ);
default: default:
UNIMPLEMENTED_MSG("Unhandled system move: {}", static_cast<u32>(instr.sys20.Value())); UNIMPLEMENTED_MSG("Unhandled system move: {}",
static_cast<u32>(instr.sys20.Value()));
return Immediate(0u);
} }
}();
SetRegister(bb, instr.gpr0, value);
break; break;
} }
case OpCode::Id::BRA: { case OpCode::Id::BRA: {

View file

@ -182,6 +182,12 @@ enum class OperationCode {
EndPrimitive, /// () -> void EndPrimitive, /// () -> void
YNegate, /// () -> float YNegate, /// () -> float
LocalInvocationIdX, /// () -> uint
LocalInvocationIdY, /// () -> uint
LocalInvocationIdZ, /// () -> uint
WorkGroupIdX, /// () -> uint
WorkGroupIdY, /// () -> uint
WorkGroupIdZ, /// () -> uint
Amount, Amount,
}; };