summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFernandoS27 <fsahmkow27@gmail.com>2018-09-09 03:54:11 +0200
committerFernandoS27 <fsahmkow27@gmail.com>2018-09-17 23:42:43 +0200
commitaac77bbd18f2b943b7259d8099241c4ec697b8f4 (patch)
treebfe66b24714d358f9486c5f6115ff1d25bfe8dfc
parentMerge pull request #1311 from FernandoS27/fast-swizzle (diff)
downloadyuzu-aac77bbd18f2b943b7259d8099241c4ec697b8f4.tar
yuzu-aac77bbd18f2b943b7259d8099241c4ec697b8f4.tar.gz
yuzu-aac77bbd18f2b943b7259d8099241c4ec697b8f4.tar.bz2
yuzu-aac77bbd18f2b943b7259d8099241c4ec697b8f4.tar.lz
yuzu-aac77bbd18f2b943b7259d8099241c4ec697b8f4.tar.xz
yuzu-aac77bbd18f2b943b7259d8099241c4ec697b8f4.tar.zst
yuzu-aac77bbd18f2b943b7259d8099241c4ec697b8f4.zip
-rw-r--r--src/video_core/engines/shader_bytecode.h36
-rw-r--r--src/video_core/renderer_opengl/gl_shader_decompiler.cpp15
2 files changed, 51 insertions, 0 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h
index 6e555ea03..12229cf4c 100644
--- a/src/video_core/engines/shader_bytecode.h
+++ b/src/video_core/engines/shader_bytecode.h
@@ -240,6 +240,41 @@ enum class FlowCondition : u64 {
Fcsm_Tr = 0x1C, // TODO(bunnei): What is this used for?
};
+enum class ControlCode : u64 {
+ F = 0,
+ LT = 1,
+ EQ = 2,
+ LE = 3,
+ GT = 4,
+ NE = 5,
+ GE = 6,
+ Num = 7,
+ Nan = 8,
+ LTU = 9,
+ EQU = 10,
+ LEU = 11,
+ GTU = 12,
+ NEU = 13,
+ GEU = 14,
+ //
+ OFF = 16,
+ LO = 17,
+ SFF = 18,
+ LS = 19,
+ HI = 20,
+ SFT = 21,
+ HS = 22,
+ OFT = 23,
+ CSM_TA = 24,
+ CSM_TR = 25,
+ CSM_MX = 26,
+ FCSM_TA = 27,
+ FCSM_TR = 28,
+ FCSM_MX = 29,
+ RLE = 30,
+ RGT = 31,
+};
+
enum class PredicateResultMode : u64 {
None = 0x0,
NotZero = 0x3,
@@ -735,6 +770,7 @@ union Instruction {
BitField<36, 5, u64> index;
} cbuf36;
+ BitField<47, 1, u64> generates_cc;
BitField<61, 1, u64> is_b_imm;
BitField<60, 1, u64> is_b_gpr;
BitField<59, 1, u64> is_c_gpr;
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
index 252ff18fc..34f9e57d4 100644
--- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
@@ -351,6 +351,15 @@ public:
shader.AddLine(dest + " = " + src + ';');
}
+ std::string GetControlCode(const Tegra::Shader::ControlCode cc) {
+ u32 code = static_cast<u32>(cc);
+ return "controlCode_" + std::to_string(code);
+ }
+
+ void SetControlCode(const Tegra::Shader::ControlCode cc, const std::string& value) {
+ shader.AddLine(GetControlCode(cc) + " = " + value + ';');
+ }
+
/**
* Writes code that does a output attribute assignment to register operation. Output attributes
* are stored as floats, so this may require conversion.
@@ -414,6 +423,12 @@ public:
}
declarations.AddNewLine();
+ for (u32 cc = 0; cc < 32; cc++) {
+ Tegra::Shader::ControlCode code = static_cast<Tegra::Shader::ControlCode>(cc);
+ declarations.AddLine("bool " + GetControlCode(code) + " = false;");
+ }
+ declarations.AddNewLine();
+
for (const auto element : declr_input_attribute) {
// TODO(bunnei): Use proper number of elements for these
u32 idx =