diff options
| author |  LC | 2020-12-07 00:06:53 -0500 |
|---|---|---|
| committer |  GitHub | 2020-12-07 00:06:53 -0500 |
| commit | 69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41 (patch) | |
| tree | 9cc837fa8d085c5c483fd84239925870e44ba478 /src/video_core/textures | |
| parent | Merge pull request #5155 from comex/xx-default (diff) | |
| parent | video_core: Resolve more variable shadowing scenarios pt.3 (diff) | |
| download | yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.gz yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.tar.xz yuzu-69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41.zip | |
Merge pull request #5136 from lioncash/video-shadow3
video_core: Resolve more variable shadowing scenarios pt.3
Diffstat (limited to 'src/video_core/textures')
| -rw-r--r-- | src/video_core/textures/texture.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/textures/texture.h b/src/video_core/textures/texture.h index 0574fef12..bbc7e3eaf 100644 --- a/src/video_core/textures/texture.h +++ b/src/video_core/textures/texture.h | |||
| @@ -146,7 +146,7 @@ enum class MsaaMode : u32 { | |||
| 146 | }; | 146 | }; |
| 147 | 147 | ||
| 148 | union TextureHandle { | 148 | union TextureHandle { |
| 149 | TextureHandle(u32 raw) : raw{raw} {} | 149 | /* implicit */ TextureHandle(u32 raw_) : raw{raw_} {} |
| 150 | 150 | ||
| 151 | u32 raw; | 151 | u32 raw; |
| 152 | BitField<0, 20, u32> tic_id; | 152 | BitField<0, 20, u32> tic_id; |