diff options
| author |  David | 2020-07-17 13:13:05 +1000 |
|---|---|---|
| committer |  GitHub | 2020-07-17 13:13:05 +1000 |
| commit | 3ce4edba6448ae0f544bed4291cef3e8c3e991f5 (patch) | |
| tree | 4a34aabc9c2f982338c5b7d8d3575dee0bc7425a /src | |
| parent | Merge pull request #4363 from lioncash/mismatch (diff) | |
| parent | macro_hle: Simplify shift expression in HLE_771BB18C62444DA0() (diff) | |
| download | yuzu-3ce4edba6448ae0f544bed4291cef3e8c3e991f5.tar.gz yuzu-3ce4edba6448ae0f544bed4291cef3e8c3e991f5.tar.xz yuzu-3ce4edba6448ae0f544bed4291cef3e8c3e991f5.zip | |
Merge pull request #4370 from lioncash/simplify
macro_hle: Simplify shift expression in HLE_771BB18C62444DA0()
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/macro/macro_hle.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/video_core/macro/macro_hle.cpp b/src/video_core/macro/macro_hle.cpp index 410f99018..37f784a35 100644 --- a/src/video_core/macro/macro_hle.cpp +++ b/src/video_core/macro/macro_hle.cpp | |||
| @@ -17,8 +17,7 @@ static void HLE_771BB18C62444DA0(Engines::Maxwell3D& maxwell3d, | |||
| 17 | const u32 instance_count = parameters[2] & maxwell3d.GetRegisterValue(0xD1B); | 17 | const u32 instance_count = parameters[2] & maxwell3d.GetRegisterValue(0xD1B); |
| 18 | 18 | ||
| 19 | maxwell3d.regs.draw.topology.Assign( | 19 | maxwell3d.regs.draw.topology.Assign( |
| 20 | static_cast<Tegra::Engines::Maxwell3D::Regs::PrimitiveTopology>(parameters[0] & | 20 | static_cast<Tegra::Engines::Maxwell3D::Regs::PrimitiveTopology>(parameters[0] & 0x3ffffff)); |
| 21 | ~(0x3ffffff << 26))); | ||
| 22 | maxwell3d.regs.vb_base_instance = parameters[5]; | 21 | maxwell3d.regs.vb_base_instance = parameters[5]; |
| 23 | maxwell3d.mme_draw.instance_count = instance_count; | 22 | maxwell3d.mme_draw.instance_count = instance_count; |
| 24 | maxwell3d.regs.vb_element_base = parameters[3]; | 23 | maxwell3d.regs.vb_element_base = parameters[3]; |