diff options
| author |  Yuri Kunde Schlesner | 2017-01-14 07:52:53 -0300 |
|---|---|---|
| committer |  GitHub | 2017-01-14 07:52:53 -0300 |
| commit | 16a3f9e393a740e3d7cd2ab02c4f5b1e07d53ec7 (patch) | |
| tree | 4fc401f579c2d6320fc3c52fa2b645bc5dcd4f3b | |
| parent | Merge pull request #2423 from Kloen/floats-should-be-float (diff) | |
| parent | GSP::WriteHWRegsWithMask: fix register mask (diff) | |
| download | yuzu-16a3f9e393a740e3d7cd2ab02c4f5b1e07d53ec7.tar.gz yuzu-16a3f9e393a740e3d7cd2ab02c4f5b1e07d53ec7.tar.xz yuzu-16a3f9e393a740e3d7cd2ab02c4f5b1e07d53ec7.zip | |
Merge pull request #2435 from mailwl/gsp-mask
GSP::WriteHWRegsWithMask: fix register mask
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/service/gsp_gpu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/service/gsp_gpu.cpp b/src/core/hle/service/gsp_gpu.cpp index 947958703..a8c1331ed 100644 --- a/src/core/hle/service/gsp_gpu.cpp +++ b/src/core/hle/service/gsp_gpu.cpp | |||
| @@ -149,7 +149,7 @@ static ResultCode WriteHWRegsWithMask(u32 base_address, u32 size_in_bytes, VAddr | |||
| 149 | u32 mask = Memory::Read32(masks_vaddr); | 149 | u32 mask = Memory::Read32(masks_vaddr); |
| 150 | 150 | ||
| 151 | // Update the current value of the register only for set mask bits | 151 | // Update the current value of the register only for set mask bits |
| 152 | reg_value = (reg_value & ~mask) | (data | mask); | 152 | reg_value = (reg_value & ~mask) | (data & mask); |
| 153 | 153 | ||
| 154 | WriteSingleHWReg(base_address, reg_value); | 154 | WriteSingleHWReg(base_address, reg_value); |
| 155 | 155 | ||