diff options
| author | Tony Wasserka <NeoBrainX@gmail.com> | 2014-12-16 00:01:08 +0100 |
|---|---|---|
| committer | Tony Wasserka <NeoBrainX@gmail.com> | 2014-12-20 18:06:54 +0100 |
| commit | 346012f29e244489681d2cdf2cf6291d04fbed33 (patch) | |
| tree | 66b4818f362957699106d6c854f96517eaeb1162 /src | |
| parent | Pica/CommandProcessor: Fix vertex decoding if multiple memory areas are accessed for different attributes. (diff) | |
| download | yuzu-346012f29e244489681d2cdf2cf6291d04fbed33.tar yuzu-346012f29e244489681d2cdf2cf6291d04fbed33.tar.gz yuzu-346012f29e244489681d2cdf2cf6291d04fbed33.tar.bz2 yuzu-346012f29e244489681d2cdf2cf6291d04fbed33.tar.lz yuzu-346012f29e244489681d2cdf2cf6291d04fbed33.tar.xz yuzu-346012f29e244489681d2cdf2cf6291d04fbed33.tar.zst yuzu-346012f29e244489681d2cdf2cf6291d04fbed33.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/command_processor.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp index d4559fad6..d8bddd569 100644 --- a/src/video_core/command_processor.cpp +++ b/src/video_core/command_processor.cpp @@ -110,6 +110,13 @@ static inline void WritePicaReg(u32 id, u32 value, u32 mask) { for (int i = 0; i < attribute_config.GetNumTotalAttributes(); ++i) { for (unsigned int comp = 0; comp < vertex_attribute_elements[i]; ++comp) { const u8* srcdata = Memory::GetPointer(PAddrToVAddr(vertex_attribute_sources[i] + vertex_attribute_strides[i] * vertex + comp * vertex_attribute_element_size[i])); + + // TODO(neobrain): Ocarina of Time 3D has GetNumTotalAttributes return 8, + // yet only provides 2 valid source data addresses. Need to figure out + // what's wrong there, until then we just continue when address lookup fails + if (srcdata == nullptr) + continue; + const float srcval = (vertex_attribute_formats[i] == 0) ? *(s8*)srcdata : (vertex_attribute_formats[i] == 1) ? *(u8*)srcdata : (vertex_attribute_formats[i] == 2) ? *(s16*)srcdata : |