H3cJP/citra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2315 from ReinUsesLisp/severity-decompiler

Browse Source 
shader_ir/decode: Reduce the severity of common assertions
This commit is contained in:
bunnei 2019-04-16 22:21:19 -04:00 committed by GitHub
commit 0cfbd3325b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/video_core/engines/shader_bytecode.h
View File

@ -387,6 +387,20 @@ enum class IpaSampleMode : u64 {
Offset = 2, Offset = 2,
}; };
enum class LmemLoadCacheManagement : u64 {
Default = 0,
LU = 1,
CI = 2,
CV = 3,
};
enum class LmemStoreCacheManagement : u64 {
Default = 0,
CG = 1,
CS = 2,
WT = 3,
};
struct IpaMode { struct IpaMode {
IpaInterpMode interpolation_mode; IpaInterpMode interpolation_mode;
IpaSampleMode sampling_mode; IpaSampleMode sampling_mode;
@ -782,7 +796,7 @@ union Instruction {
} ld_l; } ld_l;
union { union {
BitField<44, 2, u64> unknown; BitField<44, 2, LmemStoreCacheManagement> cache_management;
} st_l; } st_l;
union { union {

9
src/video_core/shader/decode/memory.cpp
View File

@ -8,6 +8,7 @@
#include "common/assert.h" #include "common/assert.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "common/logging/log.h"
#include "video_core/engines/shader_bytecode.h" #include "video_core/engines/shader_bytecode.h"
#include "video_core/shader/shader_ir.h" #include "video_core/shader/shader_ir.h"
@ -102,8 +103,8 @@ u32 ShaderIR::DecodeMemory(NodeBlock& bb, u32 pc) {
break; break;
} }
case OpCode::Id::LD_L: { case OpCode::Id::LD_L: {
UNIMPLEMENTED_IF_MSG(instr.ld_l.unknown == 1, "LD_L Unhandled mode: {}", LOG_DEBUG(HW_GPU, "LD_L cache management mode: {}",
static_cast<u32>(instr.ld_l.unknown.Value())); static_cast<u64>(instr.ld_l.unknown.Value()));
const auto GetLmem = [&](s32 offset) { const auto GetLmem = [&](s32 offset) {
ASSERT(offset % 4 == 0); ASSERT(offset % 4 == 0);
@ -214,8 +215,8 @@ u32 ShaderIR::DecodeMemory(NodeBlock& bb, u32 pc) {
break; break;
} }
case OpCode::Id::ST_L: { case OpCode::Id::ST_L: {
UNIMPLEMENTED_IF_MSG(instr.st_l.unknown == 0, "ST_L Unhandled mode: {}", LOG_DEBUG(HW_GPU, "ST_L cache management mode: {}",
static_cast<u32>(instr.st_l.unknown.Value())); static_cast<u64>(instr.st_l.cache_management.Value()));
const auto GetLmemAddr = [&](s32 offset) { const auto GetLmemAddr = [&](s32 offset) {
ASSERT(offset % 4 == 0); ASSERT(offset % 4 == 0);